Bump yangtools to 5.0.0-SNAPSHOT

[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 05fc77c8a7b8dfa4a227e8987d92d90910e3655a..9874be5e256cfb1286a92177219dda68b7e8324e 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
@@ -10,7 +10,6 @@ package org.opendaylight.mdsal.binding.yang.types;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.Set;
 import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
@@ -33,13 +32,11 @@ 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());
             fillRecursively(ret, rpcDefinition.getInput());
             fillRecursively(ret, rpcDefinition.getOutput());
@@ -49,7 +46,7 @@ final class TypedefResolver {
     }
 
     private static void fillRecursively(final List<TypeDefinition<?>> list, final DataNodeContainer container) {
-        final Collection<DataSchemaNode> childNodes = container.getChildNodes();
+        final Collection<? extends DataSchemaNode> childNodes = container.getChildNodes();
         if (childNodes != null) {
             for (DataSchemaNode childNode : childNodes) {
                 if (!childNode.isAugmenting()) {
@@ -58,7 +55,7 @@ final class TypedefResolver {
                     } else if (childNode instanceof ListSchemaNode) {
                         fillRecursively(list, (ListSchemaNode) childNode);
                     } else if (childNode instanceof ChoiceSchemaNode) {
-                        for (final CaseSchemaNode caseNode : ((ChoiceSchemaNode) childNode).getCases().values()) {
+                        for (CaseSchemaNode caseNode : ((ChoiceSchemaNode) childNode).getCases()) {
                             fillRecursively(list, caseNode);
                         }
                     }
@@ -68,7 +65,7 @@ final class TypedefResolver {
 
         list.addAll(container.getTypeDefinitions());
 
-        final Set<GroupingDefinition> groupings = container.getGroupings();
+        final Collection<? extends GroupingDefinition> groupings = container.getGroupings();
         if (groupings != null) {
             for (GroupingDefinition grouping : groupings) {
                 fillRecursively(list, grouping);