Updated concepts, mapped InstanceIdentifier to Concepts

[yangtools.git] / yang / yang-data-api / src / main / java / org / opendaylight / yangtools / yang / data / api / InstanceIdentifier.java

diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/InstanceIdentifier.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/InstanceIdentifier.java
index 811b947537fb50ea4d9289a0664bcd4b03ae315b..d74f230ee78afe7bea52be3b7b5e1ac1b4c93ccd 100644 (file)
--- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/InstanceIdentifier.java
+++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/InstanceIdentifier.java
@@ -6,6 +6,7 @@ import java.util.HashMap;
 import java.util.List;\r
 import java.util.Map;\r
 \r
+import org.opendaylight.yangtools.concepts.Builder;\r
 import org.opendaylight.yangtools.concepts.Immutable;\r
 import org.opendaylight.yangtools.concepts.Path;\r
 import org.opendaylight.yangtools.yang.common.QName;\r
@@ -53,11 +54,11 @@ public class InstanceIdentifier implements Path<InstanceIdentifier>, Immutable {
 \r
     // Static factories & helpers\r
 \r
-    public InstanceIdentifier of(QName name) {\r
+    public static InstanceIdentifier of(QName name) {\r
         return new InstanceIdentifier(new NodeIdentifier(name));\r
     }\r
 \r
-    public InstanceIdentifierBuilder builder() {\r
+    static public InstanceIdentifierBuilder builder() {\r
         return new BuilderImpl();\r
     }\r
 \r
@@ -66,13 +67,14 @@ public class InstanceIdentifier implements Path<InstanceIdentifier>, Immutable {
 \r
     }\r
 \r
-    public interface InstanceIdentifierBuilder {\r
+    public interface InstanceIdentifierBuilder extends Builder<InstanceIdentifier>{\r
         InstanceIdentifierBuilder node(QName nodeType);\r
 \r
         InstanceIdentifierBuilder nodeWithKey(QName nodeType, Map<QName, Object> keyValues);\r
 \r
         InstanceIdentifierBuilder nodeWithKey(QName nodeType, QName key, Object value);\r
 \r
+        @Deprecated\r
         InstanceIdentifier getIdentifier();\r
     }\r
 \r
@@ -192,9 +194,14 @@ public class InstanceIdentifier implements Path<InstanceIdentifier>, Immutable {
         }\r
 \r
         @Override\r
-        public InstanceIdentifier getIdentifier() {\r
+        public InstanceIdentifier toInstance() {\r
             return new InstanceIdentifier(path);\r
         }\r
+        \r
+        @Override\r
+        public InstanceIdentifier getIdentifier() {\r
+            return toInstance();\r
+        }\r
     }\r
 \r
     @Override\r