Merge "OF plugin classes must have a strict dependency on Connection Service"

[controller.git] / opendaylight / sal / yang-prototype / code-generator / binding-generator-util / src / main / java / org / opendaylight / controller / binding / generator / util / generated / type / builder / EnumerationBuilderImpl.java

diff --git a/opendaylight/sal/yang-prototype/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/EnumerationBuilderImpl.java b/opendaylight/sal/yang-prototype/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/EnumerationBuilderImpl.java
index d48d5b92f28e0fdb4dd6c2037b8038f3bf19c67c..c45c76584bd6fc3d30931efd85db01386ae8898f 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/EnumerationBuilderImpl.java
+++ b/opendaylight/sal/yang-prototype/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/EnumerationBuilderImpl.java
@@ -11,35 +11,26 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import org.opendaylight.controller.binding.generator.util.AbstractBaseType;
 import org.opendaylight.controller.sal.binding.model.api.AnnotationType;
 import org.opendaylight.controller.sal.binding.model.api.Enumeration;
 import org.opendaylight.controller.sal.binding.model.api.Type;
 import org.opendaylight.controller.sal.binding.model.api.type.builder.AnnotationTypeBuilder;
 import org.opendaylight.controller.sal.binding.model.api.type.builder.EnumBuilder;
 
-final class EnumerationBuilderImpl implements EnumBuilder {
+public final class EnumerationBuilderImpl extends AbstractBaseType implements EnumBuilder {
     private final String packageName;
     private final String name;
     private final List<Enumeration.Pair> values;
-    private final List<AnnotationTypeBuilder> annotationBuilders = new ArrayList<AnnotationTypeBuilder>();
+    private final List<AnnotationTypeBuilder> annotationBuilders = new ArrayList<>();
     
     public EnumerationBuilderImpl(final String packageName, final String name) {
-        super();
+        super(packageName, name);
         this.packageName = packageName;
         this.name = name;
-        values = new ArrayList<Enumeration.Pair>();
-    }
-    
-    @Override
-    public String getPackageName() {
-        return packageName;
+        values = new ArrayList<>();
     }
 
-    @Override
-    public String getName() {
-        return name;
-    }
-    
     @Override
     public AnnotationTypeBuilder addAnnotation(final String packageName, final String name) {
         if (packageName != null && name != null) {
@@ -220,7 +211,7 @@ final class EnumerationBuilderImpl implements EnumBuilder {
         private final String packageName;
         private final String name;
         private final List<Pair> values;
-        private List<AnnotationType> annotations = new ArrayList<AnnotationType>();
+        private List<AnnotationType> annotations = new ArrayList<>();
         
         public EnumerationImpl(final Type definingType,
                 final List<AnnotationTypeBuilder> annotationBuilders,
@@ -252,6 +243,11 @@ final class EnumerationBuilderImpl implements EnumBuilder {
             return name;
         }
 
+        @Override
+        public String getFullyQualifiedName() {
+            return packageName + "." + name;
+        }
+
         @Override
         public List<Pair> getValues() {
             return values;