Rework NormalizedNode type hierarchy

[yangtools.git] / yang / yang-data-impl / src / main / java / org / opendaylight / yangtools / yang / data / impl / schema / nodes / AbstractImmutableNormalizedValueNode.java

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableNormalizedValueNode.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableNormalizedValueNode.java
index 16ca637e2ca903cdf8bf349d23fdcb9ccf5d98e2..ee0acab5b92e4efba060c7fb6736316de58d2f0d 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableNormalizedValueNode.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableNormalizedValueNode.java
@@ -7,22 +7,31 @@
  */
 package org.opendaylight.yangtools.yang.data.impl.schema.nodes;
 
-import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier;
+import static java.util.Objects.requireNonNull;
 
-import com.google.common.base.Preconditions;
+import org.eclipse.jdt.annotation.NonNull;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
+import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 
-public abstract class AbstractImmutableNormalizedValueNode<K extends InstanceIdentifier.PathArgument,V>
-        extends AbstractImmutableNormalizedNode<K, V> {
+public abstract class AbstractImmutableNormalizedValueNode<K extends PathArgument, N extends NormalizedNode, V>
+        extends AbstractImmutableNormalizedNode<K, N> {
+    private final @NonNull V value;
 
-    private final V value;
-
-    protected AbstractImmutableNormalizedValueNode(final K nodeIdentifier, final V value) {
-       super(nodeIdentifier);
-        this.value = Preconditions.checkNotNull(value, "value");
+    protected AbstractImmutableNormalizedValueNode(final K nodeIdentifier, final @NonNull V value) {
+        super(nodeIdentifier);
+        this.value = requireNonNull(value);
     }
 
     @Override
-    public final V getValue() {
+    public final V body() {
+        return wrapValue(value);
+    }
+
+    protected final @NonNull V value() {
         return value;
     }
+
+    protected V wrapValue(final V valueToWrap) {
+        return valueToWrap;
+    }
 }