Push out NormalizedNode fixmes

[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 63aec35904c598a933e56e8a193063db7480dfcc..57a0a61e0f9b40e2d303f832b072189f6dd95c39 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,16 +1,19 @@
 /*
  * 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 static java.util.Objects.requireNonNull;
+
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.util.HashCodeBuilder;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.InstanceIdentifierBuilder;
@@ -22,17 +25,17 @@ final class YangInstanceIdentifierBuilder implements InstanceIdentifierBuilder {
     private final HashCodeBuilder<PathArgument> hash;
     private final List<PathArgument> path;
 
-    public YangInstanceIdentifierBuilder() {
+    YangInstanceIdentifierBuilder() {
         this.hash = new HashCodeBuilder<>();
         this.path = new ArrayList<>();
     }
 
-    public YangInstanceIdentifierBuilder(final Iterable<PathArgument> prefix, final int hash) {
-        this.path = Lists.newArrayList(prefix);
+    YangInstanceIdentifierBuilder(final List<PathArgument> prefix, final int hash) {
+        this.path = new ArrayList<>(prefix);
         this.hash = new HashCodeBuilder<>(hash);
     }
 
-    private InstanceIdentifierBuilder addArgument(final PathArgument arg) {
+    private @NonNull InstanceIdentifierBuilder addArgument(final PathArgument arg) {
         path.add(arg);
         hash.addArgument(arg);
         return this;
@@ -40,7 +43,7 @@ final class YangInstanceIdentifierBuilder implements InstanceIdentifierBuilder {
 
     @Override
     public InstanceIdentifierBuilder node(final PathArgument arg) {
-        return addArgument(Preconditions.checkNotNull(arg));
+        return addArgument(requireNonNull(arg));
     }
 
     @Override
@@ -49,23 +52,24 @@ final class YangInstanceIdentifierBuilder implements InstanceIdentifierBuilder {
     }
 
     @Override
-    public InstanceIdentifierBuilder nodeWithKey(final QName nodeType, final QName key, final Object value) {
-        return addArgument(new NodeIdentifierWithPredicates(nodeType, key, value));
+    public InstanceIdentifierBuilder append(final Collection<? extends PathArgument> args) {
+        path.addAll(args);
+        args.forEach(hash::addArgument);
+        return this;
     }
 
     @Override
-    public InstanceIdentifierBuilder nodeWithKey(final QName nodeType, final Map<QName, Object> keyValues) {
-        return addArgument(new NodeIdentifierWithPredicates(nodeType, keyValues));
+    public InstanceIdentifierBuilder nodeWithKey(final QName nodeType, final QName key, final Object value) {
+        return addArgument(NodeIdentifierWithPredicates.of(nodeType, key, value));
     }
 
     @Override
-    @Deprecated
-    public YangInstanceIdentifier toInstance() {
-        return build();
+    public InstanceIdentifierBuilder nodeWithKey(final QName nodeType, final Map<QName, Object> keyValues) {
+        return addArgument(NodeIdentifierWithPredicates.of(nodeType, keyValues));
     }
 
     @Override
     public YangInstanceIdentifier build() {
         return FixedYangInstanceIdentifier.create(path, hash.build());
     }
-}
\ No newline at end of file
+}