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 6e243334c0743cd73b005dccd0f8a6dd3457ab57..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
@@ -10,19 +10,15 @@ package org.opendaylight.yangtools.yang.data.impl.schema.builder.impl;
 import static com.google.common.base.Preconditions.checkState;
 import static java.util.Objects.requireNonNull;
 
-import com.google.common.collect.ImmutableMap;
-import java.util.Map;
-import org.opendaylight.yangtools.yang.common.QName;
+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.NormalizedNodeAttrBuilder;
+import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.NormalizedNodeBuilder;
 
-abstract class AbstractImmutableNormalizedNodeBuilder<I extends PathArgument, V, R extends NormalizedNode<I, ?>>
-        implements NormalizedNodeAttrBuilder<I,V,R> {
-
-    private Map<QName, String> attributes = ImmutableMap.of();
-    private I nodeIdentifier;
-    private V value;
+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");
@@ -34,25 +30,15 @@ abstract class AbstractImmutableNormalizedNodeBuilder<I extends PathArgument, V,
         return value;
     }
 
-    protected final Map<QName, String> getAttributes() {
-        return attributes;
-    }
-
     @Override
-    public NormalizedNodeAttrBuilder<I, V, R> withValue(final V withValue) {
+    public NormalizedNodeBuilder<I, V, R> withValue(final V withValue) {
         this.value = requireNonNull(withValue);
         return this;
     }
 
     @Override
-    public NormalizedNodeAttrBuilder<I, V, R> withNodeIdentifier(final I withNodeIdentifier) {
+    public NormalizedNodeBuilder<I, V, R> withNodeIdentifier(final I withNodeIdentifier) {
         this.nodeIdentifier = requireNonNull(withNodeIdentifier);
         return this;
     }
-
-    @Override
-    public NormalizedNodeAttrBuilder<I, V, R> withAttributes(final Map<QName, String> withAttributes) {
-        this.attributes = requireNonNull(withAttributes);
-        return this;
-    }
 }