X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-parser-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fparser%2Futil%2FGroupingSort.java;h=fb473dfe81d456e180396e82008cd51d20088b73;hb=faf046763341d562e71e6a06d2bcb288c693d4f1;hp=daa54970184d8f38d626f93ac7bd0181e0f6445b;hpb=23883848595da8256244c7b952ef3a7d0ec05e68;p=yangtools.git

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/GroupingSort.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/GroupingSort.java
index daa5497018..fb473dfe81 100644
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/GroupingSort.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/GroupingSort.java
@@ -27,7 +27,10 @@ import org.opendaylight.yangtools.yang.parser.util.TopologicalSort.Node;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 
-public class GroupingSort {
+public final class GroupingSort {
+    private GroupingSort() {
+        throw new UnsupportedOperationException("Utility class should not be instantiated");
+    }
 
     /**
      * Sorts set <code>groupingDefinitions</code> according to the mutual
@@ -51,7 +54,7 @@ public class GroupingSort {
      * @param groupingDefinitions
      *            set of grouping definition which should be sorted according to
      *            mutual dependencies
-     * @return list of grouping definitiond which are sorted by mutual
+     * @return list of grouping definitions which are sorted by mutual
      *         dependencies
      * @throws IllegalArgumentException
      *             if <code>groupingDefinitions</code>
@@ -105,10 +108,6 @@ public class GroupingSort {
             final NodeWrappedType nodeWrappedType = (NodeWrappedType) node;
             final GroupingBuilder groupingDefinition = (GroupingBuilder) nodeWrappedType.getWrappedType();
 
-            if (groupingDefinition.getQName().getLocalName().equals("rp-object")) {
-                System.out.println();
-            }
-
             Set<UsesNodeBuilder> usesNodes = getAllUsesNodes(groupingDefinition);
             for (UsesNodeBuilder usesNode : usesNodes) {
                 SchemaPath schemaPath = usesNode.getGroupingBuilder().getPath();
@@ -133,9 +132,9 @@ public class GroupingSort {
      *            data node container which can contain some uses of grouping
      * @return set of uses nodes which were find in <code>container</code>.
      */
-    public static Set<UsesNodeBuilder> getAllUsesNodes(DataNodeContainerBuilder container) {
+    public static Set<UsesNodeBuilder> getAllUsesNodes(final DataNodeContainerBuilder container) {
         Set<UsesNodeBuilder> ret = new HashSet<>();
-        Set<UsesNodeBuilder> usesNodes = container.getUsesNodes();
+        Set<UsesNodeBuilder> usesNodes = container.getUsesNodeBuilders();
         ret.addAll(usesNodes);
 
         for (UsesNodeBuilder usesNode : usesNodes) {