Rework NormalizedNode type hierarchy

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

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/AbstractImmutableNormalizedNodeBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/AbstractImmutableNormalizedNodeBuilder.java
index ff6a2354ade52d09642319936c2f15ab33f89520..bd8618049cda438934e655901e7b305325e080e2 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/AbstractImmutableNormalizedNodeBuilder.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/AbstractImmutableNormalizedNodeBuilder.java
@@ -7,27 +7,38 @@
  */
 package org.opendaylight.yangtools.yang.data.impl.schema.builder.impl;
 
-import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier;
+import static com.google.common.base.Preconditions.checkState;
+import static java.util.Objects.requireNonNull;
+
+import org.eclipse.jdt.annotation.Nullable;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.NormalizedNodeBuilder;
 
-abstract class AbstractImmutableNormalizedNodeBuilder<I extends InstanceIdentifier.PathArgument, V, R extends NormalizedNode<I, ?>>
-        implements NormalizedNodeBuilder<I,V,R> {
+abstract class AbstractImmutableNormalizedNodeBuilder<I extends PathArgument, V, R extends NormalizedNode>
+        implements NormalizedNodeBuilder<I, V, R> {
+    private @Nullable I nodeIdentifier = null;
+    private @Nullable V value = null;
+
+    protected final I getNodeIdentifier() {
+        checkState(nodeIdentifier != null, "Identifier has not been set");
+        return nodeIdentifier;
+    }
 
-    protected V value;
-    protected I nodeIdentifier;
+    protected final V getValue() {
+        checkState(value != null, "Value has not been set");
+        return value;
+    }
 
     @Override
-    public NormalizedNodeBuilder<I,V,R> withValue(V value) {
-        this.value = value;
+    public NormalizedNodeBuilder<I, V, R> withValue(final V withValue) {
+        this.value = requireNonNull(withValue);
         return this;
     }
 
-
     @Override
-    public NormalizedNodeBuilder<I,V,R> withNodeIdentifier(I nodeIdentifier) {
-        this.nodeIdentifier = nodeIdentifier;
+    public NormalizedNodeBuilder<I, V, R> withNodeIdentifier(final I withNodeIdentifier) {
+        this.nodeIdentifier = requireNonNull(withNodeIdentifier);
         return this;
     }
-
 }