Migrate users of Builders/ImmutableNodes

[mdsal.git] / binding / mdsal-binding-dom-codec / src / test / java / org / opendaylight / mdsal / binding / dom / codec / impl / ActionSerializeDeserializeTest.java

diff --git a/binding/mdsal-binding-dom-codec/src/test/java/org/opendaylight/mdsal/binding/dom/codec/impl/ActionSerializeDeserializeTest.java b/binding/mdsal-binding-dom-codec/src/test/java/org/opendaylight/mdsal/binding/dom/codec/impl/ActionSerializeDeserializeTest.java
index 0ef465e410d31ad70f7af2647749775852da6180..8cbaa420aa94eb1192d4d6221d33bb45e3fff0e1 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/test/java/org/opendaylight/mdsal/binding/dom/codec/impl/ActionSerializeDeserializeTest.java
+++ b/binding/mdsal-binding-dom-codec/src/test/java/org/opendaylight/mdsal/binding/dom/codec/impl/ActionSerializeDeserializeTest.java
@@ -10,9 +10,8 @@ package org.opendaylight.mdsal.binding.dom.codec.impl;
 import static org.junit.Assert.assertEquals;
 import static org.opendaylight.yangtools.yang.common.YangConstants.operationInputQName;
 import static org.opendaylight.yangtools.yang.common.YangConstants.operationOutputQName;
-import static org.opendaylight.yangtools.yang.data.impl.schema.Builders.containerBuilder;
-import static org.opendaylight.yangtools.yang.data.impl.schema.Builders.leafBuilder;
 
+import org.eclipse.jdt.annotation.NonNull;
 import org.junit.Test;
 import org.opendaylight.yang.gen.v1.urn.odl.actions.norev.cont.Foo;
 import org.opendaylight.yang.gen.v1.urn.odl.actions.norev.cont.FooInput;
