ForeignDataNode is identified by NormalizedNode

Both specializations are using NodeIdentifier, make sure we centralize
that definition.

Change-Id: Ie3eed54476098f583916e4ed37fdfe17ff10eeef
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/AnydataNode.java b/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/AnydataNode.java
index 410668045150d3a6af3e0971b9ea3b242ee8e8f1..c0ff80110316ad11c3d00191c189552deb3716d3 100644 (file)
--- a/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/AnydataNode.java
+++ b/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/AnydataNode.java
@@ -8,7 +8,6 @@
 package org.opendaylight.yangtools.yang.data.api.schema;
 
 import com.google.common.annotations.Beta;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
 
 /**
  * A NormalizedNode holding the contents of an {@code anydata} node in some object model. While no guarantees are placed
@@ -31,7 +30,4 @@ public non-sealed interface AnydataNode<V> extends ForeignDataNode<V> {
     default Class<AnydataNode> contract() {
         return AnydataNode.class;
     }
-
-    @Override
-    NodeIdentifier getIdentifier();
 }

diff --git a/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/AnyxmlNode.java b/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/AnyxmlNode.java
index d3cbfd08340cf0b59fe7b75499d2ef54fcd63a5e..e7698fa1d0141b12cd5e0b8917ecd096ac1aaaa8 100644 (file)
--- a/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/AnyxmlNode.java
+++ b/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/AnyxmlNode.java
@@ -8,7 +8,6 @@
 package org.opendaylight.yangtools.yang.data.api.schema;
 
 import com.google.common.annotations.Beta;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
 
 /**
  * A NormalizedNode holding the contents of an {@code anyxml} node in some object model. This interface is a common
@@ -23,7 +22,4 @@ public non-sealed interface AnyxmlNode<V> extends ForeignDataNode<V> {
     default Class<AnyxmlNode> contract() {
         return AnyxmlNode.class;
     }
-
-    @Override
-    NodeIdentifier getIdentifier();
 }

diff --git a/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/ForeignDataNode.java b/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/ForeignDataNode.java
index 10a47328c6f6318d0d42de6e0156fec1742592a1..30331ff015f49dfaca89acab593bcd013e99f8bb 100644 (file)
--- a/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/ForeignDataNode.java
+++ b/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/ForeignDataNode.java
@@ -10,6 +10,7 @@ package org.opendaylight.yangtools.yang.data.api.schema;
 import com.google.common.annotations.Beta;
 import javax.xml.transform.dom.DOMSource;
 import org.eclipse.jdt.annotation.NonNull;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
 
 /**
  * A NormalizedNode holding a value in some foreign object model. The object model is identified by a single class,
@@ -23,6 +24,9 @@ import org.eclipse.jdt.annotation.NonNull;
  */
 @Beta
 public sealed interface ForeignDataNode<V> extends DataContainerChild permits AnydataNode, AnyxmlNode {
+    @Override
+    NodeIdentifier getIdentifier();
+
     /**
      * {@inheritDoc}
      *