X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=binding2%2Fmdsal-binding2-generator-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fmdsal%2Fbinding%2Fjavav2%2Fgenerator%2Fimpl%2FGenHelperUtil.java;h=dc28d500fb414639f09c3388e0e11150c74220d9;hb=fbe15ce88b0c8cac4fb0d08a740c76d41d2954c3;hp=601ec1ab1a44f5623f80e3e1b891dc64b8da5373;hpb=e7da226c5247a826749078bd70b2270e636ed56b;p=mdsal.git

diff --git a/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/GenHelperUtil.java b/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/GenHelperUtil.java
index 601ec1ab1a..dc28d500fb 100755
--- a/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/GenHelperUtil.java
+++ b/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/GenHelperUtil.java
@@ -27,15 +27,12 @@ import static org.opendaylight.mdsal.binding.javav2.generator.util.BindingTypes.
 import static org.opendaylight.mdsal.binding.javav2.generator.util.BindingTypes.NOTIFICATION;
 import static org.opendaylight.mdsal.binding.javav2.generator.util.Types.parameterizedTypeFor;
 import static org.opendaylight.mdsal.binding.javav2.generator.util.Types.wildcardTypeFor;
-import static org.opendaylight.yangtools.yang.model.util.SchemaContextUtil.findDataSchemaNode;
 import static org.opendaylight.yangtools.yang.model.util.SchemaContextUtil.findParentModule;
 
 import com.google.common.annotations.Beta;
 import com.google.common.base.Preconditions;
-import com.google.common.collect.Iterables;
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -51,7 +48,6 @@ import org.opendaylight.mdsal.binding.javav2.generator.util.ReferencedTypeImpl;
 import org.opendaylight.mdsal.binding.javav2.generator.util.TypeComments;
 import org.opendaylight.mdsal.binding.javav2.generator.util.Types;
 import org.opendaylight.mdsal.binding.javav2.generator.util.generated.type.builder.GeneratedPropertyBuilderImpl;
-import org.opendaylight.mdsal.binding.javav2.generator.util.generated.type.builder.GeneratedTOBuilderImpl;
 import org.opendaylight.mdsal.binding.javav2.generator.util.generated.type.builder.GeneratedTypeBuilderImpl;
 import org.opendaylight.mdsal.binding.javav2.generator.yang.types.GroupingDefinitionDependencySort;
 import org.opendaylight.mdsal.binding.javav2.generator.yang.types.TypeProviderImpl;
@@ -131,7 +127,7 @@ final class GenHelperUtil {
         moduleDataTypeBuilder.addImplementsType(BindingTypes.TREE_ROOT);
 
         if (verboseClassComments) {
-            moduleDataTypeBuilder.setYangSourceDefinition(YangSourceDefinition.of(module));
+            YangSourceDefinition.of(module).ifPresent(moduleDataTypeBuilder::setYangSourceDefinition);
             TypeComments.description(module).ifPresent(moduleDataTypeBuilder::addComment);
             module.getDescription().ifPresent(moduleDataTypeBuilder::setDescription);
             module.getReference().ifPresent(moduleDataTypeBuilder::setReference);
@@ -164,7 +160,7 @@ final class GenHelperUtil {
 
         final GeneratedTypeBuilderImpl moduleBuilder = new GeneratedTypeBuilderImpl(packageName, moduleName, context);
         if (verboseClassComments) {
-            moduleBuilder.setYangSourceDefinition(YangSourceDefinition.of(module));
+            YangSourceDefinition.of(module).ifPresent(moduleBuilder::setYangSourceDefinition);
             TypeComments.description(module).ifPresent(moduleBuilder::addComment);
             module.getDescription().ifPresent(moduleBuilder::setDescription);
             module.getReference().ifPresent(moduleBuilder::setReference);
@@ -636,7 +632,7 @@ final class GenHelperUtil {
         final Module module = SchemaContextUtil.findParentModule(schemaContext, schemaNode);
         qNameConstant(newType, BindingMapping.QNAME_STATIC_FIELD_NAME, schemaNode.getQName());
         if (verboseClassComments) {
-            newType.setYangSourceDefinition(YangSourceDefinition.of(module, schemaNode));
+            YangSourceDefinition.of(module, schemaNode).ifPresent(newType::setYangSourceDefinition);
             TypeComments.description(schemaNode).ifPresent(newType::addComment);
             schemaNode.getDescription().ifPresent(newType::setDescription);
             schemaNode.getReference().ifPresent(newType::setReference);
@@ -1241,7 +1237,7 @@ final class GenHelperUtil {
         annotateDeprecatedIfNecessary(node.getStatus(), genType);
         genType.setModuleName(module.getName());
         if (verboseClassComments) {
-            genType.setYangSourceDefinition(YangSourceDefinition.of(module, node));
+            YangSourceDefinition.of(module, node).ifPresent(genType::setYangSourceDefinition);
             TypeComments.description(node).ifPresent(genType::addComment);
             node.getDescription().ifPresent(genType::setDescription);
             node.getReference().ifPresent(genType::setReference);
@@ -1391,7 +1387,7 @@ final class GenHelperUtil {
             }
 
             if (verboseClassComments) {
-                newType.setYangSourceDefinition(YangSourceDefinition.of(module));
+                YangSourceDefinition.of(module).ifPresent(newType::setYangSourceDefinition);
                 TypeComments.description(module).ifPresent(newType::addComment);
                 module.getDescription().ifPresent(newType::setDescription);
                 module.getReference().ifPresent(newType::setReference);