X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-data-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fdata%2Fimpl%2Fschema%2Fnodes%2FAbstractImmutableNormalizedNode.java;h=848982521b507a3ff62d9bf0606fd6bb4ff530dc;hb=0b18801833d3e236d0afd7c5f2d9690b0a2b3e84;hp=d5a6a2b501bab86229f012f66824ebe543ef5983;hpb=a2a6835fd0618578953744870a7a87bb0b1dbd0e;p=yangtools.git

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableNormalizedNode.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableNormalizedNode.java
index d5a6a2b501..848982521b 100644
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableNormalizedNode.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableNormalizedNode.java
@@ -7,20 +7,17 @@
  */
 package org.opendaylight.yangtools.yang.data.impl.schema.nodes;
 
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.base.Preconditions;
-
+import com.google.common.base.MoreObjects.ToStringHelper;
+import org.opendaylight.yangtools.concepts.AbstractIdentifiable;
 import org.opendaylight.yangtools.concepts.Immutable;
 import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 
-public abstract class AbstractImmutableNormalizedNode<K extends InstanceIdentifier.PathArgument,V> implements NormalizedNode<K, V>, Immutable {
-    private final K nodeIdentifier;
-
+public abstract class AbstractImmutableNormalizedNode<K extends PathArgument, V> extends AbstractIdentifiable<K>
+        implements NormalizedNode<K, V>, Immutable {
     protected AbstractImmutableNormalizedNode(final K nodeIdentifier) {
-        this.nodeIdentifier = Preconditions.checkNotNull(nodeIdentifier, "nodeIdentifier");
+        super(nodeIdentifier);
     }
 
     @Override
@@ -29,20 +26,12 @@ public abstract class AbstractImmutableNormalizedNode<K extends InstanceIdentifi
     }
 
     @Override
-    public final K getIdentifier() {
-        return nodeIdentifier;
-    }
-
-    @Override
-    public final String toString() {
-        return addToStringAttributes(Objects.toStringHelper(this)).toString();
-    }
-
     protected ToStringHelper addToStringAttributes(final ToStringHelper toStringHelper) {
-        return toStringHelper.add("nodeIdentifier", nodeIdentifier).add("value", getValue());
+        return super.addToStringAttributes(toStringHelper).add("value", getValue());
     }
 
     protected abstract boolean valueEquals(AbstractImmutableNormalizedNode<?, ?> other);
+
     protected abstract int valueHashCode();
 
     @Override
@@ -50,25 +39,16 @@ public abstract class AbstractImmutableNormalizedNode<K extends InstanceIdentifi
         if (this == obj) {
             return true;
         }
-        if (obj == null) {
-            return false;
-        }
-        if (this.getClass() != obj.getClass()) {
+        if (obj == null || this.getClass() != obj.getClass()) {
             return false;
         }
 
         final AbstractImmutableNormalizedNode<?, ?> other = (AbstractImmutableNormalizedNode<?, ?>)obj;
-        if (!nodeIdentifier.equals(other.nodeIdentifier)) {
-            return false;
-        }
-
-        return valueEquals(other);
+        return getIdentifier().equals(other.getIdentifier()) && valueEquals(other);
     }
 
     @Override
     public final int hashCode() {
-        int result = nodeIdentifier.hashCode();
-        result = 31 * result + valueHashCode();
-        return result;
+        return 31 * getIdentifier().hashCode() + valueHashCode();
     }
 }