From ce8365429e28708e3bedafa97ce4d77a072fff3e Mon Sep 17 00:00:00 2001
From: Tony Tkacik <ttkacik@cisco.com>
Date: Fri, 30 Aug 2013 13:30:49 -0700
Subject: [PATCH] Added InstanceIdentifier to code generation

Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
---
 .../sal/binding/yang/types/BaseYangTypes.java          |  6 ++++++
 .../yangtools/yang/binding/InstanceIdentifier.java     | 10 +++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

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 f6391d8c9f..b76f3b89f0 100644
--- 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;
 import org.opendaylight.yangtools.sal.binding.generator.spi.TypeProvider;
 import org.opendaylight.yangtools.sal.binding.model.api.Type;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.model.api.SchemaNode;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 
@@ -91,6 +92,10 @@ public final class BaseYangTypes {
      */
     public static final Type BINARY_TYPE = Types.primitiveType("byte[]");
 
+    
+    public static final Type INSTANCE_IDENTIFIER = Types.typeForClass(InstanceIdentifier.class);
+    
+    
     static {
         typeMap.put("boolean", BOOLEAN_TYPE);
         typeMap.put("empty", EMPTY_TYPE);
@@ -105,6 +110,7 @@ public final class BaseYangTypes {
         typeMap.put("uint32", UINT32_TYPE);
         typeMap.put("uint64", UINT64_TYPE);
         typeMap.put("binary", BINARY_TYPE);
+        typeMap.put("instance-identifier", INSTANCE_IDENTIFIER );
     }
 
     public static final TypeProvider BASE_YANG_TYPES_PROVIDER = new TypeProvider() {
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 832a9ed58a..90d42a7401 100644
--- 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;
  *
  *
  */
-public class InstanceIdentifier <T extends DataObject> {
+public class InstanceIdentifier {
 
     
     private final List<PathArgument> path;
-    private final Class<T> targetType;
+    private final Class<? extends DataObject> targetType;
     
-    public InstanceIdentifier(Class<T> type) {
+    public InstanceIdentifier(Class<? extends DataObject> type) {
         path = Collections.emptyList();
         this.targetType = type;
     }
     
     
-    public InstanceIdentifier(List<PathArgument> path,Class<T> type) {
+    public InstanceIdentifier(List<PathArgument> path,Class<? extends DataObject> type) {
         this.path = Collections.<PathArgument>unmodifiableList(new ArrayList<>(path));
         this.targetType = type;
     }
@@ -42,7 +42,7 @@ public class InstanceIdentifier <T extends DataObject> {
         return this.path;
     }
     
-    public Class<T> getTargetType() {
+    public Class<?> getTargetType() {
         return this.targetType;
     }
     
-- 
2.36.6