Fix path namespace resolution

[mdsal.git] / binding / mdsal-binding-generator-impl / src / main / java / org / opendaylight / mdsal / binding / yang / types / TypedefResolver.java

diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/TypedefResolver.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/TypedefResolver.java
index 5a4f366fad507370d99e0d843ab4daf586949829..5a28bfe0742e2348eaf72882700a0f9c5482d885 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/TypedefResolver.java
+++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/TypedefResolver.java
@@ -11,7 +11,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Set;
-import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode;
+import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.DataNodeContainer;
@@ -33,22 +33,14 @@ final class TypedefResolver {
 
         fillRecursively(ret, module);
 
-        final Set<NotificationDefinition> notifications = module.getNotifications();
-        for (NotificationDefinition notificationDefinition : notifications) {
+        for (NotificationDefinition notificationDefinition : module.getNotifications()) {
             fillRecursively(ret, notificationDefinition);
         }
 
-        final Set<RpcDefinition> rpcs = module.getRpcs();
-        for (RpcDefinition rpcDefinition : rpcs) {
+        for (RpcDefinition rpcDefinition : module.getRpcs()) {
             ret.addAll(rpcDefinition.getTypeDefinitions());
-            ContainerSchemaNode input = rpcDefinition.getInput();
-            if (input != null) {
-                fillRecursively(ret, input);
-            }
-            ContainerSchemaNode output = rpcDefinition.getInput();
-            if (input != null) {
-                fillRecursively(ret, output);
-            }
+            fillRecursively(ret, rpcDefinition.getInput());
+            fillRecursively(ret, rpcDefinition.getOutput());
         }
 
         return ret;
@@ -64,11 +56,8 @@ final class TypedefResolver {
                     } else if (childNode instanceof ListSchemaNode) {
                         fillRecursively(list, (ListSchemaNode) childNode);
                     } else if (childNode instanceof ChoiceSchemaNode) {
-                        final Set<ChoiceCaseNode> cases = ((ChoiceSchemaNode) childNode).getCases();
-                        if (cases != null) {
-                            for (final ChoiceCaseNode caseNode : cases) {
-                                fillRecursively(list, caseNode);
-                            }
+                        for (final CaseSchemaNode caseNode : ((ChoiceSchemaNode) childNode).getCases().values()) {
+                            fillRecursively(list, caseNode);
                         }
                     }
                 }