@@ -32,27 +31,34 @@ import org.opendaylight.yang.gen.v1.urn.odl.actions.norev.lstio.FooioOutputBuild
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
+import org.opendaylight.yangtools.yang.data.spi.node.ImmutableNodes;
 
 public class ActionSerializeDeserializeTest extends AbstractBindingCodecTest {
     private static final NodeIdentifier FOO_INPUT = NodeIdentifier.create(operationInputQName(Foo.QNAME.getModule()));
     private static final NodeIdentifier FOO_OUTPUT = NodeIdentifier.create(operationOutputQName(Foo.QNAME.getModule()));
     private static final NodeIdentifier FOO_XYZZY = NodeIdentifier.create(QName.create(Foo.QNAME, "xyzzy"));
-    private static final ContainerNode DOM_FOO_INPUT = containerBuilder().withNodeIdentifier(FOO_INPUT)
-            .withChild(leafBuilder().withNodeIdentifier(FOO_XYZZY).withValue("xyzzy").build())
-            .build();
-    private static final ContainerNode DOM_FOO_OUTPUT = containerBuilder().withNodeIdentifier(FOO_OUTPUT).build();
-    private static final FooInput BINDING_FOO_INPUT = new FooInputBuilder().setXyzzy("xyzzy").build();
-    private static final FooOutput BINDING_FOO_OUTPUT = new FooOutputBuilder().build();
+    private static final @NonNull ContainerNode DOM_FOO_INPUT = ImmutableNodes.newContainerBuilder()
+        .withNodeIdentifier(FOO_INPUT)
+        .withChild(ImmutableNodes.leafNode(FOO_XYZZY, "xyzzy"))
+        .build();
+    private static final @NonNull ContainerNode DOM_FOO_OUTPUT = ImmutableNodes.newContainerBuilder()
+        .withNodeIdentifier(FOO_OUTPUT)
+        .build();
+    private static final @NonNull FooInput BINDING_FOO_INPUT = new FooInputBuilder().setXyzzy("xyzzy").build();
+    private static final @NonNull FooOutput BINDING_FOO_OUTPUT = new FooOutputBuilder().build();
 
     private static final NodeIdentifier BAR_INPUT = NodeIdentifier.create(operationInputQName(Foo.QNAME.getModule()));
     private static final NodeIdentifier BAR_OUTPUT = NodeIdentifier.create(operationOutputQName(Foo.QNAME.getModule()));
     private static final NodeIdentifier BAR_XYZZY = NodeIdentifier.create(QName.create(Bar.QNAME, "xyzzy"));
-    private static final ContainerNode DOM_BAR_INPUT = containerBuilder().withNodeIdentifier(BAR_INPUT).build();
-    private static final ContainerNode DOM_BAR_OUTPUT = containerBuilder().withNodeIdentifier(BAR_OUTPUT)
-            .withChild(leafBuilder().withNodeIdentifier(BAR_XYZZY).withValue("xyzzy").build())
-            .build();
-    private static final BarInput BINDING_BAR_INPUT = new BarInputBuilder().build();
-    private static final BarOutput BINDING_BAR_OUTPUT = new BarOutputBuilder().setXyzzy("xyzzy").build();
+    private static final ContainerNode DOM_BAR_INPUT = ImmutableNodes.newContainerBuilder()
+        .withNodeIdentifier(BAR_INPUT)
+        .build();
+    private static final ContainerNode DOM_BAR_OUTPUT = ImmutableNodes.newContainerBuilder()
+        .withNodeIdentifier(BAR_OUTPUT)
+        .withChild(ImmutableNodes.leafNode(BAR_XYZZY, "xyzzy"))
+        .build();
+    private static final @NonNull BarInput BINDING_BAR_INPUT = new BarInputBuilder().build();
+    private static final @NonNull BarOutput BINDING_BAR_OUTPUT = new BarOutputBuilder().setXyzzy("xyzzy").build();
 
     private static final NodeIdentifier FOOIO_INPUT = NodeIdentifier.create(operationInputQName(Fooio.QNAME
             .getModule()));
@@ -60,12 +66,16 @@ public class ActionSerializeDeserializeTest extends AbstractBindingCodecTest {
             .getModule()));
     private static final NodeIdentifier FOOIO_I = NodeIdentifier.create(QName.create(Fooio.QNAME, "fooi"));
     private static final NodeIdentifier FOOIO_O = NodeIdentifier.create(QName.create(Fooio.QNAME, "fooo"));
-    private static final ContainerNode DOM_FOOIO_INPUT = containerBuilder().withNodeIdentifier(FOOIO_INPUT).withChild(
-            leafBuilder().withNodeIdentifier(FOOIO_I).withValue("ifoo").build()).build();
-    private static final ContainerNode DOM_FOOIO_OUTPUT = containerBuilder().withNodeIdentifier(FOOIO_OUTPUT).withChild(
-            leafBuilder().withNodeIdentifier(FOOIO_O).withValue("ofoo").build()).build();
-    private static final FooioInput BINDING_FOOIO_INPUT = new FooioInputBuilder().setFooi("ifoo").build();
-    private static final FooioOutput BINDING_FOOIO_OUTPUT = new FooioOutputBuilder().setFooo("ofoo").build();
+    private static final @NonNull ContainerNode DOM_FOOIO_INPUT = ImmutableNodes.newContainerBuilder()
+        .withNodeIdentifier(FOOIO_INPUT)
+        .withChild(ImmutableNodes.leafNode(FOOIO_I, "ifoo"))
+        .build();
+    private static final @NonNull ContainerNode DOM_FOOIO_OUTPUT = ImmutableNodes.newContainerBuilder()
+        .withNodeIdentifier(FOOIO_OUTPUT)
+        .withChild(ImmutableNodes.leafNode(FOOIO_O, "ofoo"))
+        .build();
+    private static final @NonNull FooioInput BINDING_FOOIO_INPUT = new FooioInputBuilder().setFooi("ifoo").build();
+    private static final @NonNull FooioOutput BINDING_FOOIO_OUTPUT = new FooioOutputBuilder().setFooo("ofoo").build();
 
     @Test
     public void testSerialization() {