Migrate off of deprecated NodeIdentifierWithPredicates methods

This migrates to replacement methods, eliminating warnings.

Change-Id: Iaa15e588f20b6cdc1f6fc63b45d6dacb116fa67d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/yang/yang-data-jaxen/src/main/java/org/opendaylight/yangtools/yang/data/jaxen/LeafrefXPathStringParsingPathArgumentBuilder.java b/yang/yang-data-jaxen/src/main/java/org/opendaylight/yangtools/yang/data/jaxen/LeafrefXPathStringParsingPathArgumentBuilder.java
index 15edcb925c9a20f2a92d4f38d205543831ed0c5a..185a626dac15517466e6a4a76011253929a037ef 100644 (file)
--- a/yang/yang-data-jaxen/src/main/java/org/opendaylight/yangtools/yang/data/jaxen/LeafrefXPathStringParsingPathArgumentBuilder.java
+++ b/yang/yang-data-jaxen/src/main/java/org/opendaylight/yangtools/yang/data/jaxen/LeafrefXPathStringParsingPathArgumentBuilder.java
@@ -126,7 +126,7 @@ final class LeafrefXPathStringParsingPathArgumentBuilder implements Builder<List
 
             keyValues.put(key, keyValue);
         }
-        return new NodeIdentifierWithPredicates(name, keyValues.build());
+        return NodeIdentifierWithPredicates.of(name, keyValues.build());
     }
 
     private Object nextCurrentFunctionPathValue() {

diff --git a/yang/yang-data-jaxen/src/test/java/org/opendaylight/yangtools/yang/data/jaxen/BitIsSetXPathFunctionTest.java b/yang/yang-data-jaxen/src/test/java/org/opendaylight/yangtools/yang/data/jaxen/BitIsSetXPathFunctionTest.java
index 2f26d5ef8f3a4b3c9b78dd497385b8c45c450162..ae121dde02b5bcbadfa857e01d174ca85b1aaed4 100644 (file)
--- a/yang/yang-data-jaxen/src/test/java/org/opendaylight/yangtools/yang/data/jaxen/BitIsSetXPathFunctionTest.java
+++ b/yang/yang-data-jaxen/src/test/java/org/opendaylight/yangtools/yang/data/jaxen/BitIsSetXPathFunctionTest.java
@@ -199,7 +199,7 @@ public class BitIsSetXPathFunctionTest {
 
         final MapNode myListNode = Builders.mapBuilder().withNodeIdentifier(new NodeIdentifier(MY_LIST))
                 .withChild(Builders.mapEntryBuilder().withNodeIdentifier(
-                        new NodeIdentifierWithPredicates(MY_LIST, FLAGS, keyLeafValue))
+                        NodeIdentifierWithPredicates.of(MY_LIST, FLAGS, keyLeafValue))
                         .withChild(ordinaryLeafNode).build()).build();
 
         final ContainerNode myContainerNode = Builders.containerBuilder().withNodeIdentifier(
@@ -213,7 +213,7 @@ public class BitIsSetXPathFunctionTest {
         final ImmutableMap<QName, Object> keys = builder.put(FLAGS, keyLeafValue).build();
 
         final YangInstanceIdentifier path = YangInstanceIdentifier.of(MY_LIST)
-                .node(new NodeIdentifierWithPredicates(MY_LIST, keys)).node(FLAGS);
+                .node(NodeIdentifierWithPredicates.of(MY_LIST, keys)).node(FLAGS);
         return path;
     }
 }

diff --git a/yang/yang-data-jaxen/src/test/java/org/opendaylight/yangtools/yang/data/jaxen/DerefXPathFunctionTest.java b/yang/yang-data-jaxen/src/test/java/org/opendaylight/yangtools/yang/data/jaxen/DerefXPathFunctionTest.java
index e5adb29666e6eff47111632ca02c78dffd22e073..24a08803a13eafbb3f1c7b4773de8fcc94cb0cad 100644 (file)
--- a/yang/yang-data-jaxen/src/test/java/org/opendaylight/yangtools/yang/data/jaxen/DerefXPathFunctionTest.java
+++ b/yang/yang-data-jaxen/src/test/java/org/opendaylight/yangtools/yang/data/jaxen/DerefXPathFunctionTest.java
@@ -182,14 +182,14 @@ public class DerefXPathFunctionTest {
     private static ContainerNode buildMyContainerNodeForIIdTest(final LeafNode<?> referencedLeafNode) {
         final Map<QName, Object> keyValues = ImmutableMap.of(KEY_LEAF_A, "key-value-a", KEY_LEAF_B, "key-value-b");
         final YangInstanceIdentifier iidPath = YangInstanceIdentifier.of(MY_CONTAINER).node(MY_LIST)
-                .node(new NodeIdentifierWithPredicates(MY_LIST, keyValues)).node(REFERENCED_LEAF);
+                .node(NodeIdentifierWithPredicates.of(MY_LIST, keyValues)).node(REFERENCED_LEAF);
 
         final LeafNode<?> iidLeafNode = Builders.leafBuilder().withNodeIdentifier(new NodeIdentifier(IID_LEAF))
                 .withValue(iidPath).build();
 
         final MapNode myListNode = Builders.mapBuilder().withNodeIdentifier(new NodeIdentifier(MY_LIST))
                 .withChild(Builders.mapEntryBuilder().withNodeIdentifier(
-                        new NodeIdentifierWithPredicates(MY_LIST, keyValues))
+                        NodeIdentifierWithPredicates.of(MY_LIST, keyValues))
                         .withChild(iidLeafNode)
                         .withChild(referencedLeafNode).build())
                 .build();
@@ -202,7 +202,7 @@ public class DerefXPathFunctionTest {
     private static YangInstanceIdentifier buildPathToIIdLeafNode() {
         final Map<QName, Object> keyValues = ImmutableMap.of(KEY_LEAF_A, "key-value-a", KEY_LEAF_B, "key-value-b");
         final YangInstanceIdentifier path = YangInstanceIdentifier.of(MY_LIST)
-                .node(new NodeIdentifierWithPredicates(MY_LIST, keyValues)).node(IID_LEAF);
+                .node(NodeIdentifierWithPredicates.of(MY_LIST, keyValues)).node(IID_LEAF);
         return path;
     }
 
@@ -223,7 +223,7 @@ public class DerefXPathFunctionTest {
 
         final MapNode myListNode = Builders.mapBuilder().withNodeIdentifier(new NodeIdentifier(MY_LIST))
                 .withChild(Builders.mapEntryBuilder().withNodeIdentifier(
-                        new NodeIdentifierWithPredicates(MY_LIST, keyValues))
+                        NodeIdentifierWithPredicates.of(MY_LIST, keyValues))
                         .withChild(referencedLeafNode).build())
                 .build();
 
@@ -261,7 +261,7 @@ public class DerefXPathFunctionTest {
 
         final MapNode myListNode = Builders.mapBuilder().withNodeIdentifier(new NodeIdentifier(MY_LIST))
                 .withChild(Builders.mapEntryBuilder().withNodeIdentifier(
-                        new NodeIdentifierWithPredicates(MY_LIST, keyValues))
+                        NodeIdentifierWithPredicates.of(MY_LIST, keyValues))
                         .withChild(referencedLeafListNode).build())
                 .build();
 

diff --git a/yang/yang-data-jaxen/src/test/java/org/opendaylight/yangtools/yang/data/jaxen/DerivedFromXPathFunctionTest.java b/yang/yang-data-jaxen/src/test/java/org/opendaylight/yangtools/yang/data/jaxen/DerivedFromXPathFunctionTest.java
index 7fcd747dd97e4f48e5bbf29b98f681523cd1b2e1..a5336f3754b45863c65687a4106728f3e73720f1 100644 (file)
--- a/yang/yang-data-jaxen/src/test/java/org/opendaylight/yangtools/yang/data/jaxen/DerivedFromXPathFunctionTest.java
+++ b/yang/yang-data-jaxen/src/test/java/org/opendaylight/yangtools/yang/data/jaxen/DerivedFromXPathFunctionTest.java
@@ -272,7 +272,7 @@ public class DerivedFromXPathFunctionTest {
 
         final MapNode myListNode = Builders.mapBuilder().withNodeIdentifier(new NodeIdentifier(MY_LIST))
                 .withChild(Builders.mapEntryBuilder().withNodeIdentifier(
-                        new NodeIdentifierWithPredicates(MY_LIST, KEY_LEAF, "key-value"))
+                        NodeIdentifierWithPredicates.of(MY_LIST, KEY_LEAF, "key-value"))
                         .withChild(idrefLeafNode).build()).build();
 
         final ContainerNode myContainerNode = Builders.containerBuilder().withNodeIdentifier(
@@ -285,7 +285,7 @@ public class DerivedFromXPathFunctionTest {
         final ImmutableMap<QName, Object> keys = builder.put(KEY_LEAF, "key-value").build();
 
         final YangInstanceIdentifier path = YangInstanceIdentifier.of(MY_LIST)
-                .node(new NodeIdentifierWithPredicates(MY_LIST, keys)).node(IDREF_LEAF);
+                .node(NodeIdentifierWithPredicates.of(MY_LIST, keys)).node(IDREF_LEAF);
         return path;
     }
 }

diff --git a/yang/yang-data-jaxen/src/test/java/org/opendaylight/yangtools/yang/data/jaxen/EnumValueXPathFunctionTest.java b/yang/yang-data-jaxen/src/test/java/org/opendaylight/yangtools/yang/data/jaxen/EnumValueXPathFunctionTest.java
index 046f0efbaaaf0586bfb83f1c176e03b092f8539f..065317ed70be3804e9c184274682acd3571f5c59 100644 (file)
--- a/yang/yang-data-jaxen/src/test/java/org/opendaylight/yangtools/yang/data/jaxen/EnumValueXPathFunctionTest.java
+++ b/yang/yang-data-jaxen/src/test/java/org/opendaylight/yangtools/yang/data/jaxen/EnumValueXPathFunctionTest.java
@@ -168,7 +168,7 @@ public class EnumValueXPathFunctionTest {
 
         final MapNode alarmListNode = Builders.mapBuilder().withNodeIdentifier(new NodeIdentifier(ALARM))
                 .withChild(Builders.mapEntryBuilder().withNodeIdentifier(
-                        new NodeIdentifierWithPredicates(ALARM, SEVERITY, keyLeafValue))
+                        NodeIdentifierWithPredicates.of(ALARM, SEVERITY, keyLeafValue))
                         .withChild(ordinaryLeafNode).build()).build();
 
         final ContainerNode myContainerNode = Builders.containerBuilder().withNodeIdentifier(
@@ -181,7 +181,7 @@ public class EnumValueXPathFunctionTest {
         final ImmutableMap<QName, Object> keys = builder.put(SEVERITY, keyLeafValue).build();
 
         final YangInstanceIdentifier path = YangInstanceIdentifier.of(ALARM)
-                .node(new NodeIdentifierWithPredicates(ALARM, keys)).node(SEVERITY);
+                .node(NodeIdentifierWithPredicates.of(ALARM, keys)).node(SEVERITY);
         return path;
     }
 }
\ No newline at end of file

diff --git a/yang/yang-data-jaxen/src/test/java/org/opendaylight/yangtools/yang/data/jaxen/JaxenTest.java b/yang/yang-data-jaxen/src/test/java/org/opendaylight/yangtools/yang/data/jaxen/JaxenTest.java
index 6bfd4f3dc2113466dd51b3d4ddb24b137a022e52..56e7db1f247a35df0439c89b2fcf072258c246e8 100644 (file)
--- a/yang/yang-data-jaxen/src/test/java/org/opendaylight/yangtools/yang/data/jaxen/JaxenTest.java
+++ b/yang/yang-data-jaxen/src/test/java/org/opendaylight/yangtools/yang/data/jaxen/JaxenTest.java
@@ -5,7 +5,6 @@
  * 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.jaxen;
 
 import static org.junit.Assert.assertEquals;
@@ -36,6 +35,7 @@ import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.QNameModule;
 import org.opendaylight.yangtools.yang.common.Revision;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.api.schema.xpath.XPathDocument;
 import org.opendaylight.yangtools.yang.data.api.schema.xpath.XPathExpression;
@@ -182,14 +182,12 @@ public class JaxenTest {
             final Map<QName, Object> keys1 = new HashMap<>();
             keys1.put(leafAQName, "bar");
 
-            final YangInstanceIdentifier.NodeIdentifierWithPredicates mapEntryPath1 = new YangInstanceIdentifier
-                    .NodeIdentifierWithPredicates(listAQName , keys1);
+            final NodeIdentifierWithPredicates mapEntryPath1 = NodeIdentifierWithPredicates.of(listAQName , keys1);
 
             final Map<QName, Object> keys2 = new HashMap<>();
             keys2.put(leafBQName, "two");
 
-            final YangInstanceIdentifier.NodeIdentifierWithPredicates mapEntryPath2 = new YangInstanceIdentifier
-                    .NodeIdentifierWithPredicates(listBQName , keys2);
+            final NodeIdentifierWithPredicates mapEntryPath2 = NodeIdentifierWithPredicates.of(listBQName , keys2);
 
             testYangInstanceIdentifier = YangInstanceIdentifier.of(listAQName).node(mapEntryPath1)
                     .node(listBQName).node(mapEntryPath2).node(leafBQName);