Rename AnyXmlNode to DOMSourceAnyxmlNode

[yangtools.git] / yang / yang-data-impl / src / main / java / org / opendaylight / yangtools / yang / data / impl / leafref / QNamePredicateImpl.java

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/QNamePredicateImpl.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/QNamePredicateImpl.java
index 6607475acef361a2bb83313a02994fc5219eda6d..73e7bcd123b96b11b1d6b318fed622fe8a0bd188 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/QNamePredicateImpl.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/QNamePredicateImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2015 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -7,21 +7,22 @@
  */
 package org.opendaylight.yangtools.yang.data.impl.leafref;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import java.io.Serializable;
 import org.opendaylight.yangtools.concepts.Immutable;
 import org.opendaylight.yangtools.yang.common.QName;
 
-class QNamePredicateImpl implements Immutable, Serializable,
-        QNamePredicate {
-
+class QNamePredicateImpl implements Immutable, Serializable, QNamePredicate {
     private static final long serialVersionUID = 1L;
+
     private final QName identifier;
     private final LeafRefPath pathKeyExpression;
 
-    public QNamePredicateImpl(final QName identifier, final LeafRefPath pathKeyExpression) {
-        this.identifier = Preconditions.checkNotNull(identifier, "QNamePredicate: identifier should not be null");
-        this.pathKeyExpression = Preconditions.checkNotNull(pathKeyExpression, "QNamePredicate: pathKeyExpression should not be null");
+    QNamePredicateImpl(final QName identifier, final LeafRefPath pathKeyExpression) {
+        this.identifier = requireNonNull(identifier, "QNamePredicate: identifier should not be null");
+        this.pathKeyExpression = requireNonNull(pathKeyExpression,
+            "QNamePredicate: pathKeyExpression should not be null");
     }
 
     @Override
@@ -37,20 +38,12 @@ class QNamePredicateImpl implements Immutable, Serializable,
     @Override
     public String toString() {
         final StringBuilder sb = new StringBuilder();
-        sb.append("[");
+        sb.append('[').append(identifier).append("=current()");
 
-        sb.append(identifier);
-        sb.append("=current()");
-
-        final Iterable<QNameWithPredicate> pathFromRoot = pathKeyExpression
-                .getPathFromRoot();
-
-        for (final QNameWithPredicate qName : pathFromRoot) {
-            sb.append("/" + qName);
+        for (final QNameWithPredicate qname : pathKeyExpression.getPathFromRoot()) {
+            sb.append('/').append(qname);
         }
 
-        sb.append("]");
-        return sb.toString();
+        return sb.append(']').toString();
     }
-
 }