BUG-1411: MDSAL Binding2 Generator API small fix

- Enumeration import fix
- reflecting Yangtools API change - EnumPair.getValue() returns int now

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

diff --git a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/GeneratedType.java b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/GeneratedType.java
index 68320b524aad703e0674724deec6f5fef186fb50..d3ae31fc6dab64e3c449e7084059cf0b567ff462 100644 (file)
--- a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/GeneratedType.java
+++ b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/GeneratedType.java
@@ -9,7 +9,6 @@
 package org.opendaylight.mdsal.binding2.model.api;
 
 import com.google.common.annotations.Beta;
-import java.util.Enumeration;
 import java.util.List;
 
 /**

diff --git a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/type/builder/EnumBuilder.java b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/type/builder/EnumBuilder.java
index d8212e209f6cf65cf067957c83e97f99ef36e9d2..caee1f8b0d46dca78e843ed6557237dc611adc66 100644 (file)
--- a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/type/builder/EnumBuilder.java
+++ b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/type/builder/EnumBuilder.java
@@ -9,7 +9,7 @@
 package org.opendaylight.mdsal.binding2.model.api.type.builder;
 
 import com.google.common.annotations.Beta;
-import java.util.Enumeration;
+import org.opendaylight.mdsal.binding2.model.api.Enumeration;
 import org.opendaylight.mdsal.binding2.model.api.Type;
 import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition;
 
@@ -23,10 +23,10 @@ import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition;
 public interface EnumBuilder extends Type {
     /**
      * The method creates new AnnotationTypeBuilder containing specified package
-     * name an annotation name. <br>
+     * name and annotation name. <br>
      * Neither the package name or annotation name can contain <code>null</code>
      * references. In case that any of parameters contains <code>null</code> the
-     * method SHOULD thrown {@link IllegalArgumentException}
+     * method SHOULD throw {@link IllegalArgumentException}
      *
      * @param packageName
      *            Package Name of Annotation Type
@@ -41,7 +41,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);
 
     /**
      *