Binding generator v2 - uses statement - uses of cases

- interface for case data extends interface for same case for referenced
grouping

Change-Id: If71de3c1361d87c5d6f4cf352e1fa9798a6e1ada
Signed-off-by: Jie Han <han.jie@zte.com.cn>
(cherry picked from commit 2111fe7094b1d794f78ca175d806b7b211fb960d)

diff --git a/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/AugmentToGenType.java b/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/AugmentToGenType.java
index 1f72bf5578fb184ff5f903745298f08738e5af3e..339ad82c79ffac30a3f872351db08964274ca9cd 100644 (file)
--- a/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/AugmentToGenType.java
+++ b/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/AugmentToGenType.java
@@ -8,6 +8,8 @@
 
 package org.opendaylight.mdsal.binding.javav2.generator.impl;
 
+import static org.opendaylight.mdsal.binding.javav2.generator.impl.GenHelperUtil.processUsesImplements;
+
 import com.google.common.annotations.Beta;
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
@@ -139,7 +141,7 @@ final class AugmentToGenType {
                     verboseClassComments, resultCtx, genTypeBuilders, typeProvider);
 
             for (AugmentationSchema augSchema : schemaPathAugmentListEntry.getValue()) {
-                GenHelperUtil.processUsesImplements(augSchema, module, schemaContext, genCtx, BindingNamespaceType.Data);
+                processUsesImplements(augSchema, module, schemaContext, genCtx, BindingNamespaceType.Data);
             }
 
         }
@@ -473,6 +475,7 @@ final class AugmentToGenType {
                         GenHelperUtil.resolveDataSchemaNodes(module, basePackageName, caseTypeBuilder, childOfType,
                                 childNodes, genCtx, schemaContext, verboseClassComments, genTypeBuilders, typeProvider,
                                 namespaceType);
+                        processUsesImplements(node, module, schemaContext, genCtx, namespaceType);
                     }
                     genCtx.get(module).addCaseType(caseNode.getPath(), caseTypeBuilder);
                     genCtx.get(module).addChoiceToCaseMapping(targetType, caseTypeBuilder, node);

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 11ac9465a138eead5950c6a9729e82432a176608..7f772fd68c527c894fd47b5b235dbabbc55999a0 100644 (file)
--- 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
@@ -1065,6 +1065,7 @@ final class GenHelperUtil {
                                 genCtx, verboseClassComments), caseChildNodes, genCtx, schemaContext,
                                 verboseClassComments, genTypeBuilders, typeProvider, namespaceType);
                     }
+                    processUsesImplements(caseNode, module, schemaContext, genCtx, namespaceType);
                 }
             }
         }