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 a37a44450e5df1b6ff83bfa284d9d7e7361c0387..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,44 +7,31 @@
  */
 package org.opendaylight.yangtools.yang.data.impl.schema.nodes;
 
-import javax.annotation.Nullable;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import static java.util.Objects.requireNonNull;
 
-public abstract class AbstractImmutableNormalizedValueNode<K extends PathArgument, V> extends
-        AbstractImmutableNormalizedNode<K, V> {
+import org.eclipse.jdt.annotation.NonNull;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
+import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 
-    private static final Logger LOG = LoggerFactory.getLogger(AbstractImmutableNormalizedValueNode.class);
-    @Nullable
-    private final V value;
+public abstract class AbstractImmutableNormalizedValueNode<K extends PathArgument, N extends NormalizedNode, V>
+        extends AbstractImmutableNormalizedNode<K, N> {
+    private final @NonNull V value;
 
-    protected AbstractImmutableNormalizedValueNode(final K nodeIdentifier, @Nullable final V value) {
+    protected AbstractImmutableNormalizedValueNode(final K nodeIdentifier, final @NonNull V value) {
         super(nodeIdentifier);
-
-        /*
-         * Null value is allowed for empty type definition so it should be debug,
-         * but still we are logging it in case we need to debug missing values.
-         */
-        // FIXME: one we do not map YANG 'void' to java.lang.Void we should be enforcing non-null here
-        if (value == null) {
-            LOG.debug("The value of node {} is null", nodeIdentifier.getNodeType());
-        }
-        this.value = value;
+        this.value = requireNonNull(value);
     }
 
-    @Nullable
     @Override
-    public final V getValue() {
+    public final V body() {
         return wrapValue(value);
     }
 
-    @Nullable
-    protected final V value() {
+    protected final @NonNull V value() {
         return value;
     }
 
-    protected V wrapValue(final V value) {
-        return value;
+    protected V wrapValue(final V valueToWrap) {
+        return valueToWrap;
     }
 }