Updated YANG Type definitions and documentation in YANG Model Utils.

[controller.git] / opendaylight / sal / yang-prototype / yang / yang-model-util / src / main / java / org / opendaylight / controller / model / util / YangTypesConverter.java

diff --git a/opendaylight/sal/yang-prototype/yang/yang-model-util/src/main/java/org/opendaylight/controller/model/util/YangTypesConverter.java b/opendaylight/sal/yang-prototype/yang/yang-model-util/src/main/java/org/opendaylight/controller/model/util/YangTypesConverter.java
index a09d27e340bbab323b4679ad0d212a9963cb83eb..7f485c3c204c654b8425c6559bf684cefec281e7 100644 (file)
--- a/opendaylight/sal/yang-prototype/yang/yang-model-util/src/main/java/org/opendaylight/controller/model/util/YangTypesConverter.java
+++ b/opendaylight/sal/yang-prototype/yang/yang-model-util/src/main/java/org/opendaylight/controller/model/util/YangTypesConverter.java
@@ -20,6 +20,7 @@ import org.opendaylight.controller.model.api.type.DecimalTypeDefinition;
 import org.opendaylight.controller.model.api.type.IntegerTypeDefinition;\r
 import org.opendaylight.controller.model.api.type.RangeConstraint;\r
 import org.opendaylight.controller.model.api.type.StringTypeDefinition;\r
+import org.opendaylight.controller.model.api.type.UnsignedIntegerTypeDefinition;\r
 import org.opendaylight.controller.yang.common.QName;\r
 import org.opendaylight.controller.yang.model.api.TypeDefinition;\r
 \r
@@ -36,10 +37,10 @@ public class YangTypesConverter {
     private static final TypeDefinition<IntegerTypeDefinition> INT32_TYPE = new Int32();\r
     private static final TypeDefinition<IntegerTypeDefinition> INT64_TYPE = new Int64();\r
     private static final TypeDefinition<StringTypeDefinition> STRING_TYPE = new StringType();\r
-    private static final TypeDefinition<IntegerTypeDefinition> UINT8_TYPE = new Uint8();\r
-    private static final TypeDefinition<IntegerTypeDefinition> UINT16_TYPE = new Int16();\r
-    private static final TypeDefinition<IntegerTypeDefinition> UINT32_TYPE = new Int32();\r
-    private static final TypeDefinition<IntegerTypeDefinition> UINT64_TYPE = new Int64();\r
+    private static final TypeDefinition<UnsignedIntegerTypeDefinition> UINT8_TYPE = new Uint8();\r
+    private static final TypeDefinition<UnsignedIntegerTypeDefinition> UINT16_TYPE = new Uint16();\r
+    private static final TypeDefinition<UnsignedIntegerTypeDefinition> UINT32_TYPE = new Uint32();\r
+    private static final TypeDefinition<UnsignedIntegerTypeDefinition> UINT64_TYPE = new Uint64();\r
 \r
     static {\r
         baseYangTypeMap.put("binary", BINARY);\r
@@ -90,24 +91,30 @@ public class YangTypesConverter {
         return type;\r
     }\r
 \r
-    public static TypeDefinition<IntegerTypeDefinition> javaTypeForBaseYangIntegerType(\r
-            String typeName, List<RangeConstraint> ranges) {\r
+    public static TypeDefinition<IntegerTypeDefinition> javaTypeForBaseYangSignedIntegerType(\r
+            String typeName) {\r
         if (typeName.equals("int8")) {\r
-            return new Int8(ranges, null);\r
+            return new Int8();\r
         } else if (typeName.equals("int16")) {\r
-            return new Int16(ranges, null);\r
+            return new Int16();\r
         } else if (typeName.equals("int32")) {\r
-            return new Int32(ranges, null);\r
+            return new Int32();\r
         } else if (typeName.equals("int64")) {\r
-            return new Int64(ranges, null);\r
-        } else if (typeName.equals("uint8")) {\r
-            return new Uint8(ranges, null);\r
+            return new Int64();\r
+        }\r
+        return null;\r
+    }\r
+\r
+    public static TypeDefinition<UnsignedIntegerTypeDefinition> javaTypeForBaseYangUnsignedIntegerType(\r
+            final String typeName) {\r
+        if (typeName.equals("uint8")) {\r
+            return new Uint8();\r
         } else if (typeName.equals("uint16")) {\r
-            return new Uint16(ranges, null);\r
+            return new Uint16();\r
         } else if (typeName.equals("uint32")) {\r
-            return new Uint32(ranges, null);\r
+            return new Uint32();\r
         } else if (typeName.equals("uint64")) {\r
-            return new Uint64(ranges, null);\r
+            return new Uint64();\r
         }\r
         return null;\r
     }\r