Fix checkstyle in mdsal-binding2-java-api-generator

[mdsal.git] / binding2 / mdsal-binding2-java-api-generator / src / main / java / org / opendaylight / mdsal / binding / javav2 / java / api / generator / BuilderGenerator.java

diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/BuilderGenerator.java b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/BuilderGenerator.java
index d31bb59d0f39899495057397dcd15bccc8aa7e53..c053732e7216e667f1f8ad65168d97fbcd079b83 100644 (file)
--- a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/BuilderGenerator.java
+++ b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/BuilderGenerator.java
@@ -10,13 +10,12 @@ package org.opendaylight.mdsal.binding.javav2.java.api.generator;
 
 import com.google.common.annotations.Beta;
 import org.opendaylight.mdsal.binding.javav2.java.api.generator.renderers.BuilderRenderer;
+
 import org.opendaylight.mdsal.binding.javav2.model.api.CodeGenerator;
-import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedTransferObject;
 import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedType;
+import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedTypeForBuilder;
 import org.opendaylight.mdsal.binding.javav2.model.api.Type;
 import org.opendaylight.mdsal.binding.javav2.model.api.UnitName;
-import org.opendaylight.mdsal.binding.javav2.spec.structural.Augmentable;
-import org.opendaylight.mdsal.binding.javav2.spec.structural.Augmentation;
 import org.opendaylight.yangtools.concepts.Identifier;
 
 /**
@@ -27,9 +26,14 @@ import org.opendaylight.yangtools.concepts.Identifier;
 @Beta
 public final class BuilderGenerator implements CodeGenerator {
 
+    /**
+     * Constant used as suffix for builder name.
+     */
+    public static final String BUILDER = "Builder";
+
     @Override
     public String generate(Type type) {
-        if ((type instanceof GeneratedType) && !(type instanceof GeneratedTransferObject)) {
+        if (type instanceof GeneratedTypeForBuilder) {
             final GeneratedType genType = (GeneratedType) type;
             return new BuilderRenderer(genType).generateTemplate();
         } else {
@@ -39,22 +43,11 @@ public final class BuilderGenerator implements CodeGenerator {
 
     @Override
     public boolean isAcceptable(Type type) {
-        if (type instanceof GeneratedType && !(type instanceof GeneratedTransferObject)) {
-            for (Type t : ((GeneratedType) type).getImplements()) {
-                // "rpc" and "grouping" elements do not implement Augmentable
-                if (t.getFullyQualifiedName().equals(Augmentable.class.getName())) {
-                    return true;
-                } else if (t.getFullyQualifiedName().equals(Augmentation.class.getName())) {
-                    return true;
-                }
-
-            }
-        }
-        return false;
+        return type instanceof GeneratedTypeForBuilder;
     }
 
     @Override
     public Identifier getUnitName(Type type) {
-        return new UnitName(type.getName());
+        return new UnitName(type.getName() + BUILDER);
     }
 }