Binding generator v2 - Unions compilability fix

Change-Id: I8ae28571069c2d0f966d9953f43229bce941083f
Signed-off-by: Martin Ciglan <martin.ciglan@pantheon.tech>
(cherry picked from commit d0610f971b262931b7f58b8e628eb4564ded9bf5)

diff --git a/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/AuxiliaryGenUtils.java b/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/AuxiliaryGenUtils.java
index 41bd28a1d2b4a5f05ec57e0f8a45d0a50592dd53..e76f95ad45a692cc546671f27187fa4b8970ec9f 100644 (file)
--- a/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/AuxiliaryGenUtils.java
+++ b/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/AuxiliaryGenUtils.java
@@ -431,10 +431,7 @@ final class AuxiliaryGenUtils {
         genTOBuilder.setIsUnion(true);
         TypeProviderImpl.addUnitsToGenTO(genTOBuilder, typeDef.getUnits());
 
-
-
-        final GeneratedTOBuilder unionBuilder = createUnionBuilder(genTOBuilder,typeBuilder);
-
+        final GeneratedTOBuilder unionBuilder = createUnionBuilder(genTOBuilder, typeBuilder);
 
         final MethodSignatureBuilder method = unionBuilder.addMethod("getDefaultInstance");
         method.setReturnType(returnType);
@@ -462,7 +459,8 @@ final class AuxiliaryGenUtils {
         }
         name.append(genTOBuilder.getName());
         name.append("Builder");
-        final GeneratedTOBuilderImpl unionBuilder = new GeneratedTOBuilderImpl(typeBuilder.getPackageName(),name.toString());
+        final GeneratedTOBuilderImpl unionBuilder = new GeneratedTOBuilderImpl(typeBuilder.getPackageName(),
+            name.toString(), true);
         unionBuilder.setIsUnionBuilder(true);
         return unionBuilder;
     }

diff --git a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/generated/type/builder/AbstractGeneratedTypeBuilder.java b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/generated/type/builder/AbstractGeneratedTypeBuilder.java
index b2f3ce25d99928d07e1390e7758248cbb8f1961b..64b207f1f04ec232611c5626bbda9af724ba2c91 100644 (file)
--- a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/generated/type/builder/AbstractGeneratedTypeBuilder.java
+++ b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/generated/type/builder/AbstractGeneratedTypeBuilder.java
@@ -46,6 +46,10 @@ abstract class AbstractGeneratedTypeBuilder<T extends GeneratedTypeBuilderBase<T
         super(packageName, name);
     }
 
+    protected AbstractGeneratedTypeBuilder(final String packageName, final String name, final boolean isNormalized) {
+        super(packageName, name, true);
+    }
+
     protected String getComment() {
         return comment;
     }

diff --git a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/generated/type/builder/GeneratedTOBuilderImpl.java b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/generated/type/builder/GeneratedTOBuilderImpl.java
index 019bc522696215dcafafc23fa1a19c2703fc185f..7d9c2f3e4041ff9130d3fd7c3900b64625f29604 100644 (file)
--- a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/generated/type/builder/GeneratedTOBuilderImpl.java
+++ b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/generated/type/builder/GeneratedTOBuilderImpl.java
@@ -49,6 +49,10 @@ public final class GeneratedTOBuilderImpl extends AbstractGeneratedTypeBuilder<G
         setAbstract(false);
     }
 
+    public GeneratedTOBuilderImpl(final String packageName, final String name, final boolean isNormalized) {
+        super(packageName, name, true);
+    }
+
     @Override
     public GeneratedTOBuilder setExtendsType(GeneratedTransferObject genTransObj) {
         Preconditions.checkArgument(genTransObj != null, "Generated Transfer Object cannot be null!");

diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/unionTemplate.scala.txt b/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/unionTemplate.scala.txt
index 3b4a2e9a112c4dc49510b9f87be8d8fe849956ae..a0e2d87da84d626fce4d8896c5862905c7d3dbc2 100644 (file)
--- a/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/unionTemplate.scala.txt
+++ b/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/unionTemplate.scala.txt
@@ -26,7 +26,7 @@ parentProperties: List[GeneratedProperty], properties: List[GeneratedProperty],
      * construction new object of this union type.
      */
     @@@{importedNames.get("constructorProperties")}("@{property.getName}")
-    public @{baseType.getName}({importedNames.get(property.getName)} @{fieldName(property)}) {
+    public @{baseType.getName}(@{importedNames.get(property.getName)} @{fieldName(property)}) {
         @{importedNames.get("string")} defVal = new @{importedNames.get("string")}(@{fieldName(property)});
         @{baseType.getName} defInst = @{typeBuilder}.getDefaultInstance(defVal);
         @for(otherProperty <- finalProperties) {
@@ -55,7 +55,7 @@ parentProperties: List[GeneratedProperty], properties: List[GeneratedProperty],
         }
     }
 }
-@if(!properties.isEmpty && !parentProperties.isEmpty) {
+@if(!properties.isEmpty) {
     /**
      * Creates a copy from Source Object.
      *