NoddeWithValue is generic

This fixes warnings with use of the raw type. Also cleans up references
to YangInstanceIdentifier inner classes.

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

diff --git a/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifierTest.java b/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifierTest.java
index d4a0abb530e8077bcfa7ca8f8277589a3937c16f..0f1483444faaedd809dff96a585c72dd1659a4f6 100644 (file)
--- a/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifierTest.java
+++ b/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifierTest.java
@@ -273,29 +273,29 @@ public class YangInstanceIdentifierTest {
     @Test
     public void testNodeWithValue() {
 
     @Test
     public void testNodeWithValue() {
 

-        NodeWithValue node1 = new NodeWithValue( NODENAME1, "foo" );
+        NodeWithValue<?> node1 = new NodeWithValue<>( NODENAME1, "foo" );

         assertEquals( "getNodeType", NODENAME1, node1.getNodeType() );
         assertEquals( "getValue", "foo", node1.getValue() );
 
         assertEquals( "getNodeType", NODENAME1, node1.getNodeType() );
         assertEquals( "getValue", "foo", node1.getValue() );
 

-        NodeWithValue node2 = new NodeWithValue( NODENAME1, "foo" );
+        NodeWithValue<?> node2 = new NodeWithValue<>( NODENAME1, "foo" );

 
         assertEquals( "hashCode", node1.hashCode(), node2.hashCode() );
         assertEquals( "equals", true, node1.equals( node2 ) );
 
 
         assertEquals( "hashCode", node1.hashCode(), node2.hashCode() );
         assertEquals( "equals", true, node1.equals( node2 ) );
 

-        assertEquals( "equals", false, node1.equals( new NodeWithValue( NODENAME1, "bar" ) ) );
-        assertEquals( "equals", false, node1.equals( new NodeWithValue( NODENAME2, "foo" ) ) );
+        assertEquals( "equals", false, node1.equals( new NodeWithValue<>( NODENAME1, "bar" ) ) );
+        assertEquals( "equals", false, node1.equals( new NodeWithValue<>( NODENAME2, "foo" ) ) );

         assertEquals( "equals", false, node1.equals( new Object() ) );
 
         assertNotNull( node1.toString() ); // for code coverage
         assertNotNull( node1.toRelativeString(node2) );
 
         assertEquals( "equals", false, node1.equals( new Object() ) );
 
         assertNotNull( node1.toString() ); // for code coverage
         assertNotNull( node1.toRelativeString(node2) );
 

-        NodeWithValue node3 = new NodeWithValue( NODENAME1, new byte[]{1,2} );
-        NodeWithValue node4 = new NodeWithValue( NODENAME1, new byte[]{1,2} );
+        NodeWithValue<?> node3 = new NodeWithValue<>( NODENAME1, new byte[]{1,2} );
+        NodeWithValue<?> node4 = new NodeWithValue<>( NODENAME1, new byte[]{1,2} );

 
         assertEquals( "hashCode", node3.hashCode(), node4.hashCode() );
         assertEquals( "equals", true, node3.equals( node4 ) );
 
 
         assertEquals( "hashCode", node3.hashCode(), node4.hashCode() );
         assertEquals( "equals", true, node3.equals( node4 ) );
 

-        assertEquals( "equals", false, node3.equals( new NodeWithValue( NODENAME1, new byte[]{1,3} ) ) );
+        assertEquals( "equals", false, node3.equals( new NodeWithValue<>( NODENAME1, new byte[]{1,3} ) ) );

         assertEquals( "equals", false, node3.equals( node1 ) );
     }
 
         assertEquals( "equals", false, node3.equals( node1 ) );
     }
 

diff --git a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/TestingNormalizedNodeStructuresCreator.java b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/TestingNormalizedNodeStructuresCreator.java
index 79011b131c8df379a413aa57aed066e27a967f51..0001a05aada6fd56f6216d4467d75e146694d151 100644 (file)
--- a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/TestingNormalizedNodeStructuresCreator.java
+++ b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/TestingNormalizedNodeStructuresCreator.java
@@ -37,8 +37,9 @@ import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.ListNodeBuil
 
 public class TestingNormalizedNodeStructuresCreator {
 
 
 public class TestingNormalizedNodeStructuresCreator {
 

+    @SafeVarargs

     static NormalizedNode<?, ?> cont1Node(
     static NormalizedNode<?, ?> cont1Node(

-            DataContainerChild<? extends YangInstanceIdentifier.PathArgument, ?>... children) {
+            final DataContainerChild<? extends PathArgument, ?>... children) {

         DataContainerNodeAttrBuilder<NodeIdentifier, ContainerNode> cont1 = Builders.containerBuilder();
         cont1.withNodeIdentifier(new NodeIdentifier(QName.create("ns:complex:json", "2014-08-11", "cont1")));
 
         DataContainerNodeAttrBuilder<NodeIdentifier, ContainerNode> cont1 = Builders.containerBuilder();
         cont1.withNodeIdentifier(new NodeIdentifier(QName.create("ns:complex:json", "2014-08-11", "cont1")));
 


@@ -105,8 +106,9 @@ public class TestingNormalizedNodeStructuresCreator {
                 .withValue("lf15_11 value from augmentation").build();
     }
 
                 .withValue("lf15_11 value from augmentation").build();
     }
 

+    @SafeVarargs

     private static DataContainerChild<? extends PathArgument, ?> choc11Node(
     private static DataContainerChild<? extends PathArgument, ?> choc11Node(

-            DataContainerChild<? extends PathArgument, ?>... children) {
+            final DataContainerChild<? extends PathArgument, ?>... children) {

         DataContainerNodeBuilder<NodeIdentifier, ChoiceNode> choc11Builder = Builders.choiceBuilder()
                 .withNodeIdentifier(new NodeIdentifier(QName.create("ns:complex:json", "2014-08-11", "choc11")));
         choc11Builder.withValue(Lists.newArrayList(children));
         DataContainerNodeBuilder<NodeIdentifier, ChoiceNode> choc11Builder = Builders.choiceBuilder()
                 .withNodeIdentifier(new NodeIdentifier(QName.create("ns:complex:json", "2014-08-11", "choc11")));
         choc11Builder.withValue(Lists.newArrayList(children));


@@ -206,7 +208,7 @@ public class TestingNormalizedNodeStructuresCreator {
         return YangInstanceIdentifier.create(
                 new NodeIdentifier(QName.create("ns:complex:json", "2014-08-11", "cont1")),
                 new NodeIdentifier(QName.create("ns:complex:json", "2014-08-11", "lflst11")),
         return YangInstanceIdentifier.create(
                 new NodeIdentifier(QName.create("ns:complex:json", "2014-08-11", "cont1")),
                 new NodeIdentifier(QName.create("ns:complex:json", "2014-08-11", "lflst11")),

-                new NodeWithValue(QName.create("ns:complex:json", "2014-08-11", "lflst11"),"foo")
+                new NodeWithValue<>(QName.create("ns:complex:json", "2014-08-11", "lflst11"),"foo")

         );
     }
 
         );
     }
 


@@ -216,12 +218,12 @@ public class TestingNormalizedNodeStructuresCreator {
         lflst11.withChild(Builders
                 .leafSetEntryBuilder()
                 .withNodeIdentifier(
         lflst11.withChild(Builders
                 .leafSetEntryBuilder()
                 .withNodeIdentifier(

-                        new NodeWithValue(QName.create("ns:complex:json", "2014-08-11", "lflst11"), "lflst11 value1"))
+                        new NodeWithValue<>(QName.create("ns:complex:json", "2014-08-11", "lflst11"), "lflst11 value1"))

                 .withValue("lflst11 value1").build());
         lflst11.withChild(Builders
                 .leafSetEntryBuilder()
                 .withNodeIdentifier(
                 .withValue("lflst11 value1").build());
         lflst11.withChild(Builders
                 .leafSetEntryBuilder()
                 .withNodeIdentifier(

-                        new NodeWithValue(QName.create("ns:complex:json", "2014-08-11", "lflst11"), "lflst11 value2"))
+                        new NodeWithValue<>(QName.create("ns:complex:json", "2014-08-11", "lflst11"), "lflst11 value2"))

                 .withValue("lflst11 value2").build());
         return lflst11.build();
     }
                 .withValue("lflst11 value2").build());
         return lflst11.build();
     }


@@ -232,12 +234,12 @@ public class TestingNormalizedNodeStructuresCreator {
         lflst11.withChild(Builders
                 .leafSetEntryBuilder()
                 .withNodeIdentifier(
         lflst11.withChild(Builders
                 .leafSetEntryBuilder()
                 .withNodeIdentifier(

-                        new NodeWithValue(QName.create("ns:complex:json", "2014-08-11", "lflst11"), "lflst11 value1\nanother line 1"))
+                        new NodeWithValue<>(QName.create("ns:complex:json", "2014-08-11", "lflst11"), "lflst11 value1\nanother line 1"))

                 .withValue("lflst11 value1\nanother line 1").build());
         lflst11.withChild(Builders
                 .leafSetEntryBuilder()
                 .withNodeIdentifier(
                 .withValue("lflst11 value1\nanother line 1").build());
         lflst11.withChild(Builders
                 .leafSetEntryBuilder()
                 .withNodeIdentifier(

-                        new NodeWithValue(QName.create("ns:complex:json", "2014-08-11", "lflst11"), "lflst11 value2\r\nanother line 2"))
+                        new NodeWithValue<>(QName.create("ns:complex:json", "2014-08-11", "lflst11"), "lflst11 value2\r\nanother line 2"))

                 .withValue("lflst11 value2\r\nanother line 2").build());
         return lflst11.build();
     }
                 .withValue("lflst11 value2\r\nanother line 2").build());
         return lflst11.build();
     }

diff --git a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/retest/Bug4969Test.java b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/retest/Bug4969Test.java
index 1f704e56d6ef1e60585a10f0841633ddbc451bd9..babd4fb51f2cf5830c70f1fa8997d0c1ad6088f6 100644 (file)
--- a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/retest/Bug4969Test.java
+++ b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/retest/Bug4969Test.java
@@ -10,7 +10,6 @@ package org.opendaylight.yangtools.yang.data.codec.gson.retest;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;

-

 import com.google.common.base.Optional;
 import com.google.gson.stream.JsonReader;
 import java.io.File;
 import com.google.common.base.Optional;
 import com.google.gson.stream.JsonReader;
 import java.io.File;


@@ -55,7 +54,7 @@ public class Bug4969Test {
         verifyNormalizedNodeResult(context);
     }
 
         verifyNormalizedNodeResult(context);
     }
 

-    private void verifyNormalizedNodeResult(SchemaContext context) throws IOException, URISyntaxException {
+    private static void verifyNormalizedNodeResult(final SchemaContext context) throws IOException, URISyntaxException {

         final String inputJson = TestUtils.loadTextFile("/bug-4969/json/foo.json");
         final NormalizedNodeResult result = new NormalizedNodeResult();
         final NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result);
         final String inputJson = TestUtils.loadTextFile("/bug-4969/json/foo.json");
         final NormalizedNodeResult result = new NormalizedNodeResult();
         final NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result);


@@ -123,7 +122,7 @@ public class Bug4969Test {
         parseJsonToNormalizedNodes(context);
     }
 
         parseJsonToNormalizedNodes(context);
     }
 

-    private void parseJsonToNormalizedNodes(SchemaContext context) throws IOException, URISyntaxException {
+    private static void parseJsonToNormalizedNodes(final SchemaContext context) throws IOException, URISyntaxException {

         final String inputJson = TestUtils.loadTextFile("/leafref/json/data.json");
         final NormalizedNodeResult result = new NormalizedNodeResult();
         final NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result);
         final String inputJson = TestUtils.loadTextFile("/leafref/json/data.json");
         final NormalizedNodeResult result = new NormalizedNodeResult();
         final NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result);

diff --git a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/retest/TestingNormalizedNodeStructuresCreator.java b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/retest/TestingNormalizedNodeStructuresCreator.java
index d2fa87808b584469da0c4e543c0e660d60351acc..52f7bd7a844f38140f60d270ec76ab55b03c89cb 100644 (file)
--- a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/retest/TestingNormalizedNodeStructuresCreator.java
+++ b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/retest/TestingNormalizedNodeStructuresCreator.java
@@ -9,10 +9,8 @@ package org.opendaylight.yangtools.yang.data.codec.gson.retest;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;

-

 import java.util.HashMap;
 import java.util.Map;
 import java.util.HashMap;
 import java.util.Map;

-

 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier;


@@ -39,8 +37,9 @@ import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.ListNodeBuil
 
 public class TestingNormalizedNodeStructuresCreator {
 
 
 public class TestingNormalizedNodeStructuresCreator {
 

+    @SafeVarargs

     static NormalizedNode<?, ?> cont1Node(
     static NormalizedNode<?, ?> cont1Node(

-            DataContainerChild<? extends PathArgument, ?>... children) {
+            final DataContainerChild<? extends PathArgument, ?>... children) {

         DataContainerNodeAttrBuilder<NodeIdentifier, ContainerNode> cont1 = Builders.containerBuilder();
         cont1.withNodeIdentifier(new NodeIdentifier(QName.create("ns:complex:json", "2014-08-11", "cont1")));
 
         DataContainerNodeAttrBuilder<NodeIdentifier, ContainerNode> cont1 = Builders.containerBuilder();
         cont1.withNodeIdentifier(new NodeIdentifier(QName.create("ns:complex:json", "2014-08-11", "cont1")));
 


@@ -107,8 +106,9 @@ public class TestingNormalizedNodeStructuresCreator {
                 .withValue("lf15_11 value from augmentation").build();
     }
 
                 .withValue("lf15_11 value from augmentation").build();
     }
 

+    @SafeVarargs

     private static DataContainerChild<? extends PathArgument, ?> choc11Node(
     private static DataContainerChild<? extends PathArgument, ?> choc11Node(

-            DataContainerChild<? extends PathArgument, ?>... children) {
+            final DataContainerChild<? extends PathArgument, ?>... children) {

         DataContainerNodeBuilder<NodeIdentifier, ChoiceNode> choc11Builder = Builders.choiceBuilder()
                 .withNodeIdentifier(new NodeIdentifier(QName.create("ns:complex:json", "2014-08-11", "choc11")));
         choc11Builder.withValue(Lists.newArrayList(children));
         DataContainerNodeBuilder<NodeIdentifier, ChoiceNode> choc11Builder = Builders.choiceBuilder()
                 .withNodeIdentifier(new NodeIdentifier(QName.create("ns:complex:json", "2014-08-11", "choc11")));
         choc11Builder.withValue(Lists.newArrayList(children));


@@ -208,7 +208,7 @@ public class TestingNormalizedNodeStructuresCreator {
         return YangInstanceIdentifier.create(
                 new NodeIdentifier(QName.create("ns:complex:json", "2014-08-11", "cont1")),
                 new NodeIdentifier(QName.create("ns:complex:json", "2014-08-11", "lflst11")),
         return YangInstanceIdentifier.create(
                 new NodeIdentifier(QName.create("ns:complex:json", "2014-08-11", "cont1")),
                 new NodeIdentifier(QName.create("ns:complex:json", "2014-08-11", "lflst11")),

-                new NodeWithValue(QName.create("ns:complex:json", "2014-08-11", "lflst11"),"foo")
+                new NodeWithValue<>(QName.create("ns:complex:json", "2014-08-11", "lflst11"),"foo")

         );
     }
 
         );
     }
 


@@ -218,12 +218,12 @@ public class TestingNormalizedNodeStructuresCreator {
         lflst11.withChild(Builders
                 .leafSetEntryBuilder()
                 .withNodeIdentifier(
         lflst11.withChild(Builders
                 .leafSetEntryBuilder()
                 .withNodeIdentifier(

-                        new NodeWithValue(QName.create("ns:complex:json", "2014-08-11", "lflst11"), "lflst11 value1"))
+                        new NodeWithValue<>(QName.create("ns:complex:json", "2014-08-11", "lflst11"), "lflst11 value1"))

                 .withValue("lflst11 value1").build());
         lflst11.withChild(Builders
                 .leafSetEntryBuilder()
                 .withNodeIdentifier(
                 .withValue("lflst11 value1").build());
         lflst11.withChild(Builders
                 .leafSetEntryBuilder()
                 .withNodeIdentifier(

-                        new NodeWithValue(QName.create("ns:complex:json", "2014-08-11", "lflst11"), "lflst11 value2"))
+                        new NodeWithValue<>(QName.create("ns:complex:json", "2014-08-11", "lflst11"), "lflst11 value2"))

                 .withValue("lflst11 value2").build());
         return lflst11.build();
     }
                 .withValue("lflst11 value2").build());
         return lflst11.build();
     }


@@ -234,12 +234,12 @@ public class TestingNormalizedNodeStructuresCreator {
         lflst11.withChild(Builders
                 .leafSetEntryBuilder()
                 .withNodeIdentifier(
         lflst11.withChild(Builders
                 .leafSetEntryBuilder()
                 .withNodeIdentifier(

-                        new NodeWithValue(QName.create("ns:complex:json", "2014-08-11", "lflst11"), "lflst11 value1\nanother line 1"))
+                        new NodeWithValue<>(QName.create("ns:complex:json", "2014-08-11", "lflst11"), "lflst11 value1\nanother line 1"))

                 .withValue("lflst11 value1\nanother line 1").build());
         lflst11.withChild(Builders
                 .leafSetEntryBuilder()
                 .withNodeIdentifier(
                 .withValue("lflst11 value1\nanother line 1").build());
         lflst11.withChild(Builders
                 .leafSetEntryBuilder()
                 .withNodeIdentifier(

-                        new NodeWithValue(QName.create("ns:complex:json", "2014-08-11", "lflst11"), "lflst11 value2\r\nanother line 2"))
+                        new NodeWithValue<>(QName.create("ns:complex:json", "2014-08-11", "lflst11"), "lflst11 value2\r\nanother line 2"))

                 .withValue("lflst11 value2\r\nanother line 2").build());
         return lflst11.build();
     }
                 .withValue("lflst11 value2\r\nanother line 2").build());
         return lflst11.build();
     }

diff --git a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/retest/YangModeledAnyXmlSupportTest.java b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/retest/YangModeledAnyXmlSupportTest.java
index a9baac8decb81fe93491e7cb29d06004c1e479a4..220bb7193ba6f2062af371b79178cc300325c995 100644 (file)
--- a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/retest/YangModeledAnyXmlSupportTest.java
+++ b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/retest/YangModeledAnyXmlSupportTest.java
@@ -10,7 +10,6 @@ package org.opendaylight.yangtools.yang.data.codec.gson.retest;
 import static org.junit.Assert.assertEquals;
 import static org.opendaylight.yangtools.yang.data.codec.gson.retest.TestUtils.loadModules;
 import static org.opendaylight.yangtools.yang.data.codec.gson.retest.TestUtils.loadTextFile;
 import static org.junit.Assert.assertEquals;
 import static org.opendaylight.yangtools.yang.data.codec.gson.retest.TestUtils.loadModules;
 import static org.opendaylight.yangtools.yang.data.codec.gson.retest.TestUtils.loadTextFile;

-

 import com.google.common.base.Preconditions;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;
 import com.google.common.base.Preconditions;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;


@@ -106,7 +105,7 @@ public class YangModeledAnyXmlSupportTest {
         assertEquals(expextedJson, serializedJson);
     }
 
         assertEquals(expextedJson, serializedJson);
     }
 

-    private String normalizedNodeToJsonStreamTransformation(final Writer writer,
+    private static String normalizedNodeToJsonStreamTransformation(final Writer writer,

             final NormalizedNode<?, ?> inputStructure) throws IOException {
 
         final NormalizedNodeStreamWriter jsonStream = JSONNormalizedNodeStreamWriter.createExclusiveWriter(
             final NormalizedNode<?, ?> inputStructure) throws IOException {
 
         final NormalizedNodeStreamWriter jsonStream = JSONNormalizedNodeStreamWriter.createExclusiveWriter(

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/retest/XmlUtils.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/retest/XmlUtils.java
index 55aa66725207e69d7d8c4feb568de51be5c62cd6..c2d8ba3d529e9556b3fb4bfda0b53691d9242b2a 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/retest/XmlUtils.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/retest/XmlUtils.java
@@ -73,7 +73,7 @@ public final class XmlUtils {
                 }
             } else if (pathArgument instanceof NodeWithValue) {
                 textContent.append("[.='");
                 }
             } else if (pathArgument instanceof NodeWithValue) {
                 textContent.append("[.='");

-                textContent.append(((NodeWithValue) pathArgument).getValue());
+                textContent.append(((NodeWithValue<?>) pathArgument).getValue());

                 textContent.append("']");
             }
         }
                 textContent.append("']");
             }
         }

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/InstanceIdToSimpleNodes.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/InstanceIdToSimpleNodes.java
index ab62d4cc28f17f454f2936872cefb3c302d8bf13..e5d91fb3c8977ae5d03ac3e23a000eee05c681ce 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/InstanceIdToSimpleNodes.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/InstanceIdToSimpleNodes.java
@@ -14,6 +14,9 @@ import java.util.Map;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.ModifyAction;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.ModifyAction;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;

+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;

 import org.opendaylight.yangtools.yang.data.api.schema.LeafNode;
 import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.api.schema.LeafNode;
 import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;


@@ -24,7 +27,7 @@ import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
 /**
 * Base strategy for converting an instance identifier into a normalized node structure for leaf and leaf-list types.
 */
 /**
 * Base strategy for converting an instance identifier into a normalized node structure for leaf and leaf-list types.
 */

-abstract class InstanceIdToSimpleNodes<T extends YangInstanceIdentifier.PathArgument> extends InstanceIdToNodes<T> {
+abstract class InstanceIdToSimpleNodes<T extends PathArgument> extends InstanceIdToNodes<T> {

 
     protected InstanceIdToSimpleNodes(final T identifier) {
         super(identifier);
 
     protected InstanceIdToSimpleNodes(final T identifier) {
         super(identifier);


@@ -33,8 +36,8 @@ abstract class InstanceIdToSimpleNodes<T extends YangInstanceIdentifier.PathArgu
     @Override
     public NormalizedNode<?, ?> create(final YangInstanceIdentifier instanceId, final Optional<NormalizedNode<?, ?>> deepestChild, final Optional<Map.Entry<QName,ModifyAction>> operation) {
         checkNotNull(instanceId);
     @Override
     public NormalizedNode<?, ?> create(final YangInstanceIdentifier instanceId, final Optional<NormalizedNode<?, ?>> deepestChild, final Optional<Map.Entry<QName,ModifyAction>> operation) {
         checkNotNull(instanceId);

-        final YangInstanceIdentifier.PathArgument pathArgument = instanceId.getPathArguments().get(0);
-        final NormalizedNodeAttrBuilder<? extends YangInstanceIdentifier.PathArgument, Object, ? extends NormalizedNode<? extends YangInstanceIdentifier.PathArgument, Object>> builder = getBuilder(pathArgument);
+        final PathArgument pathArgument = instanceId.getPathArguments().get(0);
+        final NormalizedNodeAttrBuilder<? extends PathArgument, Object, ? extends NormalizedNode<? extends PathArgument, Object>> builder = getBuilder(pathArgument);

 
         if(deepestChild.isPresent()) {
             builder.withValue(deepestChild.get().getValue());
 
         if(deepestChild.isPresent()) {
             builder.withValue(deepestChild.get().getValue());


@@ -44,21 +47,21 @@ abstract class InstanceIdToSimpleNodes<T extends YangInstanceIdentifier.PathArgu
         return builder.build();
     }
 
         return builder.build();
     }
 

-    protected abstract NormalizedNodeAttrBuilder<? extends YangInstanceIdentifier.PathArgument, Object, ? extends NormalizedNode<? extends YangInstanceIdentifier.PathArgument, Object>> getBuilder(YangInstanceIdentifier.PathArgument node);
+    protected abstract NormalizedNodeAttrBuilder<? extends PathArgument, Object, ? extends NormalizedNode<? extends PathArgument, Object>> getBuilder(PathArgument node);

 
     @Override
 
     @Override

-    public InstanceIdToNodes<?> getChild(final YangInstanceIdentifier.PathArgument child) {
+    public InstanceIdToNodes<?> getChild(final PathArgument child) {

         return null;
     }
 
         return null;
     }
 

-    static final class LeafNormalization extends InstanceIdToSimpleNodes<YangInstanceIdentifier.NodeIdentifier> {
+    static final class LeafNormalization extends InstanceIdToSimpleNodes<NodeIdentifier> {

 
         protected LeafNormalization(final LeafSchemaNode potential) {
 
         protected LeafNormalization(final LeafSchemaNode potential) {

-            super(new YangInstanceIdentifier.NodeIdentifier(potential.getQName()));
+            super(new NodeIdentifier(potential.getQName()));

         }
 
         @Override
         }
 
         @Override

-        protected NormalizedNodeAttrBuilder<YangInstanceIdentifier.NodeIdentifier, Object, LeafNode<Object>> getBuilder(final YangInstanceIdentifier.PathArgument node) {
+        protected NormalizedNodeAttrBuilder<YangInstanceIdentifier.NodeIdentifier, Object, LeafNode<Object>> getBuilder(final PathArgument node) {

             return Builders.leafBuilder().withNodeIdentifier(getIdentifier());
         }
 
             return Builders.leafBuilder().withNodeIdentifier(getIdentifier());
         }
 


@@ -68,16 +71,16 @@ abstract class InstanceIdToSimpleNodes<T extends YangInstanceIdentifier.PathArgu
         }
     }
 
         }
     }
 

-    static final class LeafListEntryNormalization extends InstanceIdToSimpleNodes<YangInstanceIdentifier.NodeWithValue> {
+    static final class LeafListEntryNormalization extends InstanceIdToSimpleNodes<NodeWithValue> {

 
         public LeafListEntryNormalization(final LeafListSchemaNode potential) {
 
         public LeafListEntryNormalization(final LeafListSchemaNode potential) {

-            super(new YangInstanceIdentifier.NodeWithValue(potential.getQName(), null));
+            super(new YangInstanceIdentifier.NodeWithValue<>(potential.getQName(), null));

         }
 
         @Override
         }
 
         @Override

-        protected NormalizedNodeAttrBuilder<YangInstanceIdentifier.NodeWithValue, Object, LeafSetEntryNode<Object>> getBuilder(final YangInstanceIdentifier.PathArgument node) {
+        protected NormalizedNodeAttrBuilder<NodeWithValue, Object, LeafSetEntryNode<Object>> getBuilder(final YangInstanceIdentifier.PathArgument node) {

             Preconditions.checkArgument(node instanceof YangInstanceIdentifier.NodeWithValue);
             Preconditions.checkArgument(node instanceof YangInstanceIdentifier.NodeWithValue);

-            return Builders.leafSetEntryBuilder().withNodeIdentifier((YangInstanceIdentifier.NodeWithValue) node).withValue(((YangInstanceIdentifier.NodeWithValue) node).getValue());
+            return Builders.leafSetEntryBuilder().withNodeIdentifier((YangInstanceIdentifier.NodeWithValue<?>) node).withValue(((YangInstanceIdentifier.NodeWithValue<?>) node).getValue());

         }
 
         @Override
         }
 
         @Override

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableLeafSetEntryNodeSchemaAwareBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableLeafSetEntryNodeSchemaAwareBuilder.java
index ee81f907c7dc64c453eaf1bd4559633909812af8..248ee28411ecb891c84807858db1caf9f6a9c354 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableLeafSetEntryNodeSchemaAwareBuilder.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableLeafSetEntryNodeSchemaAwareBuilder.java
@@ -27,7 +27,7 @@ public final class ImmutableLeafSetEntryNodeSchemaAwareBuilder<T> extends Immuta
 
     @Override
     public NormalizedNodeAttrBuilder<NodeWithValue, T, LeafSetEntryNode<T>> withValue(final T value) {
 
     @Override
     public NormalizedNodeAttrBuilder<NodeWithValue, T, LeafSetEntryNode<T>> withValue(final T value) {

-        super.withNodeIdentifier(new NodeWithValue(schema.getQName(), value));
+        super.withNodeIdentifier(new NodeWithValue<>(schema.getQName(), value));

         // TODO check value type using TypeProvider ?
         return super.withValue(value);
     }
         // TODO check value type using TypeProvider ?
         return super.withValue(value);
     }

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableLeafSetNodeBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableLeafSetNodeBuilder.java
index 2c5e3ba596b522eac8d1393e567660f815c3c9e9..943c78975126f50801c322ff10f498296a76375f 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableLeafSetNodeBuilder.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableLeafSetNodeBuilder.java
@@ -100,7 +100,7 @@ public class ImmutableLeafSetNodeBuilder<T> implements ListNodeBuilder<T, LeafSe
     @Override
     public ListNodeBuilder<T, LeafSetEntryNode<T>> withChildValue(final T value, final Map<QName, String> attributes) {
         final ImmutableLeafSetEntryNodeBuilder<T> b = ImmutableLeafSetEntryNodeBuilder.create();
     @Override
     public ListNodeBuilder<T, LeafSetEntryNode<T>> withChildValue(final T value, final Map<QName, String> attributes) {
         final ImmutableLeafSetEntryNodeBuilder<T> b = ImmutableLeafSetEntryNodeBuilder.create();

-        b.withNodeIdentifier(new NodeWithValue(nodeIdentifier.getNodeType(), value));
+        b.withNodeIdentifier(new NodeWithValue<>(nodeIdentifier.getNodeType(), value));

         b.withValue(value);
         b.withAttributes(attributes);
         return withChild(b.build());
         b.withValue(value);
         b.withAttributes(attributes);
         return withChild(b.build());

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableOrderedLeafSetNodeBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableOrderedLeafSetNodeBuilder.java
index 67eb342fabaf1ae5e31073d068bace381a555b13..059741d6a01fd656ed422575f8c2c8de06cb69e8 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableOrderedLeafSetNodeBuilder.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableOrderedLeafSetNodeBuilder.java
@@ -16,8 +16,8 @@ import java.util.Map;
 import org.opendaylight.yangtools.concepts.Immutable;
 import org.opendaylight.yangtools.util.UnmodifiableCollection;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.concepts.Immutable;
 import org.opendaylight.yangtools.util.UnmodifiableCollection;
 import org.opendaylight.yangtools.yang.common.QName;

-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;

 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;

+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue;

 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
 import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode;
 import org.opendaylight.yangtools.yang.data.api.schema.LeafSetNode;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
 import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode;
 import org.opendaylight.yangtools.yang.data.api.schema.LeafSetNode;


@@ -28,8 +28,8 @@ import org.opendaylight.yangtools.yang.data.impl.schema.nodes.AbstractImmutableN
 
 public class ImmutableOrderedLeafSetNodeBuilder<T> implements ListNodeBuilder<T, LeafSetEntryNode<T>> {
 
 
 public class ImmutableOrderedLeafSetNodeBuilder<T> implements ListNodeBuilder<T, LeafSetEntryNode<T>> {
 

-    private Map<YangInstanceIdentifier.NodeWithValue, LeafSetEntryNode<T>> value;
-    private YangInstanceIdentifier.NodeIdentifier nodeIdentifier;
+    private Map<NodeWithValue, LeafSetEntryNode<T>> value;
+    private NodeIdentifier nodeIdentifier;

     private boolean dirty;
 
     protected ImmutableOrderedLeafSetNodeBuilder() {
     private boolean dirty;
 
     protected ImmutableOrderedLeafSetNodeBuilder() {


@@ -83,8 +83,7 @@ public class ImmutableOrderedLeafSetNodeBuilder<T> implements ListNodeBuilder<T,
     }
 
     @Override
     }
 
     @Override

-    public ListNodeBuilder<T, LeafSetEntryNode<T>> withNodeIdentifier(
-            final YangInstanceIdentifier.NodeIdentifier nodeIdentifier) {
+    public ListNodeBuilder<T, LeafSetEntryNode<T>> withNodeIdentifier(final NodeIdentifier nodeIdentifier) {

         this.nodeIdentifier = nodeIdentifier;
         return this;
     }
         this.nodeIdentifier = nodeIdentifier;
         return this;
     }


@@ -101,7 +100,7 @@ public class ImmutableOrderedLeafSetNodeBuilder<T> implements ListNodeBuilder<T,
     @Override
     public ListNodeBuilder<T, LeafSetEntryNode<T>> withChildValue(final T value, final Map<QName, String> attributes) {
         final ImmutableLeafSetEntryNodeBuilder<T> b = ImmutableLeafSetEntryNodeBuilder.create();
     @Override
     public ListNodeBuilder<T, LeafSetEntryNode<T>> withChildValue(final T value, final Map<QName, String> attributes) {
         final ImmutableLeafSetEntryNodeBuilder<T> b = ImmutableLeafSetEntryNodeBuilder.create();

-        b.withNodeIdentifier(new YangInstanceIdentifier.NodeWithValue(nodeIdentifier.getNodeType(), value));
+        b.withNodeIdentifier(new NodeWithValue<>(nodeIdentifier.getNodeType(), value));

         b.withValue(value);
         b.withAttributes(attributes);
         return withChild(b.build());
         b.withValue(value);
         b.withAttributes(attributes);
         return withChild(b.build());


@@ -113,19 +112,19 @@ public class ImmutableOrderedLeafSetNodeBuilder<T> implements ListNodeBuilder<T,
     }
 
     protected static final class ImmutableOrderedLeafSetNode<T> extends
     }
 
     protected static final class ImmutableOrderedLeafSetNode<T> extends

-            AbstractImmutableNormalizedNode<YangInstanceIdentifier.NodeIdentifier, Collection<LeafSetEntryNode<T>>> implements
+            AbstractImmutableNormalizedNode<NodeIdentifier, Collection<LeafSetEntryNode<T>>> implements

             Immutable, OrderedLeafSetNode<T> {
 
             Immutable, OrderedLeafSetNode<T> {
 

-        private final Map<YangInstanceIdentifier.NodeWithValue, LeafSetEntryNode<T>> children;
+        private final Map<NodeWithValue, LeafSetEntryNode<T>> children;

 
 

-        ImmutableOrderedLeafSetNode(final YangInstanceIdentifier.NodeIdentifier nodeIdentifier,
-                final Map<YangInstanceIdentifier.NodeWithValue, LeafSetEntryNode<T>> children) {
+        ImmutableOrderedLeafSetNode(final NodeIdentifier nodeIdentifier,
+                final Map<NodeWithValue, LeafSetEntryNode<T>> children) {

             super(nodeIdentifier);
             this.children = children;
         }
 
         @Override
             super(nodeIdentifier);
             this.children = children;
         }
 
         @Override

-        public Optional<LeafSetEntryNode<T>> getChild(final YangInstanceIdentifier.NodeWithValue child) {
+        public Optional<LeafSetEntryNode<T>> getChild(final NodeWithValue child) {

             return Optional.fromNullable(children.get(child));
         }
 
             return Optional.fromNullable(children.get(child));
         }
 


@@ -134,7 +133,7 @@ public class ImmutableOrderedLeafSetNodeBuilder<T> implements ListNodeBuilder<T,
             return children.hashCode();
         }
 
             return children.hashCode();
         }
 

-        private Map<YangInstanceIdentifier.NodeWithValue, LeafSetEntryNode<T>> getChildren() {
+        private Map<NodeWithValue, LeafSetEntryNode<T>> getChildren() {

             return Collections.unmodifiableMap(children);
         }
 
             return Collections.unmodifiableMap(children);
         }
 

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractDataTreeCandidateNode.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractDataTreeCandidateNode.java
index 10f12cf359a74d4502afa13e8794a20046725168..c02b6076e9af7ae35572d6a477a4ba7139993b38 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractDataTreeCandidateNode.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractDataTreeCandidateNode.java
@@ -13,7 +13,6 @@ import com.google.common.base.Preconditions;
 import com.google.common.collect.Collections2;
 import java.util.ArrayList;
 import java.util.Collection;
 import com.google.common.collect.Collections2;
 import java.util.ArrayList;
 import java.util.Collection;

-import java.util.Collections;

 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/test/DataTreeCandidateValidatorTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/test/DataTreeCandidateValidatorTest.java
index f723ecfaaa5a5538315eee847177a27647cb3c37..2e13a4fe0ece31f9b5cfb070c406e4c00f16b085 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/test/DataTreeCandidateValidatorTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/test/DataTreeCandidateValidatorTest.java
@@ -524,7 +524,7 @@ public class DataTreeCandidateValidatorTest {
     private static LeafSetEntryNode<Object> createLeafSetEntry(final QName qname, final String val) {
         final NormalizedNodeAttrBuilder<NodeWithValue, Object, LeafSetEntryNode<Object>> leafSetEntryBuilder = Builders
                 .leafSetEntryBuilder();
     private static LeafSetEntryNode<Object> createLeafSetEntry(final QName qname, final String val) {
         final NormalizedNodeAttrBuilder<NodeWithValue, Object, LeafSetEntryNode<Object>> leafSetEntryBuilder = Builders
                 .leafSetEntryBuilder();

-        leafSetEntryBuilder.withNodeIdentifier(new NodeWithValue(qname, val));
+        leafSetEntryBuilder.withNodeIdentifier(new NodeWithValue<>(qname, val));

         leafSetEntryBuilder.withValue(val);
         return leafSetEntryBuilder.build();
     }
         leafSetEntryBuilder.withValue(val);
         return leafSetEntryBuilder.build();
     }

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/test/retest/DataTreeCandidateValidatorTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/test/retest/DataTreeCandidateValidatorTest.java
index c8c10f0375ee11ed0294bcabbc2dee56fdd3e6f4..211a50b0a68c1a4418a410a7ce7dd025806875e2 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/test/retest/DataTreeCandidateValidatorTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/test/retest/DataTreeCandidateValidatorTest.java
@@ -530,7 +530,7 @@ public class DataTreeCandidateValidatorTest {
             final QName qname, final String val) {
         final NormalizedNodeAttrBuilder<NodeWithValue, Object, LeafSetEntryNode<Object>> leafSetEntryBuilder = Builders
                 .leafSetEntryBuilder();
             final QName qname, final String val) {
         final NormalizedNodeAttrBuilder<NodeWithValue, Object, LeafSetEntryNode<Object>> leafSetEntryBuilder = Builders
                 .leafSetEntryBuilder();

-        leafSetEntryBuilder.withNodeIdentifier(new NodeWithValue(qname, val));
+        leafSetEntryBuilder.withNodeIdentifier(new NodeWithValue<>(qname, val));

         leafSetEntryBuilder.withValue(val);
         return leafSetEntryBuilder.build();
     }
         leafSetEntryBuilder.withValue(val);
         return leafSetEntryBuilder.build();
     }

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/InstanceIdToNodesTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/InstanceIdToNodesTest.java
index 5735ea0c4e21703d976d69e93256f2cb8fbf29f8..5b1fdf3cd758c7ed55297967f7570c1c2a407222 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/InstanceIdToNodesTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/InstanceIdToNodesTest.java
@@ -8,7 +8,6 @@
 package org.opendaylight.yangtools.yang.data.impl.schema;
 
 import static org.junit.Assert.assertEquals;
 package org.opendaylight.yangtools.yang.data.impl.schema;
 
 import static org.junit.Assert.assertEquals;

-

 import com.google.common.base.Function;
 import com.google.common.collect.Collections2;
 import com.google.common.io.ByteSource;
 import com.google.common.base.Function;
 import com.google.common.collect.Collections2;
 import com.google.common.io.ByteSource;


@@ -19,6 +18,10 @@ import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;

+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue;

 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.LeafNode;
 import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.LeafNode;
 import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;


@@ -35,18 +38,18 @@ public class InstanceIdToNodesTest {
     private static final QName ID = QName.create(NS, REVISION, "id");
     private SchemaContext ctx;
 
     private static final QName ID = QName.create(NS, REVISION, "id");
     private SchemaContext ctx;
 

-    private final YangInstanceIdentifier.NodeIdentifier rootContainer = new YangInstanceIdentifier.NodeIdentifier(QName.create(NS, REVISION, "test"));
-    private final YangInstanceIdentifier.NodeIdentifier outerContainer = new YangInstanceIdentifier.NodeIdentifier(QName.create(NS, REVISION, "outer-container"));
-    private final YangInstanceIdentifier.NodeIdentifier augmentedLeaf = new YangInstanceIdentifier.NodeIdentifier(QName.create(NS, REVISION, "augmented-leaf"));
-    private final YangInstanceIdentifier.AugmentationIdentifier augmentation = new YangInstanceIdentifier.AugmentationIdentifier(Collections.singleton(augmentedLeaf.getNodeType()));
+    private final NodeIdentifier rootContainer = new NodeIdentifier(QName.create(NS, REVISION, "test"));
+    private final NodeIdentifier outerContainer = new NodeIdentifier(QName.create(NS, REVISION, "outer-container"));
+    private final NodeIdentifier augmentedLeaf = new NodeIdentifier(QName.create(NS, REVISION, "augmented-leaf"));
+    private final AugmentationIdentifier augmentation = new AugmentationIdentifier(Collections.singleton(augmentedLeaf.getNodeType()));

 
 

-    private final YangInstanceIdentifier.NodeIdentifier outerList = new YangInstanceIdentifier.NodeIdentifier(QName.create(NS, REVISION, "outer-list"));
-    private final YangInstanceIdentifier.NodeIdentifierWithPredicates outerListWithKey = new YangInstanceIdentifier.NodeIdentifierWithPredicates(QName.create(NS, REVISION, "outer-list"), ID, 1);
-    private final YangInstanceIdentifier.NodeIdentifier choice = new YangInstanceIdentifier.NodeIdentifier(QName.create(NS, REVISION, "outer-choice"));
-    private final YangInstanceIdentifier.NodeIdentifier leafFromCase = new YangInstanceIdentifier.NodeIdentifier(QName.create(NS, REVISION, "one"));
+    private final NodeIdentifier outerList = new NodeIdentifier(QName.create(NS, REVISION, "outer-list"));
+    private final NodeIdentifierWithPredicates outerListWithKey = new NodeIdentifierWithPredicates(QName.create(NS, REVISION, "outer-list"), ID, 1);
+    private final NodeIdentifier choice = new NodeIdentifier(QName.create(NS, REVISION, "outer-choice"));
+    private final NodeIdentifier leafFromCase = new NodeIdentifier(QName.create(NS, REVISION, "one"));

 
 

-    private final YangInstanceIdentifier.NodeIdentifier leafList = new YangInstanceIdentifier.NodeIdentifier(QName.create(NS, REVISION, "ordered-leaf-list"));
-    private final YangInstanceIdentifier.NodeWithValue leafListWithValue = new YangInstanceIdentifier.NodeWithValue(leafList.getNodeType(), "abcd");
+    private final NodeIdentifier leafList = new NodeIdentifier(QName.create(NS, REVISION, "ordered-leaf-list"));
+    private final NodeWithValue<?> leafListWithValue = new NodeWithValue<>(leafList.getNodeType(), "abcd");

 
     static SchemaContext createTestContext() throws IOException, YangSyntaxErrorException {
         final YangParserImpl parser = new YangParserImpl();
 
     static SchemaContext createTestContext() throws IOException, YangSyntaxErrorException {
         final YangParserImpl parser = new YangParserImpl();


@@ -104,7 +107,7 @@ public class InstanceIdToNodesTest {
         final ContainerNode expectedFilter = Builders.containerBuilder().withNodeIdentifier(rootContainer).withChild(
                 Builders.mapBuilder().withNodeIdentifier(outerList).withChild(
                         Builders.mapEntryBuilder().withNodeIdentifier(outerListWithKey).withChild(
         final ContainerNode expectedFilter = Builders.containerBuilder().withNodeIdentifier(rootContainer).withChild(
                 Builders.mapBuilder().withNodeIdentifier(outerList).withChild(
                         Builders.mapEntryBuilder().withNodeIdentifier(outerListWithKey).withChild(

-                                Builders.leafBuilder().withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(ID)).withValue(1).build()
+                                Builders.leafBuilder().withNodeIdentifier(new NodeIdentifier(ID)).withValue(1).build()

                         ).withChild(
                                 Builders.choiceBuilder().withNodeIdentifier(choice).withChild(
                                         Builders.leafBuilder().withNodeIdentifier(leafFromCase).build()
                         ).withChild(
                                 Builders.choiceBuilder().withNodeIdentifier(choice).withChild(
                                         Builders.leafBuilder().withNodeIdentifier(leafFromCase).build()


@@ -122,7 +125,7 @@ public class InstanceIdToNodesTest {
         final ContainerNode expectedStructure = Builders.containerBuilder().withNodeIdentifier(rootContainer).withChild(
                 Builders.mapBuilder().withNodeIdentifier(outerList).withChild(
                         Builders.mapEntryBuilder().withNodeIdentifier(outerListWithKey).withChild(
         final ContainerNode expectedStructure = Builders.containerBuilder().withNodeIdentifier(rootContainer).withChild(
                 Builders.mapBuilder().withNodeIdentifier(outerList).withChild(
                         Builders.mapEntryBuilder().withNodeIdentifier(outerListWithKey).withChild(

-                                Builders.leafBuilder().withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(ID)).withValue(1).build()
+                                Builders.leafBuilder().withNodeIdentifier(new NodeIdentifier(ID)).withValue(1).build()

                         ).withChild(
                                 Builders.choiceBuilder().withNodeIdentifier(choice).withChild(
                                         Builders.leafBuilder().withNodeIdentifier(leafFromCase).build()
                         ).withChild(
                                 Builders.choiceBuilder().withNodeIdentifier(choice).withChild(
                                         Builders.leafBuilder().withNodeIdentifier(leafFromCase).build()


@@ -138,7 +141,7 @@ public class InstanceIdToNodesTest {
     @Test
     public void testListLastChildOverride() throws Exception {
         final MapEntryNode outerListEntry = Builders.mapEntryBuilder().withNodeIdentifier(outerListWithKey).withChild(
     @Test
     public void testListLastChildOverride() throws Exception {
         final MapEntryNode outerListEntry = Builders.mapEntryBuilder().withNodeIdentifier(outerListWithKey).withChild(

-                Builders.leafBuilder().withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(ID)).withValue(1).build()
+                Builders.leafBuilder().withNodeIdentifier(new NodeIdentifier(ID)).withValue(1).build()

         ).build();
         final MapNode lastChild = Builders.mapBuilder().withNodeIdentifier(this.outerList).withChild(
                 outerListEntry
         ).build();
         final MapNode lastChild = Builders.mapBuilder().withNodeIdentifier(this.outerList).withChild(
                 outerListEntry

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/NormalizedDataBuilderTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/NormalizedDataBuilderTest.java
index 38cdb287e40528bb23b6dccfeac9a3d22229a7ff..9125f66180f8541993f187534031f277def83276 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/NormalizedDataBuilderTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/NormalizedDataBuilderTest.java
@@ -21,7 +21,10 @@ import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.common.QName;

-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue;

 import org.opendaylight.yangtools.yang.data.api.schema.AugmentationNode;
 import org.opendaylight.yangtools.yang.data.api.schema.ChoiceNode;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.AugmentationNode;
 import org.opendaylight.yangtools.yang.data.api.schema.ChoiceNode;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;


@@ -77,7 +80,7 @@ public class NormalizedDataBuilderTest {
     @Test
     public void testSchemaUnaware() throws Exception {
         // Container
     @Test
     public void testSchemaUnaware() throws Exception {
         // Container

-        DataContainerNodeBuilder<YangInstanceIdentifier.NodeIdentifier, ContainerNode> builder = Builders
+        DataContainerNodeBuilder<NodeIdentifier, ContainerNode> builder = Builders

                 .containerBuilder().withNodeIdentifier(getNodeIdentifier("container"));
 
         // leaf
                 .containerBuilder().withNodeIdentifier(getNodeIdentifier("container"));
 
         // leaf


@@ -104,7 +107,7 @@ public class NormalizedDataBuilderTest {
                         .withValue(1).build())
                         .withChild(Builders.containerBuilder().withNodeIdentifier(getNodeIdentifier("containerInList")).build())
                         .withNodeIdentifier(
                         .withValue(1).build())
                         .withChild(Builders.containerBuilder().withNodeIdentifier(getNodeIdentifier("containerInList")).build())
                         .withNodeIdentifier(

-                                new YangInstanceIdentifier.NodeIdentifierWithPredicates(getNodeIdentifier("list").getNodeType(),
+                                new NodeIdentifierWithPredicates(getNodeIdentifier("list").getNodeType(),

                                         Collections.singletonMap(getNodeIdentifier("uint32InList").getNodeType(), (Object) 1)))
                                         .build();
 
                                         Collections.singletonMap(getNodeIdentifier("uint32InList").getNodeType(), (Object) 1)))
                                         .build();
 


@@ -115,7 +118,7 @@ public class NormalizedDataBuilderTest {
         AugmentationNode augmentation = Builders
                 .augmentationBuilder()
                 .withNodeIdentifier(
         AugmentationNode augmentation = Builders
                 .augmentationBuilder()
                 .withNodeIdentifier(

-                        new YangInstanceIdentifier.AugmentationIdentifier(Sets.newHashSet(getQName("augmentUint32"))))
+                        new AugmentationIdentifier(Sets.newHashSet(getQName("augmentUint32"))))

                         .withChild(
                                 Builders.<Integer> leafBuilder().withNodeIdentifier(getNodeIdentifier("augmentUint32"))
                                 .withValue(11).build()).build();
                         .withChild(
                                 Builders.<Integer> leafBuilder().withNodeIdentifier(getNodeIdentifier("augmentUint32"))
                                 .withValue(11).build()).build();


@@ -130,7 +133,7 @@ public class NormalizedDataBuilderTest {
 
     @Test
     public void testSchemaAware() throws Exception {
 
     @Test
     public void testSchemaAware() throws Exception {

-        DataContainerNodeBuilder<YangInstanceIdentifier.NodeIdentifier, ContainerNode> builder = Builders
+        DataContainerNodeBuilder<NodeIdentifier, ContainerNode> builder = Builders

                 .containerBuilder(containerNode);
 
         LeafSchemaNode schemaNode = (LeafSchemaNode) getSchemaNode(schema, "test", "uint32");
                 .containerBuilder(containerNode);
 
         LeafSchemaNode schemaNode = (LeafSchemaNode) getSchemaNode(schema, "test", "uint32");


@@ -195,8 +198,8 @@ public class NormalizedDataBuilderTest {
         throw new IllegalStateException("Unable to find child augmentation in " + containerNode);
     }
 
         throw new IllegalStateException("Unable to find child augmentation in " + containerNode);
     }
 

-    private static YangInstanceIdentifier.NodeWithValue getNodeWithValueIdentifier(final String localName, final Object value) {
-        return new YangInstanceIdentifier.NodeWithValue(getQName(localName), value);
+    private static <T> NodeWithValue<T> getNodeWithValueIdentifier(final String localName, final T value) {
+        return new NodeWithValue<>(getQName(localName), value);

     }
 
     private static QName getQName(final String localName) {
     }
 
     private static QName getQName(final String localName) {


@@ -204,8 +207,8 @@ public class NormalizedDataBuilderTest {
         return new QName(URI.create(namespace), localName);
     }
 
         return new QName(URI.create(namespace), localName);
     }
 

-    private static YangInstanceIdentifier.NodeIdentifier getNodeIdentifier(final String localName) {
-        return new YangInstanceIdentifier.NodeIdentifier(getQName(localName));
+    private static NodeIdentifier getNodeIdentifier(final String localName) {
+        return new NodeIdentifier(getQName(localName));

     }
 
     public static DataSchemaNode getSchemaNode(final SchemaContext context, final String moduleName, final String childNodeName) {
     }
 
     public static DataSchemaNode getSchemaNode(final SchemaContext context, final String moduleName, final String childNodeName) {

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/retest/InstanceIdToNodesTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/retest/InstanceIdToNodesTest.java
index 4a879b3e01a8984aec918ff25bcc33d6c028a544..5aabff3c3319fd328dbbeab657fe7c77cf317827 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/retest/InstanceIdToNodesTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/retest/InstanceIdToNodesTest.java
@@ -16,6 +16,10 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;

+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue;

 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.LeafNode;
 import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.LeafNode;
 import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;


@@ -34,27 +38,21 @@ public class InstanceIdToNodesTest {
     private static final QName ID = QName.create(NS, REVISION, "id");
     private static SchemaContext ctx;
 
     private static final QName ID = QName.create(NS, REVISION, "id");
     private static SchemaContext ctx;
 

-    private final YangInstanceIdentifier.NodeIdentifier rootContainer = new YangInstanceIdentifier.NodeIdentifier(
-            QName.create(NS, REVISION, "test"));
-    private final YangInstanceIdentifier.NodeIdentifier outerContainer = new YangInstanceIdentifier.NodeIdentifier(
-            QName.create(NS, REVISION, "outer-container"));
-    private final YangInstanceIdentifier.NodeIdentifier augmentedLeaf = new YangInstanceIdentifier.NodeIdentifier(
-            QName.create(NS, REVISION, "augmented-leaf"));
-    private final YangInstanceIdentifier.AugmentationIdentifier augmentation = new YangInstanceIdentifier.AugmentationIdentifier(
+    private final NodeIdentifier rootContainer = new NodeIdentifier(QName.create(NS, REVISION, "test"));
+    private final NodeIdentifier outerContainer = new NodeIdentifier(QName.create(NS, REVISION, "outer-container"));
+    private final NodeIdentifier augmentedLeaf = new NodeIdentifier(QName.create(NS, REVISION, "augmented-leaf"));
+    private final AugmentationIdentifier augmentation = new AugmentationIdentifier(

             Collections.singleton(augmentedLeaf.getNodeType()));
 
             Collections.singleton(augmentedLeaf.getNodeType()));
 

-    private final YangInstanceIdentifier.NodeIdentifier outerList = new YangInstanceIdentifier.NodeIdentifier(
+    private final NodeIdentifier outerList = new NodeIdentifier(

             QName.create(NS, REVISION, "outer-list"));
             QName.create(NS, REVISION, "outer-list"));

-    private final YangInstanceIdentifier.NodeIdentifierWithPredicates outerListWithKey = new YangInstanceIdentifier.NodeIdentifierWithPredicates(
+    private final NodeIdentifierWithPredicates outerListWithKey = new NodeIdentifierWithPredicates(

             QName.create(NS, REVISION, "outer-list"), ID, 1);
             QName.create(NS, REVISION, "outer-list"), ID, 1);

-    private final YangInstanceIdentifier.NodeIdentifier choice = new YangInstanceIdentifier.NodeIdentifier(
-            QName.create(NS, REVISION, "outer-choice"));
-    private final YangInstanceIdentifier.NodeIdentifier leafFromCase = new YangInstanceIdentifier.NodeIdentifier(
-            QName.create(NS, REVISION, "one"));
-
-    private final YangInstanceIdentifier.NodeIdentifier leafList = new YangInstanceIdentifier.NodeIdentifier(
-            QName.create(NS, REVISION, "ordered-leaf-list"));
-    private final YangInstanceIdentifier.NodeWithValue leafListWithValue = new YangInstanceIdentifier.NodeWithValue(
+    private final NodeIdentifier choice = new NodeIdentifier(QName.create(NS, REVISION, "outer-choice"));
+    private final NodeIdentifier leafFromCase = new NodeIdentifier(QName.create(NS, REVISION, "one"));
+
+    private final NodeIdentifier leafList = new NodeIdentifier(QName.create(NS, REVISION, "ordered-leaf-list"));
+    private final NodeWithValue<?> leafListWithValue = new NodeWithValue<>(

             leafList.getNodeType(), "abcd");
 
     static SchemaContext createTestContext() throws URISyntaxException, FileNotFoundException, ReactorException {
             leafList.getNodeType(), "abcd");
 
     static SchemaContext createTestContext() throws URISyntaxException, FileNotFoundException, ReactorException {


@@ -122,7 +120,7 @@ public class InstanceIdToNodesTest {
                                                 .withChild(
                                                         Builders.leafBuilder()
                                                                 .withNodeIdentifier(
                                                 .withChild(
                                                         Builders.leafBuilder()
                                                                 .withNodeIdentifier(

-                                                                        new YangInstanceIdentifier.NodeIdentifier(ID))
+                                                                        new NodeIdentifier(ID))

                                                                 .withValue(1).build())
                                                 .withChild(
                                                         Builders.choiceBuilder()
                                                                 .withValue(1).build())
                                                 .withChild(
                                                         Builders.choiceBuilder()


@@ -152,7 +150,7 @@ public class InstanceIdToNodesTest {
                                                 .withChild(
                                                         Builders.leafBuilder()
                                                                 .withNodeIdentifier(
                                                 .withChild(
                                                         Builders.leafBuilder()
                                                                 .withNodeIdentifier(

-                                                                        new YangInstanceIdentifier.NodeIdentifier(ID))
+                                                                        new NodeIdentifier(ID))

                                                                 .withValue(1).build())
                                                 .withChild(
                                                         Builders.choiceBuilder()
                                                                 .withValue(1).build())
                                                 .withChild(
                                                         Builders.choiceBuilder()


@@ -174,7 +172,7 @@ public class InstanceIdToNodesTest {
                 .mapEntryBuilder()
                 .withNodeIdentifier(outerListWithKey)
                 .withChild(
                 .mapEntryBuilder()
                 .withNodeIdentifier(outerListWithKey)
                 .withChild(

-                        Builders.leafBuilder().withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(ID))
+                        Builders.leafBuilder().withNodeIdentifier(new NodeIdentifier(ID))

                                 .withValue(1).build()).build();
         final MapNode lastChild = Builders.mapBuilder().withNodeIdentifier(this.outerList).withChild(outerListEntry)
                 .build();
                                 .withValue(1).build()).build();
         final MapNode lastChild = Builders.mapBuilder().withNodeIdentifier(this.outerList).withChild(outerListEntry)
                 .build();

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/retest/NormalizedDataBuilderTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/retest/NormalizedDataBuilderTest.java
index 932cf8f1b8d21be9574f3402714ef70a54c7cab2..a7d35be3185736be7b3d02c8a08b585a32e029f9 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/retest/NormalizedDataBuilderTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/retest/NormalizedDataBuilderTest.java
@@ -19,7 +19,10 @@ import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.common.QName;

-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue;

 import org.opendaylight.yangtools.yang.data.api.schema.AugmentationNode;
 import org.opendaylight.yangtools.yang.data.api.schema.ChoiceNode;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.AugmentationNode;
 import org.opendaylight.yangtools.yang.data.api.schema.ChoiceNode;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;


@@ -60,7 +63,7 @@ public class NormalizedDataBuilderTest {
     @Test
     public void testSchemaUnaware() {
         // Container
     @Test
     public void testSchemaUnaware() {
         // Container

-        DataContainerNodeBuilder<YangInstanceIdentifier.NodeIdentifier, ContainerNode> builder = Builders
+        DataContainerNodeBuilder<NodeIdentifier, ContainerNode> builder = Builders

                 .containerBuilder().withNodeIdentifier(getNodeIdentifier("container"));
 
         // leaf
                 .containerBuilder().withNodeIdentifier(getNodeIdentifier("container"));
 
         // leaf


@@ -87,7 +90,7 @@ public class NormalizedDataBuilderTest {
                                 .withValue(1).build())
                 .withChild(Builders.containerBuilder().withNodeIdentifier(getNodeIdentifier("containerInList")).build())
                 .withNodeIdentifier(
                                 .withValue(1).build())
                 .withChild(Builders.containerBuilder().withNodeIdentifier(getNodeIdentifier("containerInList")).build())
                 .withNodeIdentifier(

-                        new YangInstanceIdentifier.NodeIdentifierWithPredicates(
+                        new NodeIdentifierWithPredicates(

                                 getNodeIdentifier("list").getNodeType(), Collections.singletonMap(
                                 getNodeIdentifier("uint32InList").getNodeType(), (Object) 1))).build();
 
                                 getNodeIdentifier("list").getNodeType(), Collections.singletonMap(
                                 getNodeIdentifier("uint32InList").getNodeType(), (Object) 1))).build();
 


@@ -98,7 +101,7 @@ public class NormalizedDataBuilderTest {
         AugmentationNode augmentation = Builders
                 .augmentationBuilder()
                 .withNodeIdentifier(
         AugmentationNode augmentation = Builders
                 .augmentationBuilder()
                 .withNodeIdentifier(

-                        new YangInstanceIdentifier.AugmentationIdentifier(Sets.newHashSet(getQName("augmentUint32"))))
+                        new AugmentationIdentifier(Sets.newHashSet(getQName("augmentUint32"))))

                 .withChild(
                         Builders.<Integer>leafBuilder().withNodeIdentifier(getNodeIdentifier("augmentUint32"))
                                 .withValue(11).build()).build();
                 .withChild(
                         Builders.<Integer>leafBuilder().withNodeIdentifier(getNodeIdentifier("augmentUint32"))
                                 .withValue(11).build()).build();


@@ -113,7 +116,7 @@ public class NormalizedDataBuilderTest {
 
     @Test
     public void testSchemaAware() {
 
     @Test
     public void testSchemaAware() {

-        DataContainerNodeBuilder<YangInstanceIdentifier.NodeIdentifier, ContainerNode> builder = Builders
+        DataContainerNodeBuilder<NodeIdentifier, ContainerNode> builder = Builders

                 .containerBuilder(containerNode);
 
         LeafSchemaNode schemaNode = (LeafSchemaNode) getSchemaNode(schema, "test", "uint32");
                 .containerBuilder(containerNode);
 
         LeafSchemaNode schemaNode = (LeafSchemaNode) getSchemaNode(schema, "test", "uint32");


@@ -178,9 +181,8 @@ public class NormalizedDataBuilderTest {
         throw new IllegalStateException("Unable to find child augmentation in " + containerNode);
     }
 
         throw new IllegalStateException("Unable to find child augmentation in " + containerNode);
     }
 

-    private static YangInstanceIdentifier.NodeWithValue getNodeWithValueIdentifier(final String localName,
-            final Object value) {
-        return new YangInstanceIdentifier.NodeWithValue(getQName(localName), value);
+    private static <T> NodeWithValue<T> getNodeWithValueIdentifier(final String localName, final T value) {
+        return new NodeWithValue<>(getQName(localName), value);

     }
 
     private static QName getQName(final String localName) {
     }
 
     private static QName getQName(final String localName) {


@@ -188,8 +190,8 @@ public class NormalizedDataBuilderTest {
         return new QName(URI.create(namespace), localName);
     }
 
         return new QName(URI.create(namespace), localName);
     }
 

-    private static YangInstanceIdentifier.NodeIdentifier getNodeIdentifier(final String localName) {
-        return new YangInstanceIdentifier.NodeIdentifier(getQName(localName));
+    private static NodeIdentifier getNodeIdentifier(final String localName) {
+        return new NodeIdentifier(getQName(localName));

     }
 
     public static DataSchemaNode getSchemaNode(final SchemaContext context, final String moduleName,
     }
 
     public static DataSchemaNode getSchemaNode(final SchemaContext context, final String moduleName,

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/NormalizedNodeXmlTranslationTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/NormalizedNodeXmlTranslationTest.java
index 3d95e76f4a06f251f342eb0edd2e4f4f96cf58bd..fa953eff4bcead8248cce7da88b9b6bf55865c42 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/NormalizedNodeXmlTranslationTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/NormalizedNodeXmlTranslationTest.java
@@ -52,7 +52,10 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.opendaylight.yangtools.yang.common.QName;

-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue;

 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.LeafNode;
 import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.LeafNode;
 import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode;


@@ -111,22 +114,17 @@ public class NormalizedNodeXmlTranslationTest {
     }
 
     private static ContainerNode augmentChoiceHell2() {
     }
 
     private static ContainerNode augmentChoiceHell2() {

-        final YangInstanceIdentifier.NodeIdentifier container = getNodeIdentifier("container");
+        final NodeIdentifier container = getNodeIdentifier("container");

         QName augmentChoice1QName = QName.create(container.getNodeType(), "augment-choice1");
         QName augmentChoice2QName = QName.create(augmentChoice1QName, "augment-choice2");
         final QName containerQName = QName.create(augmentChoice1QName, "case11-choice-case-container");
         final QName leafQName = QName.create(augmentChoice1QName, "case11-choice-case-leaf");
 
         QName augmentChoice1QName = QName.create(container.getNodeType(), "augment-choice1");
         QName augmentChoice2QName = QName.create(augmentChoice1QName, "augment-choice2");
         final QName containerQName = QName.create(augmentChoice1QName, "case11-choice-case-container");
         final QName leafQName = QName.create(augmentChoice1QName, "case11-choice-case-leaf");
 

-        final YangInstanceIdentifier.AugmentationIdentifier aug1Id =
-                new YangInstanceIdentifier.AugmentationIdentifier(Sets.newHashSet(augmentChoice1QName));
-        final YangInstanceIdentifier.AugmentationIdentifier aug2Id =
-                new YangInstanceIdentifier.AugmentationIdentifier(Sets.newHashSet(augmentChoice2QName));
-        final YangInstanceIdentifier.NodeIdentifier augmentChoice1Id =
-                new YangInstanceIdentifier.NodeIdentifier(augmentChoice1QName);
-        final YangInstanceIdentifier.NodeIdentifier augmentChoice2Id =
-                new YangInstanceIdentifier.NodeIdentifier(augmentChoice2QName);
-        final YangInstanceIdentifier.NodeIdentifier containerId =
-                new YangInstanceIdentifier.NodeIdentifier(containerQName);
+        final AugmentationIdentifier aug1Id = new AugmentationIdentifier(Sets.newHashSet(augmentChoice1QName));
+        final AugmentationIdentifier aug2Id = new AugmentationIdentifier(Sets.newHashSet(augmentChoice2QName));
+        final NodeIdentifier augmentChoice1Id = new NodeIdentifier(augmentChoice1QName);
+        final NodeIdentifier augmentChoice2Id = new NodeIdentifier(augmentChoice2QName);
+        final NodeIdentifier containerId = new NodeIdentifier(containerQName);

 
 
         return containerBuilder().withNodeIdentifier(container)
 
 
         return containerBuilder().withNodeIdentifier(container)


@@ -144,7 +142,7 @@ public class NormalizedNodeXmlTranslationTest {
     }
 
     private static ContainerNode withAttributes() {
     }
 
     private static ContainerNode withAttributes() {

-        final DataContainerNodeBuilder<YangInstanceIdentifier.NodeIdentifier, ContainerNode> b = containerBuilder();
+        final DataContainerNodeBuilder<NodeIdentifier, ContainerNode> b = containerBuilder();

         b.withNodeIdentifier(getNodeIdentifier("container"));
 
         final CollectionNodeBuilder<MapEntryNode, MapNode> listBuilder = Builders.mapBuilder().withNodeIdentifier(
         b.withNodeIdentifier(getNodeIdentifier("container"));
 
         final CollectionNodeBuilder<MapEntryNode, MapNode> listBuilder = Builders.mapBuilder().withNodeIdentifier(


@@ -153,11 +151,11 @@ public class NormalizedNodeXmlTranslationTest {
         final Map<QName, Object> predicates = Maps.newHashMap();
         predicates.put(getNodeIdentifier("uint32InList").getNodeType(), 3L);
 
         final Map<QName, Object> predicates = Maps.newHashMap();
         predicates.put(getNodeIdentifier("uint32InList").getNodeType(), 3L);
 

-        final DataContainerNodeBuilder<YangInstanceIdentifier.NodeIdentifierWithPredicates, MapEntryNode> list1Builder = Builders
+        final DataContainerNodeBuilder<NodeIdentifierWithPredicates, MapEntryNode> list1Builder = Builders

                 .mapEntryBuilder().withNodeIdentifier(
                 .mapEntryBuilder().withNodeIdentifier(

-                        new YangInstanceIdentifier.NodeIdentifierWithPredicates(getNodeIdentifier("list").getNodeType(),
+                        new NodeIdentifierWithPredicates(getNodeIdentifier("list").getNodeType(),

                                 predicates));
                                 predicates));

-        final NormalizedNodeBuilder<YangInstanceIdentifier.NodeIdentifier,Object,LeafNode<Object>> uint32InListBuilder
+        final NormalizedNodeBuilder<NodeIdentifier,Object,LeafNode<Object>> uint32InListBuilder

         = Builders.leafBuilder().withNodeIdentifier(getNodeIdentifier("uint32InList"));
 
         list1Builder.withChild(uint32InListBuilder.withValue(3L).build());
         = Builders.leafBuilder().withNodeIdentifier(getNodeIdentifier("uint32InList"));
 
         list1Builder.withChild(uint32InListBuilder.withValue(3L).build());


@@ -165,7 +163,7 @@ public class NormalizedNodeXmlTranslationTest {
         listBuilder.withChild(list1Builder.build());
         b.withChild(listBuilder.build());
 
         listBuilder.withChild(list1Builder.build());
         b.withChild(listBuilder.build());
 

-        final NormalizedNodeBuilder<YangInstanceIdentifier.NodeIdentifier, Object, LeafNode<Object>> booleanBuilder
+        final NormalizedNodeBuilder<NodeIdentifier, Object, LeafNode<Object>> booleanBuilder

         = Builders.leafBuilder().withNodeIdentifier(getNodeIdentifier("boolean"));
         booleanBuilder.withValue(false);
         b.withChild(booleanBuilder.build());
         = Builders.leafBuilder().withNodeIdentifier(getNodeIdentifier("boolean"));
         booleanBuilder.withValue(false);
         b.withChild(booleanBuilder.build());


@@ -173,8 +171,8 @@ public class NormalizedNodeXmlTranslationTest {
         final ListNodeBuilder<Object, LeafSetEntryNode<Object>> leafListBuilder
         = Builders.leafSetBuilder().withNodeIdentifier(getNodeIdentifier("leafList"));
 
         final ListNodeBuilder<Object, LeafSetEntryNode<Object>> leafListBuilder
         = Builders.leafSetBuilder().withNodeIdentifier(getNodeIdentifier("leafList"));
 

-        final NormalizedNodeBuilder<YangInstanceIdentifier.NodeWithValue, Object, LeafSetEntryNode<Object>> leafList1Builder
-        = Builders.leafSetEntryBuilder().withNodeIdentifier(new YangInstanceIdentifier.NodeWithValue(getNodeIdentifier("leafList").getNodeType(), "a"));
+        final NormalizedNodeBuilder<NodeWithValue, Object, LeafSetEntryNode<Object>> leafList1Builder
+        = Builders.leafSetEntryBuilder().withNodeIdentifier(new NodeWithValue<>(getNodeIdentifier("leafList").getNodeType(), "a"));

 
         leafList1Builder.withValue("a");
 
 
         leafList1Builder.withValue("a");
 


@@ -186,7 +184,7 @@ public class NormalizedNodeXmlTranslationTest {
 
     private static ContainerNode augmentChoiceHell() {
 
 
     private static ContainerNode augmentChoiceHell() {
 

-        final DataContainerNodeBuilder<YangInstanceIdentifier.NodeIdentifier, ContainerNode> b = containerBuilder();
+        final DataContainerNodeBuilder<NodeIdentifier, ContainerNode> b = containerBuilder();

         b.withNodeIdentifier(getNodeIdentifier("container"));
 
         b.withChild(
         b.withNodeIdentifier(getNodeIdentifier("container"));
 
         b.withChild(


@@ -231,18 +229,18 @@ public class NormalizedNodeXmlTranslationTest {
         return b.build();
     }
 
         return b.build();
     }
 

-    private static YangInstanceIdentifier.NodeIdentifier getNodeIdentifier(final String localName) {
-        return new YangInstanceIdentifier.NodeIdentifier(QName.create(URI.create(NAMESPACE), revision, localName));
+    private static NodeIdentifier getNodeIdentifier(final String localName) {
+        return new NodeIdentifier(QName.create(URI.create(NAMESPACE), revision, localName));

     }
 
     }
 

-    public static YangInstanceIdentifier.AugmentationIdentifier getAugmentIdentifier(final String... childNames) {
+    public static AugmentationIdentifier getAugmentIdentifier(final String... childNames) {

         final Set<QName> qn = Sets.newHashSet();
 
         for (final String childName : childNames) {
             qn.add(getNodeIdentifier(childName).getNodeType());
         }
 
         final Set<QName> qn = Sets.newHashSet();
 
         for (final String childName : childNames) {
             qn.add(getNodeIdentifier(childName).getNodeType());
         }
 

-        return new YangInstanceIdentifier.AugmentationIdentifier(qn);
+        return new AugmentationIdentifier(qn);

     }
 
     public NormalizedNodeXmlTranslationTest(final String yangPath, final String xmlPath, final ContainerNode expectedNode) throws IOException, YangSyntaxErrorException {
     }
 
     public NormalizedNodeXmlTranslationTest(final String yangPath, final String xmlPath, final ContainerNode expectedNode) throws IOException, YangSyntaxErrorException {

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Bug4454Test.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Bug4454Test.java
index 1a835c85b30f5016c9ed92a263752d12bde20442..c509dab1ce18e73222a1632244955702edb25a41 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Bug4454Test.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Bug4454Test.java
@@ -19,6 +19,9 @@ import org.junit.Test;
 import org.opendaylight.yangtools.util.UnmodifiableCollection;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.util.UnmodifiableCollection;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;

+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue;

 import org.opendaylight.yangtools.yang.data.api.schema.LeafNode;
 import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode;
 import org.opendaylight.yangtools.yang.data.api.schema.LeafSetNode;
 import org.opendaylight.yangtools.yang.data.api.schema.LeafNode;
 import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode;
 import org.opendaylight.yangtools.yang.data.api.schema.LeafSetNode;


@@ -76,10 +79,10 @@ public class Bug4454Test {
     }
 
     private final MapEntryNode fooEntryNodeWithValue = ImmutableMapEntryNodeBuilder.create().withNodeIdentifier(new
     }
 
     private final MapEntryNode fooEntryNodeWithValue = ImmutableMapEntryNodeBuilder.create().withNodeIdentifier(new

-            YangInstanceIdentifier.NodeIdentifierWithPredicates(MIN_MAX_LIST_QNAME, fooPredicates)).
+            NodeIdentifierWithPredicates(MIN_MAX_LIST_QNAME, fooPredicates)).

             withChild(ImmutableNodes.leafNode(MIN_MAX_VALUE_LEAF_QNAME, "footest")).build();
     private final MapEntryNode BazEntryNodeWithValue = ImmutableMapEntryNodeBuilder.create().withNodeIdentifier(new
             withChild(ImmutableNodes.leafNode(MIN_MAX_VALUE_LEAF_QNAME, "footest")).build();
     private final MapEntryNode BazEntryNodeWithValue = ImmutableMapEntryNodeBuilder.create().withNodeIdentifier(new

-            YangInstanceIdentifier.NodeIdentifierWithPredicates(MIN_MAX_LIST_QNAME, bazPredicates)).
+            NodeIdentifierWithPredicates(MIN_MAX_LIST_QNAME, bazPredicates)).

             withChild(ImmutableNodes.leafNode(MIN_MAX_VALUE_LEAF_QNAME, "baztest")).build();
     private final MapEntryNode fooEntryNode = ImmutableNodes.mapEntry(MIN_MAX_LIST_QNAME, MIN_MAX_KEY_LEAF_QNAME,
             "foo");
             withChild(ImmutableNodes.leafNode(MIN_MAX_VALUE_LEAF_QNAME, "baztest")).build();
     private final MapEntryNode fooEntryNode = ImmutableNodes.mapEntry(MIN_MAX_LIST_QNAME, MIN_MAX_KEY_LEAF_QNAME,
             "foo");


@@ -88,18 +91,18 @@ public class Bug4454Test {
     private final MapEntryNode bazEntryNode = ImmutableNodes.mapEntry(MIN_MAX_LIST_QNAME, MIN_MAX_KEY_LEAF_QNAME,
             "baz");
     private final MapNode mapNodeBazFuzWithNodes = ImmutableNodes.mapNodeBuilder()
     private final MapEntryNode bazEntryNode = ImmutableNodes.mapEntry(MIN_MAX_LIST_QNAME, MIN_MAX_KEY_LEAF_QNAME,
             "baz");
     private final MapNode mapNodeBazFuzWithNodes = ImmutableNodes.mapNodeBuilder()

-            .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(MIN_MAX_LIST_QNAME))
+            .withNodeIdentifier(new NodeIdentifier(MIN_MAX_LIST_QNAME))

             .withChild(bazEntryNode).withChild(BazEntryNodeWithValue).withChild(fooEntryNode)
             .build();
     private final MapNode mapNodeFooWithNodes = ImmutableNodes.mapNodeBuilder()
             .withChild(bazEntryNode).withChild(BazEntryNodeWithValue).withChild(fooEntryNode)
             .build();
     private final MapNode mapNodeFooWithNodes = ImmutableNodes.mapNodeBuilder()

-            .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(MIN_MAX_LIST_QNAME))
+            .withNodeIdentifier(new NodeIdentifier(MIN_MAX_LIST_QNAME))

             .withChild(fooEntryNode).withChild(fooEntryNodeWithValue).withChild(barEntryNode).withChild(bazEntryNode)
             .build();
     private final MapNode mapNodeBar = ImmutableNodes.mapNodeBuilder()
             .withChild(fooEntryNode).withChild(fooEntryNodeWithValue).withChild(barEntryNode).withChild(bazEntryNode)
             .build();
     private final MapNode mapNodeBar = ImmutableNodes.mapNodeBuilder()

-            .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(MIN_MAX_LIST_QNAME))
+            .withNodeIdentifier(new NodeIdentifier(MIN_MAX_LIST_QNAME))

             .withChild(barEntryNode).build();
     private final MapNode mapNodeBaz = ImmutableNodes.mapNodeBuilder()
             .withChild(barEntryNode).build();
     private final MapNode mapNodeBaz = ImmutableNodes.mapNodeBuilder()

-            .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(MIN_MAX_LIST_QNAME))
+            .withNodeIdentifier(new NodeIdentifier(MIN_MAX_LIST_QNAME))

             .withChild(bazEntryNode).build();
 
     private InMemoryDataTree inMemoryDataTree;
             .withChild(bazEntryNode).build();
 
     private InMemoryDataTree inMemoryDataTree;


@@ -132,8 +135,7 @@ public class Bug4454Test {
         Map<QName, Object> key = new HashMap<>();
         key.put(MIN_MAX_KEY_LEAF_QNAME, "foo");
 
         Map<QName, Object> key = new HashMap<>();
         key.put(MIN_MAX_KEY_LEAF_QNAME, "foo");
 

-        YangInstanceIdentifier.NodeIdentifierWithPredicates mapEntryPath2 = new YangInstanceIdentifier
-                .NodeIdentifierWithPredicates(MIN_MAX_LIST_QNAME , key);
+        NodeIdentifierWithPredicates mapEntryPath2 = new NodeIdentifierWithPredicates(MIN_MAX_LIST_QNAME , key);

 
         YangInstanceIdentifier MIN_MAX_LEAF_FOO = YangInstanceIdentifier.builder(MASTER_CONTAINER_PATH)
                 .node(MIN_MAX_LIST_QNAME).node(mapEntryPath2).build();
 
         YangInstanceIdentifier MIN_MAX_LEAF_FOO = YangInstanceIdentifier.builder(MASTER_CONTAINER_PATH)
                 .node(MIN_MAX_LIST_QNAME).node(mapEntryPath2).build();


@@ -141,7 +143,7 @@ public class Bug4454Test {
         key.clear();
         key.put(MIN_MAX_KEY_LEAF_QNAME, "NON-EXISTING-LEAF");
 
         key.clear();
         key.put(MIN_MAX_KEY_LEAF_QNAME, "NON-EXISTING-LEAF");
 

-        mapEntryPath2 = new YangInstanceIdentifier.NodeIdentifierWithPredicates(MIN_MAX_LIST_QNAME, key);
+        mapEntryPath2 = new NodeIdentifierWithPredicates(MIN_MAX_LIST_QNAME, key);

 
         YangInstanceIdentifier MIN_MAX_LEAF_NEL = YangInstanceIdentifier.builder(MASTER_CONTAINER_PATH).node
                 (MIN_MAX_LIST_QNAME).node(mapEntryPath2).build();
 
         YangInstanceIdentifier MIN_MAX_LEAF_NEL = YangInstanceIdentifier.builder(MASTER_CONTAINER_PATH).node
                 (MIN_MAX_LIST_QNAME).node(mapEntryPath2).build();


@@ -149,8 +151,7 @@ public class Bug4454Test {
         final Map<QName, Object> keyTemp = new HashMap<>();
         keyTemp.put(MIN_MAX_KEY_LEAF_QNAME, "baz");
 
         final Map<QName, Object> keyTemp = new HashMap<>();
         keyTemp.put(MIN_MAX_KEY_LEAF_QNAME, "baz");
 

-        YangInstanceIdentifier.NodeIdentifierWithPredicates mapEntryPathTest = new YangInstanceIdentifier
-                .NodeIdentifierWithPredicates(MIN_MAX_LIST_QNAME , keyTemp);
+        NodeIdentifierWithPredicates mapEntryPathTest = new NodeIdentifierWithPredicates(MIN_MAX_LIST_QNAME , keyTemp);

 
         final YangInstanceIdentifier pathToBaz = YangInstanceIdentifier.builder(MASTER_CONTAINER_PATH)
                 .node(MIN_MAX_LIST_QNAME).node(mapEntryPathTest).node(MIN_MAX_VALUE_LEAF_QNAME).build();
 
         final YangInstanceIdentifier pathToBaz = YangInstanceIdentifier.builder(MASTER_CONTAINER_PATH)
                 .node(MIN_MAX_LIST_QNAME).node(mapEntryPathTest).node(MIN_MAX_VALUE_LEAF_QNAME).build();


@@ -158,7 +159,7 @@ public class Bug4454Test {
         keyTemp.clear();
         keyTemp.put(MIN_MAX_KEY_LEAF_QNAME, "bar");
 
         keyTemp.clear();
         keyTemp.put(MIN_MAX_KEY_LEAF_QNAME, "bar");
 

-        mapEntryPathTest = new YangInstanceIdentifier.NodeIdentifierWithPredicates(MIN_MAX_LIST_QNAME , keyTemp);
+        mapEntryPathTest = new NodeIdentifierWithPredicates(MIN_MAX_LIST_QNAME , keyTemp);

 
         final YangInstanceIdentifier pathToBar = YangInstanceIdentifier.builder(MASTER_CONTAINER_PATH)
                 .node(MIN_MAX_LIST_QNAME).node(mapEntryPathTest).node(MIN_MAX_VALUE_LEAF_QNAME).build();
 
         final YangInstanceIdentifier pathToBar = YangInstanceIdentifier.builder(MASTER_CONTAINER_PATH)
                 .node(MIN_MAX_LIST_QNAME).node(mapEntryPathTest).node(MIN_MAX_VALUE_LEAF_QNAME).build();


@@ -166,8 +167,7 @@ public class Bug4454Test {
         keyTemp.clear();
         keyTemp.put(MIN_MAX_KEY_LEAF_QNAME, "foo");
 
         keyTemp.clear();
         keyTemp.put(MIN_MAX_KEY_LEAF_QNAME, "foo");
 

-        final YangInstanceIdentifier.NodeIdentifierWithPredicates mapEntryPathTestKey = new YangInstanceIdentifier
-                .NodeIdentifierWithPredicates(MIN_MAX_LIST_QNAME , keyTemp);
+        final NodeIdentifierWithPredicates mapEntryPathTestKey = new NodeIdentifierWithPredicates(MIN_MAX_LIST_QNAME , keyTemp);

 
         final YangInstanceIdentifier pathToKeyFoo = YangInstanceIdentifier.builder(MASTER_CONTAINER_PATH)
                 .node(MIN_MAX_LIST_QNAME).node(mapEntryPathTestKey).node(MIN_MAX_KEY_LEAF_QNAME).build();
 
         final YangInstanceIdentifier pathToKeyFoo = YangInstanceIdentifier.builder(MASTER_CONTAINER_PATH)
                 .node(MIN_MAX_LIST_QNAME).node(mapEntryPathTestKey).node(MIN_MAX_KEY_LEAF_QNAME).build();


@@ -262,8 +262,8 @@ public class Bug4454Test {
     public void minMaxLeafListPass() throws DataValidationFailedException {
         final DataTreeModification modificationTree = inMemoryDataTree.takeSnapshot().newModification();
 
     public void minMaxLeafListPass() throws DataValidationFailedException {
         final DataTreeModification modificationTree = inMemoryDataTree.takeSnapshot().newModification();
 

-        final YangInstanceIdentifier.NodeWithValue barPath = new YangInstanceIdentifier.NodeWithValue(MIN_MAX_LIST_QNAME, "bar");
-        final YangInstanceIdentifier.NodeWithValue gooPath = new YangInstanceIdentifier.NodeWithValue(MIN_MAX_LIST_QNAME, "goo");
+        final NodeWithValue<?> barPath = new NodeWithValue<>(MIN_MAX_LIST_QNAME, "bar");
+        final NodeWithValue<?> gooPath = new NodeWithValue<>(MIN_MAX_LIST_QNAME, "goo");

 
         final LeafSetEntryNode<Object> barLeafSetEntry = ImmutableLeafSetEntryNodeBuilder.create()
                 .withNodeIdentifier(barPath)
 
         final LeafSetEntryNode<Object> barLeafSetEntry = ImmutableLeafSetEntryNodeBuilder.create()
                 .withNodeIdentifier(barPath)


@@ -273,7 +273,7 @@ public class Bug4454Test {
                 .withValue("goo").build();
 
         final LeafSetNode<Object> fooLeafSetNode = ImmutableLeafSetNodeBuilder.create()
                 .withValue("goo").build();
 
         final LeafSetNode<Object> fooLeafSetNode = ImmutableLeafSetNodeBuilder.create()

-                .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(MIN_MAX_LEAF_LIST_QNAME))
+                .withNodeIdentifier(new NodeIdentifier(MIN_MAX_LEAF_LIST_QNAME))

                 .withChildValue("foo").build();
 
         modificationTree.write(MIN_MAX_LEAF_LIST_PATH, fooLeafSetNode);
                 .withChildValue("foo").build();
 
         modificationTree.write(MIN_MAX_LEAF_LIST_PATH, fooLeafSetNode);


@@ -299,7 +299,7 @@ public class Bug4454Test {
         final Optional<NormalizedNode<?, ?>> masterContainer = snapshotAfterCommit.readNode(MASTER_CONTAINER_PATH);
         assertTrue(masterContainer.isPresent());
         final Optional<NormalizedNodeContainer<?, ?, ?>> leafList = ((NormalizedNodeContainer) masterContainer.get()).getChild(
         final Optional<NormalizedNode<?, ?>> masterContainer = snapshotAfterCommit.readNode(MASTER_CONTAINER_PATH);
         assertTrue(masterContainer.isPresent());
         final Optional<NormalizedNodeContainer<?, ?, ?>> leafList = ((NormalizedNodeContainer) masterContainer.get()).getChild(

-                new YangInstanceIdentifier.NodeIdentifier(MIN_MAX_LEAF_LIST_QNAME));
+                new NodeIdentifier(MIN_MAX_LEAF_LIST_QNAME));

         assertTrue(leafList.isPresent());
         assertTrue(leafList.get().getValue().size() == 3);
     }
         assertTrue(leafList.isPresent());
         assertTrue(leafList.get().getValue().size() == 3);
     }


@@ -312,8 +312,7 @@ public class Bug4454Test {
         Map<QName, Object> key = new HashMap<>();
         key.put(MIN_MAX_KEY_LEAF_QNAME, "foo");
 
         Map<QName, Object> key = new HashMap<>();
         key.put(MIN_MAX_KEY_LEAF_QNAME, "foo");
 

-        YangInstanceIdentifier.NodeIdentifierWithPredicates mapEntryPath2 = new YangInstanceIdentifier
-                .NodeIdentifierWithPredicates(MIN_MAX_LIST_QNAME , key);
+        NodeIdentifierWithPredicates mapEntryPath2 = new NodeIdentifierWithPredicates(MIN_MAX_LIST_QNAME , key);

 
         YangInstanceIdentifier MIN_MAX_LEAF_FOO = YangInstanceIdentifier.builder(MASTER_CONTAINER_PATH)
                 .node(MIN_MAX_LIST_QNAME).node(mapEntryPath2).build();
 
         YangInstanceIdentifier MIN_MAX_LEAF_FOO = YangInstanceIdentifier.builder(MASTER_CONTAINER_PATH)
                 .node(MIN_MAX_LIST_QNAME).node(mapEntryPath2).build();


@@ -321,7 +320,7 @@ public class Bug4454Test {
         key.clear();
         key.put(MIN_MAX_KEY_LEAF_QNAME, "bar");
 
         key.clear();
         key.put(MIN_MAX_KEY_LEAF_QNAME, "bar");
 

-        mapEntryPath2 = new YangInstanceIdentifier.NodeIdentifierWithPredicates(MIN_MAX_LIST_QNAME, key);
+        mapEntryPath2 = new NodeIdentifierWithPredicates(MIN_MAX_LIST_QNAME, key);

 
         YangInstanceIdentifier MIN_MAX_LEAF_BAR = YangInstanceIdentifier.builder(MASTER_CONTAINER_PATH).node
                 (MIN_MAX_LIST_QNAME)
 
         YangInstanceIdentifier MIN_MAX_LEAF_BAR = YangInstanceIdentifier.builder(MASTER_CONTAINER_PATH).node
                 (MIN_MAX_LIST_QNAME)


@@ -330,7 +329,7 @@ public class Bug4454Test {
         key.clear();
         key.put(MIN_MAX_KEY_LEAF_QNAME, "baz");
 
         key.clear();
         key.put(MIN_MAX_KEY_LEAF_QNAME, "baz");
 

-        mapEntryPath2 = new YangInstanceIdentifier.NodeIdentifierWithPredicates(MIN_MAX_LIST_QNAME, key);
+        mapEntryPath2 = new NodeIdentifierWithPredicates(MIN_MAX_LIST_QNAME, key);

 
         YangInstanceIdentifier MIN_MAX_LEAF_BAZ = YangInstanceIdentifier.builder(MASTER_CONTAINER_PATH).node
                 (MIN_MAX_LIST_QNAME)
 
         YangInstanceIdentifier MIN_MAX_LEAF_BAZ = YangInstanceIdentifier.builder(MASTER_CONTAINER_PATH).node
                 (MIN_MAX_LIST_QNAME)


@@ -355,7 +354,7 @@ public class Bug4454Test {
         final MapEntryNode fooEntryNode = ImmutableNodes.mapEntry(MIN_MAX_LIST_QNAME_NO_MINMAX, MIN_MAX_KEY_LEAF_QNAME
                 , "foo");
         final MapNode mapNode1 = ImmutableNodes.mapNodeBuilder()
         final MapEntryNode fooEntryNode = ImmutableNodes.mapEntry(MIN_MAX_LIST_QNAME_NO_MINMAX, MIN_MAX_KEY_LEAF_QNAME
                 , "foo");
         final MapNode mapNode1 = ImmutableNodes.mapNodeBuilder()

-                .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(MIN_MAX_LIST_QNAME_NO_MINMAX))
+                .withNodeIdentifier(new NodeIdentifier(MIN_MAX_LIST_QNAME_NO_MINMAX))

                 .withChild(fooEntryNode).build();
 
         final InMemoryDataTreeModification modificationTree = inMemoryDataTree.takeSnapshot().newModification();
                 .withChild(fooEntryNode).build();
 
         final InMemoryDataTreeModification modificationTree = inMemoryDataTree.takeSnapshot().newModification();


@@ -363,8 +362,7 @@ public class Bug4454Test {
         Map<QName, Object> key = new HashMap<>();
         key.put(MIN_MAX_KEY_LEAF_QNAME, "foo");
 
         Map<QName, Object> key = new HashMap<>();
         key.put(MIN_MAX_KEY_LEAF_QNAME, "foo");
 

-        YangInstanceIdentifier.NodeIdentifierWithPredicates mapEntryPath2 = new YangInstanceIdentifier
-                .NodeIdentifierWithPredicates(MIN_MAX_LIST_QNAME_NO_MINMAX , key);
+        NodeIdentifierWithPredicates mapEntryPath2 = new NodeIdentifierWithPredicates(MIN_MAX_LIST_QNAME_NO_MINMAX , key);

 
         YangInstanceIdentifier MIN_MAX_LEAF_FOO = YangInstanceIdentifier.builder(MASTER_CONTAINER_PATH).node
                 (MIN_MAX_LIST_QNAME_NO_MINMAX).node(mapEntryPath2).build();
 
         YangInstanceIdentifier MIN_MAX_LEAF_FOO = YangInstanceIdentifier.builder(MASTER_CONTAINER_PATH).node
                 (MIN_MAX_LIST_QNAME_NO_MINMAX).node(mapEntryPath2).build();


@@ -372,7 +370,7 @@ public class Bug4454Test {
         key.clear();
         key.put(MIN_MAX_KEY_LEAF_QNAME, "non-existing-leaf");
 
         key.clear();
         key.put(MIN_MAX_KEY_LEAF_QNAME, "non-existing-leaf");
 

-        mapEntryPath2 = new YangInstanceIdentifier.NodeIdentifierWithPredicates(MIN_MAX_LIST_QNAME_NO_MINMAX, key);
+        mapEntryPath2 = new NodeIdentifierWithPredicates(MIN_MAX_LIST_QNAME_NO_MINMAX, key);

 
         YangInstanceIdentifier MIN_MAX_LEAF_NEL = YangInstanceIdentifier.builder(MASTER_CONTAINER_PATH).node
                 (MIN_MAX_LIST_QNAME_NO_MINMAX)
 
         YangInstanceIdentifier MIN_MAX_LEAF_NEL = YangInstanceIdentifier.builder(MASTER_CONTAINER_PATH).node
                 (MIN_MAX_LIST_QNAME_NO_MINMAX)

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ListConstraintsValidationTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ListConstraintsValidationTest.java
index 961c5260651a1698aa566a9aebda853e1d271ae3..675de0e86aa9e68a9d6e5dc422e26247f2d00535 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ListConstraintsValidationTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ListConstraintsValidationTest.java
@@ -20,6 +20,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;

+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue;

 import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode;
 import org.opendaylight.yangtools.yang.data.api.schema.LeafSetNode;
 import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
 import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode;
 import org.opendaylight.yangtools.yang.data.api.schema.LeafSetNode;
 import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;


@@ -104,10 +106,10 @@ public class ListConstraintsValidationTest {
         final MapEntryNode fooEntryNode = ImmutableNodes.mapEntry(MIN_MAX_LIST_QNAME, MIN_MAX_KEY_LEAF_QNAME, "foo");
         final MapEntryNode barEntryNode = ImmutableNodes.mapEntry(MIN_MAX_LIST_QNAME, MIN_MAX_KEY_LEAF_QNAME, "bar");
         final MapNode mapNode1 = ImmutableNodes.mapNodeBuilder()
         final MapEntryNode fooEntryNode = ImmutableNodes.mapEntry(MIN_MAX_LIST_QNAME, MIN_MAX_KEY_LEAF_QNAME, "foo");
         final MapEntryNode barEntryNode = ImmutableNodes.mapEntry(MIN_MAX_LIST_QNAME, MIN_MAX_KEY_LEAF_QNAME, "bar");
         final MapNode mapNode1 = ImmutableNodes.mapNodeBuilder()

-                .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(MIN_MAX_LIST_QNAME))
+                .withNodeIdentifier(new NodeIdentifier(MIN_MAX_LIST_QNAME))

                 .withChild(fooEntryNode).build();
         final MapNode mapNode2 = ImmutableNodes.mapNodeBuilder()
                 .withChild(fooEntryNode).build();
         final MapNode mapNode2 = ImmutableNodes.mapNodeBuilder()

-                .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(MIN_MAX_LIST_QNAME))
+                .withNodeIdentifier(new NodeIdentifier(MIN_MAX_LIST_QNAME))

                 .withChild(barEntryNode).build();
 
         final InMemoryDataTreeModification modificationTree = inMemoryDataTree.takeSnapshot().newModification();
                 .withChild(barEntryNode).build();
 
         final InMemoryDataTreeModification modificationTree = inMemoryDataTree.takeSnapshot().newModification();


@@ -134,7 +136,7 @@ public class ListConstraintsValidationTest {
         final MapEntryNode barEntryNode = ImmutableNodes.mapEntry(MIN_MAX_LIST_QNAME, MIN_MAX_KEY_LEAF_QNAME, "bar");
         final MapEntryNode gooEntryNode = ImmutableNodes.mapEntry(MIN_MAX_LIST_QNAME, MIN_MAX_KEY_LEAF_QNAME, "goo");
         final MapNode mapNode = ImmutableNodes.mapNodeBuilder()
         final MapEntryNode barEntryNode = ImmutableNodes.mapEntry(MIN_MAX_LIST_QNAME, MIN_MAX_KEY_LEAF_QNAME, "bar");
         final MapEntryNode gooEntryNode = ImmutableNodes.mapEntry(MIN_MAX_LIST_QNAME, MIN_MAX_KEY_LEAF_QNAME, "goo");
         final MapNode mapNode = ImmutableNodes.mapNodeBuilder()

-                .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(MIN_MAX_LIST_QNAME))
+                .withNodeIdentifier(new NodeIdentifier(MIN_MAX_LIST_QNAME))

                 .withChild(fooEntryNode).build();
 
         final YangInstanceIdentifier fooPath = MIN_MAX_LIST_PATH.node(fooEntryNode.getIdentifier());
                 .withChild(fooEntryNode).build();
 
         final YangInstanceIdentifier fooPath = MIN_MAX_LIST_PATH.node(fooEntryNode.getIdentifier());


@@ -182,8 +184,8 @@ public class ListConstraintsValidationTest {
     public void minMaxLeafListPass() throws DataValidationFailedException {
         final DataTreeModification modificationTree = inMemoryDataTree.takeSnapshot().newModification();
 
     public void minMaxLeafListPass() throws DataValidationFailedException {
         final DataTreeModification modificationTree = inMemoryDataTree.takeSnapshot().newModification();
 

-        final YangInstanceIdentifier.NodeWithValue barPath = new YangInstanceIdentifier.NodeWithValue(MIN_MAX_LIST_QNAME, "bar");
-        final YangInstanceIdentifier.NodeWithValue gooPath = new YangInstanceIdentifier.NodeWithValue(MIN_MAX_LIST_QNAME, "goo");
+        final NodeWithValue<?> barPath = new NodeWithValue<>(MIN_MAX_LIST_QNAME, "bar");
+        final NodeWithValue<?> gooPath = new NodeWithValue<>(MIN_MAX_LIST_QNAME, "goo");

 
         final LeafSetEntryNode<Object> barLeafSetEntry = ImmutableLeafSetEntryNodeBuilder.create()
                 .withNodeIdentifier(barPath)
 
         final LeafSetEntryNode<Object> barLeafSetEntry = ImmutableLeafSetEntryNodeBuilder.create()
                 .withNodeIdentifier(barPath)


@@ -193,7 +195,7 @@ public class ListConstraintsValidationTest {
                 .withValue("goo").build();
 
         final LeafSetNode<Object> fooLeafSetNode = ImmutableLeafSetNodeBuilder.create()
                 .withValue("goo").build();
 
         final LeafSetNode<Object> fooLeafSetNode = ImmutableLeafSetNodeBuilder.create()

-                .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(MIN_MAX_LEAF_LIST_QNAME))
+                .withNodeIdentifier(new NodeIdentifier(MIN_MAX_LEAF_LIST_QNAME))

                 .withChildValue("foo").build();
 
         modificationTree.write(MIN_MAX_LEAF_LIST_PATH, fooLeafSetNode);
                 .withChildValue("foo").build();
 
         modificationTree.write(MIN_MAX_LEAF_LIST_PATH, fooLeafSetNode);


@@ -210,7 +212,7 @@ public class ListConstraintsValidationTest {
         final Optional<NormalizedNode<?, ?>> masterContainer = snapshotAfterCommit.readNode(MASTER_CONTAINER_PATH);
         assertTrue(masterContainer.isPresent());
         final Optional<NormalizedNodeContainer<?, ?, ?>> leafList = ((NormalizedNodeContainer) masterContainer.get()).getChild(
         final Optional<NormalizedNode<?, ?>> masterContainer = snapshotAfterCommit.readNode(MASTER_CONTAINER_PATH);
         assertTrue(masterContainer.isPresent());
         final Optional<NormalizedNodeContainer<?, ?, ?>> leafList = ((NormalizedNodeContainer) masterContainer.get()).getChild(

-                new YangInstanceIdentifier.NodeIdentifier(MIN_MAX_LEAF_LIST_QNAME));
+                new NodeIdentifier(MIN_MAX_LEAF_LIST_QNAME));

         assertTrue(leafList.isPresent());
         assertTrue(leafList.get().getValue().size() == 2);
     }
         assertTrue(leafList.isPresent());
         assertTrue(leafList.get().getValue().size() == 2);
     }


@@ -219,10 +221,10 @@ public class ListConstraintsValidationTest {
     public void minMaxLeafListFail() throws DataValidationFailedException {
         final DataTreeModification modificationTree = inMemoryDataTree.takeSnapshot().newModification();
 
     public void minMaxLeafListFail() throws DataValidationFailedException {
         final DataTreeModification modificationTree = inMemoryDataTree.takeSnapshot().newModification();
 

-        final YangInstanceIdentifier.NodeWithValue fooPath = new YangInstanceIdentifier.NodeWithValue(MIN_MAX_LIST_QNAME, "foo");
-        final YangInstanceIdentifier.NodeWithValue barPath = new YangInstanceIdentifier.NodeWithValue(MIN_MAX_LIST_QNAME, "bar");
-        final YangInstanceIdentifier.NodeWithValue gooPath = new YangInstanceIdentifier.NodeWithValue(MIN_MAX_LIST_QNAME, "goo");
-        final YangInstanceIdentifier.NodeWithValue fuuPath = new YangInstanceIdentifier.NodeWithValue(MIN_MAX_LIST_QNAME, "fuu");
+        final NodeWithValue<?> fooPath = new NodeWithValue<>(MIN_MAX_LIST_QNAME, "foo");
+        final NodeWithValue<?> barPath = new NodeWithValue<>(MIN_MAX_LIST_QNAME, "bar");
+        final NodeWithValue<?> gooPath = new NodeWithValue<>(MIN_MAX_LIST_QNAME, "goo");
+        final NodeWithValue<?> fuuPath = new NodeWithValue<>(MIN_MAX_LIST_QNAME, "fuu");

 
         final LeafSetEntryNode<Object> barLeafSetEntry = ImmutableLeafSetEntryNodeBuilder.create()
                 .withNodeIdentifier(barPath)
 
         final LeafSetEntryNode<Object> barLeafSetEntry = ImmutableLeafSetEntryNodeBuilder.create()
                 .withNodeIdentifier(barPath)


@@ -235,7 +237,7 @@ public class ListConstraintsValidationTest {
                 .withValue("fuu").build();
 
         final LeafSetNode<Object> fooLeafSetNode = ImmutableLeafSetNodeBuilder.create()
                 .withValue("fuu").build();
 
         final LeafSetNode<Object> fooLeafSetNode = ImmutableLeafSetNodeBuilder.create()

-                .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(MIN_MAX_LEAF_LIST_QNAME))
+                .withNodeIdentifier(new NodeIdentifier(MIN_MAX_LEAF_LIST_QNAME))

                 .withChildValue("foo").build();
 
         modificationTree.write(MIN_MAX_LEAF_LIST_PATH, fooLeafSetNode);
                 .withChildValue("foo").build();
 
         modificationTree.write(MIN_MAX_LEAF_LIST_PATH, fooLeafSetNode);


@@ -252,12 +254,12 @@ public class ListConstraintsValidationTest {
         final DataTreeModification modificationTree = inMemoryDataTree.takeSnapshot().newModification();
 
         final UnkeyedListEntryNode foo = ImmutableUnkeyedListEntryNodeBuilder.create()
         final DataTreeModification modificationTree = inMemoryDataTree.takeSnapshot().newModification();
 
         final UnkeyedListEntryNode foo = ImmutableUnkeyedListEntryNodeBuilder.create()

-                .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(UNKEYED_LEAF_QNAME))
+                .withNodeIdentifier(new NodeIdentifier(UNKEYED_LEAF_QNAME))

                 .withChild(ImmutableNodes.leafNode(UNKEYED_LEAF_QNAME, "foo")).build();
         final List<UnkeyedListEntryNode> unkeyedEntries = new ArrayList<>();
         unkeyedEntries.add(foo);
         final UnkeyedListNode unkeyedListNode = ImmutableUnkeyedListNodeBuilder.create()
                 .withChild(ImmutableNodes.leafNode(UNKEYED_LEAF_QNAME, "foo")).build();
         final List<UnkeyedListEntryNode> unkeyedEntries = new ArrayList<>();
         unkeyedEntries.add(foo);
         final UnkeyedListNode unkeyedListNode = ImmutableUnkeyedListNodeBuilder.create()

-                .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(UNKEYED_LIST_QNAME))
+                .withNodeIdentifier(new NodeIdentifier(UNKEYED_LIST_QNAME))

                 .withValue(unkeyedEntries).build();
 
         modificationTree.write(MASTER_CONTAINER_PATH, ImmutableNodes.containerNode(MASTER_CONTAINER_QNAME));
                 .withValue(unkeyedEntries).build();
 
         modificationTree.write(MASTER_CONTAINER_PATH, ImmutableNodes.containerNode(MASTER_CONTAINER_QNAME));


@@ -279,16 +281,16 @@ public class ListConstraintsValidationTest {
         final DataTreeModification modificationTree = inMemoryDataTree.takeSnapshot().newModification();
 
         final UnkeyedListEntryNode foo = ImmutableUnkeyedListEntryNodeBuilder.create()
         final DataTreeModification modificationTree = inMemoryDataTree.takeSnapshot().newModification();
 
         final UnkeyedListEntryNode foo = ImmutableUnkeyedListEntryNodeBuilder.create()

-                .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(UNKEYED_LEAF_QNAME))
+                .withNodeIdentifier(new NodeIdentifier(UNKEYED_LEAF_QNAME))

                 .withChild(ImmutableNodes.leafNode(UNKEYED_LEAF_QNAME, "foo")).build();
         final UnkeyedListEntryNode bar = ImmutableUnkeyedListEntryNodeBuilder.create()
                 .withChild(ImmutableNodes.leafNode(UNKEYED_LEAF_QNAME, "foo")).build();
         final UnkeyedListEntryNode bar = ImmutableUnkeyedListEntryNodeBuilder.create()

-                .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(UNKEYED_LEAF_QNAME))
+                .withNodeIdentifier(new NodeIdentifier(UNKEYED_LEAF_QNAME))

                 .withChild(ImmutableNodes.leafNode(UNKEYED_LEAF_QNAME, "bar")).build();
         final List<UnkeyedListEntryNode> unkeyedEntries = new ArrayList<>();
         unkeyedEntries.add(foo);
         unkeyedEntries.add(bar);
         final UnkeyedListNode unkeyedListNode = ImmutableUnkeyedListNodeBuilder.create()
                 .withChild(ImmutableNodes.leafNode(UNKEYED_LEAF_QNAME, "bar")).build();
         final List<UnkeyedListEntryNode> unkeyedEntries = new ArrayList<>();
         unkeyedEntries.add(foo);
         unkeyedEntries.add(bar);
         final UnkeyedListNode unkeyedListNode = ImmutableUnkeyedListNodeBuilder.create()

-                .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(UNKEYED_LIST_QNAME))
+                .withNodeIdentifier(new NodeIdentifier(UNKEYED_LIST_QNAME))

                 .withValue(unkeyedEntries).build();
 
         modificationTree.write(UNKEYED_LIST_PATH, unkeyedListNode);
                 .withValue(unkeyedEntries).build();
 
         modificationTree.write(UNKEYED_LIST_PATH, unkeyedListNode);

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Retest_ListConstraintsValidation.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Retest_ListConstraintsValidation.java
index b0be7ef787ea8eb00cec7ca40ecbed661bb67890..ff7d466a13462f9dc886c6dc3bfa87ed3722a646 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Retest_ListConstraintsValidation.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Retest_ListConstraintsValidation.java
@@ -18,6 +18,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;

+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue;

 import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode;
 import org.opendaylight.yangtools.yang.data.api.schema.LeafSetNode;
 import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
 import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode;
 import org.opendaylight.yangtools.yang.data.api.schema.LeafSetNode;
 import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;


@@ -106,10 +108,10 @@ public class Retest_ListConstraintsValidation {
         final MapEntryNode fooEntryNode = ImmutableNodes.mapEntry(MIN_MAX_LIST_QNAME, MIN_MAX_KEY_LEAF_QNAME, "foo");
         final MapEntryNode barEntryNode = ImmutableNodes.mapEntry(MIN_MAX_LIST_QNAME, MIN_MAX_KEY_LEAF_QNAME, "bar");
         final MapNode mapNode1 = ImmutableNodes.mapNodeBuilder()
         final MapEntryNode fooEntryNode = ImmutableNodes.mapEntry(MIN_MAX_LIST_QNAME, MIN_MAX_KEY_LEAF_QNAME, "foo");
         final MapEntryNode barEntryNode = ImmutableNodes.mapEntry(MIN_MAX_LIST_QNAME, MIN_MAX_KEY_LEAF_QNAME, "bar");
         final MapNode mapNode1 = ImmutableNodes.mapNodeBuilder()

-                .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(MIN_MAX_LIST_QNAME))
+                .withNodeIdentifier(new NodeIdentifier(MIN_MAX_LIST_QNAME))

                 .withChild(fooEntryNode).build();
         final MapNode mapNode2 = ImmutableNodes.mapNodeBuilder()
                 .withChild(fooEntryNode).build();
         final MapNode mapNode2 = ImmutableNodes.mapNodeBuilder()

-                .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(MIN_MAX_LIST_QNAME))
+                .withNodeIdentifier(new NodeIdentifier(MIN_MAX_LIST_QNAME))

                 .withChild(barEntryNode).build();
 
         final InMemoryDataTreeModification modificationTree = inMemoryDataTree.takeSnapshot().newModification();
                 .withChild(barEntryNode).build();
 
         final InMemoryDataTreeModification modificationTree = inMemoryDataTree.takeSnapshot().newModification();


@@ -136,7 +138,7 @@ public class Retest_ListConstraintsValidation {
         final MapEntryNode barEntryNode = ImmutableNodes.mapEntry(MIN_MAX_LIST_QNAME, MIN_MAX_KEY_LEAF_QNAME, "bar");
         final MapEntryNode gooEntryNode = ImmutableNodes.mapEntry(MIN_MAX_LIST_QNAME, MIN_MAX_KEY_LEAF_QNAME, "goo");
         final MapNode mapNode = ImmutableNodes.mapNodeBuilder()
         final MapEntryNode barEntryNode = ImmutableNodes.mapEntry(MIN_MAX_LIST_QNAME, MIN_MAX_KEY_LEAF_QNAME, "bar");
         final MapEntryNode gooEntryNode = ImmutableNodes.mapEntry(MIN_MAX_LIST_QNAME, MIN_MAX_KEY_LEAF_QNAME, "goo");
         final MapNode mapNode = ImmutableNodes.mapNodeBuilder()

-                .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(MIN_MAX_LIST_QNAME))
+                .withNodeIdentifier(new NodeIdentifier(MIN_MAX_LIST_QNAME))

                 .withChild(fooEntryNode).build();
 
         final YangInstanceIdentifier fooPath = MIN_MAX_LIST_PATH.node(fooEntryNode.getIdentifier());
                 .withChild(fooEntryNode).build();
 
         final YangInstanceIdentifier fooPath = MIN_MAX_LIST_PATH.node(fooEntryNode.getIdentifier());


@@ -184,8 +186,8 @@ public class Retest_ListConstraintsValidation {
     public void minMaxLeafListPass() throws DataValidationFailedException {
         final DataTreeModification modificationTree = inMemoryDataTree.takeSnapshot().newModification();
 
     public void minMaxLeafListPass() throws DataValidationFailedException {
         final DataTreeModification modificationTree = inMemoryDataTree.takeSnapshot().newModification();
 

-        final YangInstanceIdentifier.NodeWithValue barPath = new YangInstanceIdentifier.NodeWithValue(MIN_MAX_LIST_QNAME, "bar");
-        final YangInstanceIdentifier.NodeWithValue gooPath = new YangInstanceIdentifier.NodeWithValue(MIN_MAX_LIST_QNAME, "goo");
+        final NodeWithValue<Object> barPath = new NodeWithValue<>(MIN_MAX_LIST_QNAME, "bar");
+        final NodeWithValue<Object> gooPath = new NodeWithValue<>(MIN_MAX_LIST_QNAME, "goo");

 
         final LeafSetEntryNode<Object> barLeafSetEntry = ImmutableLeafSetEntryNodeBuilder.create()
                 .withNodeIdentifier(barPath)
 
         final LeafSetEntryNode<Object> barLeafSetEntry = ImmutableLeafSetEntryNodeBuilder.create()
                 .withNodeIdentifier(barPath)


@@ -195,7 +197,7 @@ public class Retest_ListConstraintsValidation {
                 .withValue("goo").build();
 
         final LeafSetNode<Object> fooLeafSetNode = ImmutableLeafSetNodeBuilder.create()
                 .withValue("goo").build();
 
         final LeafSetNode<Object> fooLeafSetNode = ImmutableLeafSetNodeBuilder.create()

-                .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(MIN_MAX_LEAF_LIST_QNAME))
+                .withNodeIdentifier(new NodeIdentifier(MIN_MAX_LEAF_LIST_QNAME))

                 .withChildValue("foo").build();
 
         modificationTree.write(MIN_MAX_LEAF_LIST_PATH, fooLeafSetNode);
                 .withChildValue("foo").build();
 
         modificationTree.write(MIN_MAX_LEAF_LIST_PATH, fooLeafSetNode);


@@ -212,7 +214,7 @@ public class Retest_ListConstraintsValidation {
         final Optional<NormalizedNode<?, ?>> masterContainer = snapshotAfterCommit.readNode(MASTER_CONTAINER_PATH);
         assertTrue(masterContainer.isPresent());
         final Optional<NormalizedNodeContainer<?, ?, ?>> leafList = ((NormalizedNodeContainer) masterContainer.get()).getChild(
         final Optional<NormalizedNode<?, ?>> masterContainer = snapshotAfterCommit.readNode(MASTER_CONTAINER_PATH);
         assertTrue(masterContainer.isPresent());
         final Optional<NormalizedNodeContainer<?, ?, ?>> leafList = ((NormalizedNodeContainer) masterContainer.get()).getChild(

-                new YangInstanceIdentifier.NodeIdentifier(MIN_MAX_LEAF_LIST_QNAME));
+                new NodeIdentifier(MIN_MAX_LEAF_LIST_QNAME));

         assertTrue(leafList.isPresent());
         assertTrue(leafList.get().getValue().size() == 2);
     }
         assertTrue(leafList.isPresent());
         assertTrue(leafList.get().getValue().size() == 2);
     }


@@ -221,10 +223,10 @@ public class Retest_ListConstraintsValidation {
     public void minMaxLeafListFail() throws DataValidationFailedException {
         final DataTreeModification modificationTree = inMemoryDataTree.takeSnapshot().newModification();
 
     public void minMaxLeafListFail() throws DataValidationFailedException {
         final DataTreeModification modificationTree = inMemoryDataTree.takeSnapshot().newModification();
 

-        final YangInstanceIdentifier.NodeWithValue fooPath = new YangInstanceIdentifier.NodeWithValue(MIN_MAX_LIST_QNAME, "foo");
-        final YangInstanceIdentifier.NodeWithValue barPath = new YangInstanceIdentifier.NodeWithValue(MIN_MAX_LIST_QNAME, "bar");
-        final YangInstanceIdentifier.NodeWithValue gooPath = new YangInstanceIdentifier.NodeWithValue(MIN_MAX_LIST_QNAME, "goo");
-        final YangInstanceIdentifier.NodeWithValue fuuPath = new YangInstanceIdentifier.NodeWithValue(MIN_MAX_LIST_QNAME, "fuu");
+        final NodeWithValue<Object> fooPath = new NodeWithValue<>(MIN_MAX_LIST_QNAME, "foo");
+        final NodeWithValue<Object> barPath = new NodeWithValue<>(MIN_MAX_LIST_QNAME, "bar");
+        final NodeWithValue<Object> gooPath = new NodeWithValue<>(MIN_MAX_LIST_QNAME, "goo");
+        final NodeWithValue<Object> fuuPath = new NodeWithValue<>(MIN_MAX_LIST_QNAME, "fuu");

 
         final LeafSetEntryNode<Object> barLeafSetEntry = ImmutableLeafSetEntryNodeBuilder.create()
                 .withNodeIdentifier(barPath)
 
         final LeafSetEntryNode<Object> barLeafSetEntry = ImmutableLeafSetEntryNodeBuilder.create()
                 .withNodeIdentifier(barPath)


@@ -237,7 +239,7 @@ public class Retest_ListConstraintsValidation {
                 .withValue("fuu").build();
 
         final LeafSetNode<Object> fooLeafSetNode = ImmutableLeafSetNodeBuilder.create()
                 .withValue("fuu").build();
 
         final LeafSetNode<Object> fooLeafSetNode = ImmutableLeafSetNodeBuilder.create()

-                .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(MIN_MAX_LEAF_LIST_QNAME))
+                .withNodeIdentifier(new NodeIdentifier(MIN_MAX_LEAF_LIST_QNAME))

                 .withChildValue("foo").build();
 
         modificationTree.write(MIN_MAX_LEAF_LIST_PATH, fooLeafSetNode);
                 .withChildValue("foo").build();
 
         modificationTree.write(MIN_MAX_LEAF_LIST_PATH, fooLeafSetNode);


@@ -254,12 +256,12 @@ public class Retest_ListConstraintsValidation {
         final DataTreeModification modificationTree = inMemoryDataTree.takeSnapshot().newModification();
 
         final UnkeyedListEntryNode foo = ImmutableUnkeyedListEntryNodeBuilder.create()
         final DataTreeModification modificationTree = inMemoryDataTree.takeSnapshot().newModification();
 
         final UnkeyedListEntryNode foo = ImmutableUnkeyedListEntryNodeBuilder.create()

-                .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(UNKEYED_LEAF_QNAME))
+                .withNodeIdentifier(new NodeIdentifier(UNKEYED_LEAF_QNAME))

                 .withChild(ImmutableNodes.leafNode(UNKEYED_LEAF_QNAME, "foo")).build();
         final List<UnkeyedListEntryNode> unkeyedEntries = new ArrayList<>();
         unkeyedEntries.add(foo);
         final UnkeyedListNode unkeyedListNode = ImmutableUnkeyedListNodeBuilder.create()
                 .withChild(ImmutableNodes.leafNode(UNKEYED_LEAF_QNAME, "foo")).build();
         final List<UnkeyedListEntryNode> unkeyedEntries = new ArrayList<>();
         unkeyedEntries.add(foo);
         final UnkeyedListNode unkeyedListNode = ImmutableUnkeyedListNodeBuilder.create()

-                .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(UNKEYED_LIST_QNAME))
+                .withNodeIdentifier(new NodeIdentifier(UNKEYED_LIST_QNAME))

                 .withValue(unkeyedEntries).build();
 
         modificationTree.write(MASTER_CONTAINER_PATH, ImmutableNodes.containerNode(MASTER_CONTAINER_QNAME));
                 .withValue(unkeyedEntries).build();
 
         modificationTree.write(MASTER_CONTAINER_PATH, ImmutableNodes.containerNode(MASTER_CONTAINER_QNAME));


@@ -281,16 +283,16 @@ public class Retest_ListConstraintsValidation {
         final DataTreeModification modificationTree = inMemoryDataTree.takeSnapshot().newModification();
 
         final UnkeyedListEntryNode foo = ImmutableUnkeyedListEntryNodeBuilder.create()
         final DataTreeModification modificationTree = inMemoryDataTree.takeSnapshot().newModification();
 
         final UnkeyedListEntryNode foo = ImmutableUnkeyedListEntryNodeBuilder.create()

-                .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(UNKEYED_LEAF_QNAME))
+                .withNodeIdentifier(new NodeIdentifier(UNKEYED_LEAF_QNAME))

                 .withChild(ImmutableNodes.leafNode(UNKEYED_LEAF_QNAME, "foo")).build();
         final UnkeyedListEntryNode bar = ImmutableUnkeyedListEntryNodeBuilder.create()
                 .withChild(ImmutableNodes.leafNode(UNKEYED_LEAF_QNAME, "foo")).build();
         final UnkeyedListEntryNode bar = ImmutableUnkeyedListEntryNodeBuilder.create()

-                .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(UNKEYED_LEAF_QNAME))
+                .withNodeIdentifier(new NodeIdentifier(UNKEYED_LEAF_QNAME))

                 .withChild(ImmutableNodes.leafNode(UNKEYED_LEAF_QNAME, "bar")).build();
         final List<UnkeyedListEntryNode> unkeyedEntries = new ArrayList<>();
         unkeyedEntries.add(foo);
         unkeyedEntries.add(bar);
         final UnkeyedListNode unkeyedListNode = ImmutableUnkeyedListNodeBuilder.create()
                 .withChild(ImmutableNodes.leafNode(UNKEYED_LEAF_QNAME, "bar")).build();
         final List<UnkeyedListEntryNode> unkeyedEntries = new ArrayList<>();
         unkeyedEntries.add(foo);
         unkeyedEntries.add(bar);
         final UnkeyedListNode unkeyedListNode = ImmutableUnkeyedListNodeBuilder.create()

-                .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(UNKEYED_LIST_QNAME))
+                .withNodeIdentifier(new NodeIdentifier(UNKEYED_LIST_QNAME))

                 .withValue(unkeyedEntries).build();
 
         modificationTree.write(UNKEYED_LIST_PATH, unkeyedListNode);
                 .withValue(unkeyedEntries).build();
 
         modificationTree.write(UNKEYED_LIST_PATH, unkeyedListNode);