Add SchemaPath/SchemaNodeIdentifier.createChild(QName)

[yangtools.git] / yang / yang-model-api / src / main / java / org / opendaylight / yangtools / yang / model / api / stmt / SchemaNodeIdentifier.java

diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaNodeIdentifier.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaNodeIdentifier.java
index 8c01fd69a1ed9dc215b1b6fa81d234f8aa3068f1..764fbee19cfe2bda9939e750529cb39b10f3ff0a 100644 (file)
--- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaNodeIdentifier.java
+++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaNodeIdentifier.java
@@ -42,8 +42,8 @@ public abstract class SchemaNodeIdentifier implements Immutable {
         }
 
         @Override
-        protected SchemaNodeIdentifier createInstance(final SchemaNodeIdentifier parent, final QName qname) {
-            return new Absolute(parent, requireNonNull(qname));
+        public Absolute createChild(final QName element) {
+            return new Absolute(this, requireNonNull(element));
         }
     }
 
@@ -61,8 +61,8 @@ public abstract class SchemaNodeIdentifier implements Immutable {
         }
 
         @Override
-        protected SchemaNodeIdentifier createInstance(final SchemaNodeIdentifier parent, final QName qname) {
-            return new Relative(parent, requireNonNull(qname));
+        public Relative createChild(final QName element) {
+            return new Relative(this, requireNonNull(element));
         }
     }
 
@@ -74,12 +74,12 @@ public abstract class SchemaNodeIdentifier implements Immutable {
     /**
      * Shared instance of the conceptual root schema node.
      */
-    public static final SchemaNodeIdentifier ROOT = new Absolute(null, null);
+    public static final Absolute ROOT = new Absolute(null, null);
 
     /**
      * Shared instance of the "same" relative schema node.
      */
-    public static final SchemaNodeIdentifier SAME = new Relative(null, null);
+    public static final Relative SAME = new Relative(null, null);
 
     /**
      * Parent path.
@@ -107,7 +107,7 @@ public abstract class SchemaNodeIdentifier implements Immutable {
      */
     private volatile SchemaPath schemaPath;
 
-    protected SchemaNodeIdentifier(final SchemaNodeIdentifier parent, final QName qname) {
+    SchemaNodeIdentifier(final SchemaNodeIdentifier parent, final QName qname) {
         this.parent = parent;
         this.qname = qname;
 
@@ -162,15 +162,6 @@ public abstract class SchemaNodeIdentifier implements Immutable {
         return create(Arrays.asList(path), absolute);
     }
 
-    /**
-     * Create a new instance.
-     *
-     * @param parent Parent schema node identifier
-     * @param qname next path element
-     * @return A new SchemaPath instance
-     */
-    protected abstract SchemaNodeIdentifier createInstance(SchemaNodeIdentifier parent, QName qname);
-
     /**
      * Create a child path based on concatenation of this path and a relative path.
      *
@@ -184,7 +175,7 @@ public abstract class SchemaNodeIdentifier implements Immutable {
 
         SchemaNodeIdentifier parentNode = this;
         for (QName qname : relative) {
-            parentNode = parentNode.createInstance(parentNode, qname);
+            parentNode = parentNode.createChild(qname);
         }
 
         return parentNode;
@@ -198,15 +189,17 @@ public abstract class SchemaNodeIdentifier implements Immutable {
      */
     public SchemaNodeIdentifier createChild(final SchemaNodeIdentifier relative) {
         checkArgument(!relative.isAbsolute(), "Child creation requires relative path");
-
-        SchemaNodeIdentifier parentNode = this;
-        for (QName qname : relative.getPathFromRoot()) {
-            parentNode = parentNode.createInstance(parentNode, qname);
-        }
-
-        return parentNode;
+        return createChild(relative.getPathFromRoot());
     }
 
+    /**
+     * Create a child path based on concatenation of this path and an additional path element.
+     *
+     * @param element Next SchemaPath element
+     * @return A new child path
+     */
+    public abstract SchemaNodeIdentifier createChild(QName element);
+
     /**
      * Create a child path based on concatenation of this path and additional
      * path elements.
@@ -313,7 +306,7 @@ public abstract class SchemaNodeIdentifier implements Immutable {
     }
 
     @Override
-    public boolean equals(final Object obj) {
+    public final boolean equals(final Object obj) {
         if (this == obj) {
             return true;
         }