Added InstanceIdentifier to code generation

Signed-off-by: Tony Tkacik <ttkacik@cisco.com>

diff --git a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/BaseYangTypes.java b/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/BaseYangTypes.java
index f6391d8c9f8cf41964a74568c761ead2e6cdf2f0..b76f3b89f096393f199c75f63bf9f88c95283013 100644 (file)
--- a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/BaseYangTypes.java
+++ b/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/BaseYangTypes.java
@@ -15,6 +15,7 @@ import java.util.Map;
 import org.opendaylight.yangtools.binding.generator.util.Types;\r
 import org.opendaylight.yangtools.sal.binding.generator.spi.TypeProvider;\r
 import org.opendaylight.yangtools.sal.binding.model.api.Type;\r
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;\r
 import org.opendaylight.yangtools.yang.model.api.SchemaNode;\r
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;\r
 \r
@@ -91,6 +92,10 @@ public final class BaseYangTypes {
      */\r
     public static final Type BINARY_TYPE = Types.primitiveType("byte[]");\r
 \r
+    \r
+    public static final Type INSTANCE_IDENTIFIER = Types.typeForClass(InstanceIdentifier.class);\r
+    \r
+    \r
     static {\r
         typeMap.put("boolean", BOOLEAN_TYPE);\r
         typeMap.put("empty", EMPTY_TYPE);\r
@@ -105,6 +110,7 @@ public final class BaseYangTypes {
         typeMap.put("uint32", UINT32_TYPE);\r
         typeMap.put("uint64", UINT64_TYPE);\r
         typeMap.put("binary", BINARY_TYPE);\r
+        typeMap.put("instance-identifier", INSTANCE_IDENTIFIER );\r
     }\r
 \r
     public static final TypeProvider BASE_YANG_TYPES_PROVIDER = new TypeProvider() {\r

diff --git a/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/InstanceIdentifier.java b/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/InstanceIdentifier.java
index 832a9ed58af5531a5ced7677ba84fe00f0913489..90d42a74018a55278f44f95b35f159277290c62d 100644 (file)
--- a/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/InstanceIdentifier.java
+++ b/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/InstanceIdentifier.java
@@ -16,19 +16,19 @@ import java.util.List;
  *\r
  *\r
  */\r
-public class InstanceIdentifier <T extends DataObject> {\r
+public class InstanceIdentifier {\r
 \r
     \r
     private final List<PathArgument> path;\r
-    private final Class<T> targetType;\r
+    private final Class<? extends DataObject> targetType;\r
     \r
-    public InstanceIdentifier(Class<T> type) {\r
+    public InstanceIdentifier(Class<? extends DataObject> type) {\r
         path = Collections.emptyList();\r
         this.targetType = type;\r
     }\r
     \r
     \r
-    public InstanceIdentifier(List<PathArgument> path,Class<T> type) {\r
+    public InstanceIdentifier(List<PathArgument> path,Class<? extends DataObject> type) {\r
         this.path = Collections.<PathArgument>unmodifiableList(new ArrayList<>(path));\r
         this.targetType = type;\r
     }\r
@@ -42,7 +42,7 @@ public class InstanceIdentifier <T extends DataObject> {
         return this.path;\r
     }\r
     \r
-    public Class<T> getTargetType() {\r
+    public Class<?> getTargetType() {\r
         return this.targetType;\r
     }\r
     \r