Rework NormalizedNode type hierarchy

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

diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/ValueNode.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/ValueNode.java
index 1556d8bbec315ecd61ef3b3d3be1e378545ba05a..1decdc691cecf367d949d51107a2b56dd1c3b4d8 100644 (file)
--- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/ValueNode.java
+++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/ValueNode.java
@@ -7,24 +7,20 @@
  */
 package org.opendaylight.yangtools.yang.data.api.schema;
 
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
-
 /**
  * Interface holding the common trait of {@link LeafSetEntryNode} and {@link LeafNode}, which both hold a value.
  *
- * @param <K> Local identifier of node
- * @param <V> Value of node
+ * @param <V> Value of node, which needs to be a well-published simple value type.
  */
-public interface ValueNode<K extends PathArgument, V> extends NormalizedNode<K, V> {
+public interface ValueNode<V> extends NormalizedNode {
     /**
-     * Returns value of held by this node.
+     * {@inheritDoc}
      *
+     * <p>
      * <b>Implementation note</b>
-     * Invocation of {@link #getValue()} must provide the same value as value in {@link #getIdentifier()}.
-     * {@code true == this.getIdentifier().getValue().equals(this.getValue())}.
-     *
-     * @return Returned value of this node. Value SHOULD meet criteria defined by schema.
+     * Invocation of {@code body()} must provide the same value as value in {@link #getIdentifier()}.
+     * {@code true == this.getIdentifier().getValue().equals(this.body())}.
      */
     @Override
-    V getValue();
+    V body();
 }