Remove code duplication in YangInstanceIdentifierBuilder

The various node() methods share a tail-end, concentrate in a private
method.

Change-Id: Ice0f1b8824b6c5a11a2fdec696a1453817493b5e
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifierBuilder.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifierBuilder.java
index 55f03af8009edf1265e826a40f97d42f37bd554f..4b872045772ff9ef3b82f09df7cd5373c0252007 100644 (file)
--- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifierBuilder.java
+++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifierBuilder.java
@@ -31,28 +31,25 @@ final class YangInstanceIdentifierBuilder implements InstanceIdentifierBuilder {
         this.hash = new HashCodeBuilder<>(hash);
     }
 
-    @Override
-    public InstanceIdentifierBuilder node(final QName nodeType) {
-        final PathArgument arg = new NodeIdentifier(nodeType);
+    private InstanceIdentifierBuilder addArgument(final PathArgument arg) {
         path.add(arg);
         hash.addArgument(arg);
         return this;
     }
 
+    @Override
+    public InstanceIdentifierBuilder node(final QName nodeType) {
+        return addArgument(new NodeIdentifier(nodeType));
+    }
+
     @Override
     public InstanceIdentifierBuilder nodeWithKey(final QName nodeType, final QName key, final Object value) {
-        final PathArgument arg = new NodeIdentifierWithPredicates(nodeType, key, value);
-        path.add(arg);
-        hash.addArgument(arg);
-        return this;
+        return addArgument(new NodeIdentifierWithPredicates(nodeType, key, value));
     }
 
     @Override
     public InstanceIdentifierBuilder nodeWithKey(final QName nodeType, final Map<QName, Object> keyValues) {
-        final PathArgument arg = new NodeIdentifierWithPredicates(nodeType, keyValues);
-        path.add(arg);
-        hash.addArgument(arg);
-        return this;
+        return addArgument(new NodeIdentifierWithPredicates(nodeType, keyValues));
     }
 
     @Override