Bug 5019: Add QName param to NormalizedNodeWriter#leafSetEntryNode

[yangtools.git] / yang / yang-data-api / src / main / java / org / opendaylight / yangtools / yang / data / api / YangInstanceIdentifierBuilder.java

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..1aa8d73176ea221a6a95c9411e02f44748fb9f5f 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
@@ -1,11 +1,13 @@
 /*
  * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved.
+ *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 package org.opendaylight.yangtools.yang.data.api;
 
+import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 import java.util.ArrayList;
 import java.util.List;
@@ -31,38 +33,34 @@ 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 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;
+    public InstanceIdentifierBuilder node(final PathArgument arg) {
+        return addArgument(Preconditions.checkNotNull(arg));
     }
 
     @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;
+    public InstanceIdentifierBuilder node(final QName nodeType) {
+        return addArgument(new NodeIdentifier(nodeType));
+    }
+
+    @Override
+    public InstanceIdentifierBuilder nodeWithKey(final QName nodeType, final QName key, final Object value) {
+        return addArgument(new NodeIdentifierWithPredicates(nodeType, key, value));
     }
 
     @Override
-    @Deprecated
-    public YangInstanceIdentifier toInstance() {
-        return build();
+    public InstanceIdentifierBuilder nodeWithKey(final QName nodeType, final Map<QName, Object> keyValues) {
+        return addArgument(new NodeIdentifierWithPredicates(nodeType, keyValues));
     }
 
     @Override
     public YangInstanceIdentifier build() {
         return FixedYangInstanceIdentifier.create(path, hash.build());
     }
-}
\ No newline at end of file
+}