Reduce the use of AttrBuilders

[netconf.git] / netconf / sal-netconf-connector / src / test / java / org / opendaylight / netconf / sal / connect / netconf / NetconfToRpcRequestTest.java

diff --git a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfToRpcRequestTest.java b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfToRpcRequestTest.java
index 10cb4e3236f4ca49a6f8da2de2b172432b87ad01..0e0b8dee74884a133b3fb830a91aa5f6106dbf74 100644 (file)
--- a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfToRpcRequestTest.java
+++ b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfToRpcRequestTest.java
@@ -14,22 +14,18 @@ import static org.junit.Assert.assertTrue;
 import static org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil.toId;
 import static org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil.toPath;
 
-import com.google.common.collect.Lists;
-import java.io.InputStream;
-import java.util.Collections;
-import java.util.List;
 import java.util.Set;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.opendaylight.controller.config.util.xml.XmlUtil;
 import org.opendaylight.netconf.api.NetconfMessage;
+import org.opendaylight.netconf.api.xml.XmlUtil;
 import org.opendaylight.netconf.sal.connect.netconf.schema.mapping.NetconfMessageTransformer;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.LeafNode;
 import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
-import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeAttrBuilder;
+import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
@@ -56,16 +52,13 @@ public class NetconfToRpcRequestTest {
     static NetconfMessageTransformer messageTransformer;
 
     @BeforeClass
-    public static void setup() throws Exception {
-        List<InputStream> modelsToParse = Collections.singletonList(
-                NetconfToRpcRequestTest.class.getResourceAsStream("/schemas/rpc-notification-subscription.yang"));
-        final Set<Module> notifModules = YangParserTestUtils.parseYangStreams(modelsToParse).getModules();
+    public static void setup() {
+        final Set<Module> notifModules = YangParserTestUtils.parseYangResource(
+            "/schemas/rpc-notification-subscription.yang").getModules();
         assertTrue(!notifModules.isEmpty());
 
-        modelsToParse = Lists.newArrayList(
-                NetconfToRpcRequestTest.class.getResourceAsStream("/schemas/config-test-rpc.yang"),
-                NetconfToRpcRequestTest.class.getResourceAsStream("/schemas/rpc-notification-subscription.yang"));
-        cfgCtx = YangParserTestUtils.parseYangStreams(modelsToParse);
+        cfgCtx = YangParserTestUtils.parseYangResources(NetconfToRpcRequestTest.class,
+            "/schemas/config-test-rpc.yang", "/schemas/rpc-notification-subscription.yang");
         messageTransformer = new NetconfMessageTransformer(cfgCtx, true);
     }
 
@@ -75,7 +68,7 @@ public class NetconfToRpcRequestTest {
 
     @Test
     public void testUserDefinedRpcCall() throws Exception {
-        final DataContainerNodeAttrBuilder<YangInstanceIdentifier.NodeIdentifier, ContainerNode> rootBuilder =
+        final DataContainerNodeBuilder<YangInstanceIdentifier.NodeIdentifier, ContainerNode> rootBuilder =
                 Builders.containerBuilder();
         rootBuilder.withNodeIdentifier(toId(SUBSCRIBE_RPC_NAME));