Bug 8583 - Duplicate appending rank to augement class

- The rank was appended repeatedly in both ReferencedTypeImpl
  and addRawAugmentGenTypeDefinition

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

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 1abdb1375829174da8a94287f73c6f15a2524ef5..0eab7e04c95a85eb94599633bd0c7d80e74bcc6d 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
@@ -198,10 +198,9 @@ final class AugmentToGenType {
 
         if (!(targetSchemaNode instanceof ChoiceSchemaNode)) {
             final String packageName = augmentPackageName;
-            final Type targetType = new ReferencedTypeImpl(targetTypeBuilder.getPackageName(),
-                    targetTypeBuilder.getName());
-            generatedCtx = GenHelperUtil.addRawAugmentGenTypeDefinition(module, packageName, augmentPackageName, targetType,
-                    augSchema, genTypeBuilders, generatedCtx, schemaContext, verboseClassComments, typeProvider);
+            generatedCtx = GenHelperUtil.addRawAugmentGenTypeDefinition(module, packageName, augmentPackageName,
+                    targetTypeBuilder.toInstance(),augSchema, genTypeBuilders, generatedCtx, schemaContext,
+                    verboseClassComments, typeProvider);
             return generatedCtx;
 
         } else {