Modernize DataTreeCandidateNode API

[yangtools.git] / data / yang-data-tree-spi / src / main / java / org / opendaylight / yangtools / yang / data / tree / spi / AbstractDataTreeCandidateNode.java

diff --git a/data/yang-data-tree-spi/src/main/java/org/opendaylight/yangtools/yang/data/tree/spi/AbstractDataTreeCandidateNode.java b/data/yang-data-tree-spi/src/main/java/org/opendaylight/yangtools/yang/data/tree/spi/AbstractDataTreeCandidateNode.java
index 9efd66ec8657453bb77541e9c673a24a163a69eb..e7524e29f964af6647438d5d1ea69c6fb4b7ef1a 100644 (file)
--- a/data/yang-data-tree-spi/src/main/java/org/opendaylight/yangtools/yang/data/tree/spi/AbstractDataTreeCandidateNode.java
+++ b/data/yang-data-tree-spi/src/main/java/org/opendaylight/yangtools/yang/data/tree/spi/AbstractDataTreeCandidateNode.java
@@ -17,14 +17,14 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.tree.api.DataTreeCandidateNode;
 
 abstract class AbstractDataTreeCandidateNode implements DataTreeCandidateNode {
-    private final DistinctNodeContainer<PathArgument, NormalizedNode> data;
+    final @NonNull DistinctNodeContainer<PathArgument, NormalizedNode> data;
 
     AbstractDataTreeCandidateNode(final DistinctNodeContainer<PathArgument, NormalizedNode> data) {
         this.data = requireNonNull(data);
     }
 
     @Override
-    public final PathArgument getIdentifier() {
+    public final PathArgument name() {
         return data.name();
     }
 
@@ -32,10 +32,6 @@ abstract class AbstractDataTreeCandidateNode implements DataTreeCandidateNode {
         return Optional.of(data);
     }
 
-    final DistinctNodeContainer<PathArgument, NormalizedNode> data() {
-        return data;
-    }
-
     @Override
     public String toString() {
         return this.getClass().getSimpleName() + "{data = " + data + "}";