Use ControllerContext non-statically

[netconf.git] / restconf / restconf-nb-bierman02 / src / test / java / org / opendaylight / controller / sal / restconf / impl / test / CutDataToCorrectDepthTest.java

diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/CutDataToCorrectDepthTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/CutDataToCorrectDepthTest.java
index 72e9351ade42a67570b651d4521c0650aaa6dc86..1224c3d389e298fe4f35edd833fa856030fef56c 100644 (file)
--- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/CutDataToCorrectDepthTest.java
+++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/CutDataToCorrectDepthTest.java
@@ -30,16 +30,17 @@ import javax.ws.rs.core.UriInfo;
 import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.test.JerseyTest;
 import org.junit.BeforeClass;
+import org.opendaylight.controller.md.sal.rest.common.TestRestconfUtils;
 import org.opendaylight.netconf.sal.rest.impl.JsonNormalizedNodeBodyReader;
 import org.opendaylight.netconf.sal.rest.impl.NormalizedNodeJsonBodyWriter;
 import org.opendaylight.netconf.sal.rest.impl.NormalizedNodeXmlBodyWriter;
 import org.opendaylight.netconf.sal.rest.impl.RestconfDocumentedExceptionMapper;
 import org.opendaylight.netconf.sal.rest.impl.XmlNormalizedNodeBodyReader;
 import org.opendaylight.netconf.sal.restconf.impl.ControllerContext;
-import org.opendaylight.netconf.sal.restconf.impl.InstanceIdentifierContext;
-import org.opendaylight.netconf.sal.restconf.impl.NormalizedNodeContext;
 import org.opendaylight.netconf.sal.restconf.impl.QueryParametersParser;
-import org.opendaylight.netconf.sal.restconf.impl.WriterParameters;
+import org.opendaylight.restconf.common.context.InstanceIdentifierContext;
+import org.opendaylight.restconf.common.context.NormalizedNodeContext;
+import org.opendaylight.restconf.common.context.WriterParameters;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
@@ -73,6 +74,9 @@ public class CutDataToCorrectDepthTest extends JerseyTest {
     private NormalizedNode<?, ?> globalPayload;
     private static SchemaContext schemaContextModules;
 
+    private final ControllerContext controllerContext =
+            TestRestconfUtils.newControllerContext(schemaContextModules, null);
+
     @Path("/")
     public class RestImpl {
 
@@ -82,8 +86,7 @@ public class CutDataToCorrectDepthTest extends JerseyTest {
         public NormalizedNodeContext getData(@Encoded @PathParam("identifier") final String identifier,
                                              @Context final UriInfo uriInfo) {
 
-            final InstanceIdentifierContext<?> iiWithData = ControllerContext.getInstance().toInstanceIdentifier(
-                    identifier);
+            final InstanceIdentifierContext<?> iiWithData = controllerContext.toInstanceIdentifier(identifier);
 
             NormalizedNode<?, ?> data = null;
             if (identifier.equals("nested-module:depth1-cont/depth2-cont1")) {
@@ -167,7 +170,6 @@ public class CutDataToCorrectDepthTest extends JerseyTest {
     }
 
     public void getDataWithUriDepthParameter(final String mediaType) throws WebApplicationException, IOException {
-        ControllerContext.getInstance().setGlobalSchema(schemaContextModules);
         Response response;
 
         // Test config with depth 1
@@ -303,16 +305,16 @@ public class CutDataToCorrectDepthTest extends JerseyTest {
     }
 
     private static NodeIdentifier toIdentifier(final String localName) {
-        return new NodeIdentifier(QName.create("urn:nested:module", "2014-06-3", localName));
+        return new NodeIdentifier(QName.create("urn:nested:module", "2014-06-03", localName));
     }
 
     private static NodeIdentifierWithPredicates toIdentifier(final String localName, final Map<QName, Object> keys) {
-        return new NodeIdentifierWithPredicates(QName.create("urn:nested:module", "2014-06-3", localName),
+        return new NodeIdentifierWithPredicates(QName.create("urn:nested:module", "2014-06-03", localName),
                 keys);
     }
 
     private static NodeWithValue<?> toIdentifier(final String localName, final Object value) {
-        return new NodeWithValue<>(QName.create("urn:nested:module", "2014-06-3", localName), value);
+        return new NodeWithValue<>(QName.create("urn:nested:module", "2014-06-03", localName), value);
     }
 
     private static UnkeyedListEntryNode nodeDataDepth3Operational() {