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

[yangtools.git] / yang / yang-model-api / src / main / java / org / opendaylight / yangtools / yang / model / api / type / EnumTypeDefinition.java

diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/EnumTypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/EnumTypeDefinition.java
index 64a3fd2ac5321fb200d80196343dc1424146f255..770b5de84a5aff78a53d3622b3c1f09a97b5fa61 100644 (file)
--- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/EnumTypeDefinition.java
+++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/EnumTypeDefinition.java
@@ -8,49 +8,44 @@
 package org.opendaylight.yangtools.yang.model.api.type;
 
 import java.util.List;
-
-import org.opendaylight.yangtools.yang.model.api.SchemaNode;
+import javax.annotation.Nonnull;
+import org.opendaylight.yangtools.yang.model.api.DocumentedNode;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 
 /**
- * 
  * Makes is possible to access to the individual enumeration values of this
  * type.
- * 
  */
 public interface EnumTypeDefinition extends TypeDefinition<EnumTypeDefinition> {
-
     /**
      * Returns all enumeration values.
-     * 
+     *
      * @return list of <code>EnumPair</code> type instastances which contain the
      *         data about all individual enumeration pairs of
      *         <code>enumeration</code> YANG built-in type
      */
-    List<EnumPair> getValues();
+    @Nonnull List<EnumPair> getValues();
 
     /**
-     * 
+     *
      * Contains the methods for accessing the data about the concrete
      * enumeration item which represents <code>enum</code> YANG type.
      */
-    interface EnumPair extends SchemaNode {
-
+    interface EnumPair extends DocumentedNode {
         /**
          * The name to specify each assigned name of an enumeration type.
-         * 
+         *
          * @return name of each assigned name of an enumeration type.
          */
-        public String getName();
+        String getName();
 
         /**
          * The "value" statement, which is optional, is used to associate an
          * integer value with the assigned name for the enum. This integer value
-         * MUST be in the range -2147483648 to 2147483647, and it MUST be unique
-         * within the enumeration type.
-         * 
+         * MUST be unique within the enumeration type.
+         *
          * @return integer value assigned to enumeration
          */
-        public Integer getValue();
+        int getValue();
     }
 }