BUG-6316: Fix Bit and EnumPair's position/value types

Follow-up patch for Yangtools API change:
https://git.opendaylight.org/gerrit/#/c/42855/

This solves issue with distibution-check jenkins job, where
EnumPair.getValue() returns Integer instead of correct int type.

Change-Id: I459364d17747e0adf10ec021a0bd9cc3e316726d
Signed-off-by: Martin Ciglan <mciglan@cisco.com>
(cherry picked from commit 36a598c3b773cf67d0897354c2644fcadcd11f8f)

diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/Enumeration.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/Enumeration.java
index 9ca7f436512aad34aa151b49186b342e1212969b..55f5c502af30311955c16436fc612bcc8f23e8a3 100644 (file)
--- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/Enumeration.java
+++ b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/Enumeration.java
@@ -68,6 +68,6 @@ public interface Enumeration extends GeneratedType {
          *
          * @return the value of the enumeration item.
          */
-        Integer getValue();
+        int getValue();
     }
 }

diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/EnumBuilder.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/EnumBuilder.java
index a3339b9276fb701c07b50ff1538322909778f9fe..c0a99b9845e66ef8320e7caadf0dc0bdd2fd9843 100644 (file)
--- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/EnumBuilder.java
+++ b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/EnumBuilder.java
@@ -39,7 +39,7 @@ public interface EnumBuilder extends Type {
      * @param name
      * @param value
      */
-    void addValue(final String name, final Integer value, final String description);
+    void addValue(final String name, final int value, final String description);
 
     /**
      *

diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/EnumerationBuilderImpl.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/EnumerationBuilderImpl.java
index 7a86e731ba38ca028480be5a12702736686d9e00..198d938e2dbb5cc09d81c26755dd15eb2f1020f6 100644 (file)
--- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/EnumerationBuilderImpl.java
+++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/EnumerationBuilderImpl.java
@@ -78,7 +78,7 @@ public final class EnumerationBuilderImpl extends AbstractBaseType implements En
     }
 
     @Override
-    public void addValue(final String name, final Integer value, final String description) {
+    public void addValue(final String name, final int value, final String description) {
         final EnumPairImpl p = new EnumPairImpl(name, value, description);
         values = LazyCollections.lazyAdd(values, p);
         unmodifiableValues = Collections.unmodifiableList(values);
@@ -112,21 +112,9 @@ public final class EnumerationBuilderImpl extends AbstractBaseType implements En
     public void updateEnumPairsFromEnumTypeDef(final EnumTypeDefinition enumTypeDef) {
         final List<EnumPair> enums = enumTypeDef.getValues();
         if (enums != null) {
-            int listIndex = 0;
             for (final EnumPair enumPair : enums) {
                 if (enumPair != null) {
-                    final String enumPairName = enumPair.getName();
-                    Integer enumPairValue = enumPair.getValue();
-
-                    if (enumPairValue == null) {
-                        enumPairValue = listIndex;
-                    }
-                    else {
-                        listIndex = enumPairValue;
-                    }
-
-                    this.addValue(enumPairName, enumPairValue, enumPair.getDescription());
-                    listIndex++;
+                    this.addValue(enumPair.getName(), enumPair.getValue(), enumPair.getDescription());
                 }
             }
         }
@@ -137,10 +125,10 @@ public final class EnumerationBuilderImpl extends AbstractBaseType implements En
 
         private final String name;
         private final String mappedName;
-        private final Integer value;
+        private final int value;
         private final String description;
 
-        public EnumPairImpl(final String name, final Integer value, final String description) {
+        public EnumPairImpl(final String name, final int value, final String description) {
             super();
             this.name = name;
             this.mappedName = BindingMapping.getClassName(name);
@@ -159,7 +147,7 @@ public final class EnumerationBuilderImpl extends AbstractBaseType implements En
         }
 
         @Override
-        public Integer getValue() {
+        public int getValue() {
             return value;
         }
 
@@ -362,7 +350,6 @@ public final class EnumerationBuilderImpl extends AbstractBaseType implements En
 
         @Override
         public List<MethodSignature> getMethodDefinitions() {
-            // TODO Auto-generated method stub
             return Collections.emptyList();
         }