Remove NormalizedNode.getIdentifier()

This method has been deprecated for removal, remove it now.

JIRA: YANGTOOLS-1559
Change-Id: Ia8f839c0daa60fc64ce20084833f3516869b02a8
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/DataContainerChild.java b/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/DataContainerChild.java
index 277d4f7ac5e1cc4c34bbab39074f5a2071eb059c..2a4055da93118bec4c19c810e1add2535eca936a 100644 (file)
--- a/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/DataContainerChild.java
+++ b/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/DataContainerChild.java
@@ -29,10 +29,4 @@ public sealed interface DataContainerChild extends NormalizedNode
         permits ChoiceNode, ContainerNode, ForeignDataNode, LeafNode, LeafSetNode, MapNode, UnkeyedListNode {
     @Override
     NodeIdentifier name();
-
-    @Override
-    @Deprecated(since = "11.0.0", forRemoval = true)
-    default NodeIdentifier getIdentifier() {
-        return name();
-    }
 }

diff --git a/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/LeafSetEntryNode.java b/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/LeafSetEntryNode.java
index d563a91a963fd41ddabf039d1a0ea3f04447325a..730f17e8a7b9ca498a00acb8a1a1504693adcfee 100644 (file)
--- a/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/LeafSetEntryNode.java
+++ b/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/LeafSetEntryNode.java
@@ -33,19 +33,4 @@ public non-sealed interface LeafSetEntryNode<T> extends ValueNode<T> {
      */
     @Override
     NodeWithValue<T> name();
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>
-     * <b>Implementation note</b>
-     * Invocation of {@link NodeWithValue#getValue()} on returned instance of {@link NodeWithValue} must return the
-     * same value as invocation of {@code #body()}, such as following condition is always met:
-     * {@code true == this.getIdentifier().getValue().equals(this.body())}.
-     */
-    @Override
-    @Deprecated(since = "11.0.0", forRemoval = true)
-    default NodeWithValue<T> getIdentifier() {
-        return name();
-    }
 }

diff --git a/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/MapEntryNode.java b/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/MapEntryNode.java
index 956baf24cab4e248c382f5d70d81b88ce451a082..6363e0ae7e2dd4742edad34e1d1d3c841d25d9f9 100644 (file)
--- a/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/MapEntryNode.java
+++ b/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/MapEntryNode.java
@@ -32,21 +32,4 @@ public interface MapEntryNode extends DataContainerNode {
      */
     @Override
     NodeIdentifierWithPredicates name();
-
-    /**
-     * Returns identifier of this node in parent map node
-     *
-     * <p>
-     * Contents of identifier is defined by <code>key</code> (
-     * {@link org.opendaylight.yangtools.yang.model.api.ListSchemaNode#getKeyDefinition()}
-     * ) statement in YANG schema for associated list item and child {@link LeafNode}s
-     * values with {@link NodeIdentifier} as defined in the schema.
-     *
-     * @return identifier of this node in the context of parent node
-     */
-    @Override
-    @Deprecated(since = "11.0.0", forRemoval = true)
-    default NodeIdentifierWithPredicates getIdentifier() {
-        return name();
-    }
 }

diff --git a/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/NormalizedNode.java b/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/NormalizedNode.java
index 57d003c4d3c2f8049ef9e7c4c5a377201949ed83..2c65912b8a0993bc7555026679ed9753a9d34085 100644 (file)
--- a/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/NormalizedNode.java
+++ b/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/NormalizedNode.java
@@ -7,7 +7,6 @@
  */
 package org.opendaylight.yangtools.yang.data.api.schema;
 
-import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.concepts.PrettyTreeAware;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
 
@@ -50,15 +49,4 @@ public interface NormalizedNode extends NormalizedData, PrettyTreeAware {
 
     @Override
     PathArgument name();
-
-    /**
-     * Return the name of this node.
-     *
-     * @return Name of this node.
-     * @deprecated Use {@link #name()} instead.
-     */
-    @Deprecated(since = "11.0.0", forRemoval = true)
-    default @NonNull PathArgument getIdentifier() {
-        return name();
-    }
 }

diff --git a/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/UnkeyedListEntryNode.java b/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/UnkeyedListEntryNode.java
index 0a22445e6b62a4e578f38e7eecdf5ef3ff11c5c6..c36344730fc7206f5f9a65293bfd68780c32f41b 100644 (file)
--- a/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/UnkeyedListEntryNode.java
+++ b/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/UnkeyedListEntryNode.java
@@ -25,10 +25,4 @@ public interface UnkeyedListEntryNode extends DataContainerNode {
 
     @Override
     NodeIdentifier name();
-
-    @Override
-    @Deprecated(since = "11.0.0", forRemoval = true)
-    default NodeIdentifier getIdentifier() {
-        return name();
-    }
 }