Remove InstanceIdentifierContext.getSchemaContext()

Use databind().modelContext() in callers, as they will want to be
shifting to using DatabindContext in some cases.

JIRA: NETCONF-1157
Change-Id: I2ec63f5b8e677f5806dafad5c2076dc8aba8fbf0
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/legacy/InstanceIdentifierContext.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/legacy/InstanceIdentifierContext.java
index 4df6d9b8aeba84c1361a9db2a8a87a03574119c6..4ae6973d2c0874d499ce9a51c4c870d9ebbfbc9d 100644 (file)
--- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/legacy/InstanceIdentifierContext.java
+++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/legacy/InstanceIdentifierContext.java
@@ -26,7 +26,6 @@ import org.opendaylight.restconf.nb.rfc8040.utils.parser.YangInstanceIdentifierD
 import org.opendaylight.yangtools.yang.common.ErrorTag;
 import org.opendaylight.yangtools.yang.common.ErrorType;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.model.api.SchemaNode;
 import org.opendaylight.yangtools.yang.model.util.SchemaInferenceStack;
 import org.opendaylight.yangtools.yang.model.util.SchemaInferenceStack.Inference;
@@ -44,7 +43,7 @@ public abstract class InstanceIdentifierContext {
 
         @Override
         public Inference inference() {
-            return SchemaInferenceStack.of(getSchemaContext()).toInference();
+            return SchemaInferenceStack.of(databind().modelContext()).toInference();
         }
     }
 
@@ -225,11 +224,6 @@ public abstract class InstanceIdentifierContext {
         return mountPoint;
     }
 
-    @Deprecated(forRemoval = true)
-    public final @NonNull EffectiveModelContext getSchemaContext() {
-        return databind.modelContext();
-    }
-
     public abstract @NonNull Inference inference();
 
     public abstract @Nullable YangInstanceIdentifier getInstanceIdentifier();

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/mdsal/MdsalRestconfServer.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/mdsal/MdsalRestconfServer.java
index 9b63d2388bad25155790bddbd9ed4a4f2ae10db7..a20911e0a7b258adc9a56b21650fc9f19379c9bc 100644 (file)
--- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/mdsal/MdsalRestconfServer.java
+++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/mdsal/MdsalRestconfServer.java
@@ -240,7 +240,7 @@ public final class MdsalRestconfServer
         final var fields = readParams.fields();
         final QueryParameters queryParams;
         if (fields != null) {
-            final var modelContext = reqPath.getSchemaContext();
+            final var modelContext = reqPath.databind().modelContext();
             final var schemaNode = (DataSchemaNode) reqPath.getSchemaNode();
             if (reqPath.getMountPoint() != null) {
                 queryParams = QueryParameters.ofFieldPaths(readParams, NetconfFieldsTranslator.translate(modelContext,
@@ -455,7 +455,7 @@ public final class MdsalRestconfServer
             final ResourceBody body, final Map<String, String> queryParameters) {
         final Insert insert;
         try {
-            insert = Insert.ofQueryParameters(reqPath.getSchemaContext(), queryParameters);
+            insert = Insert.ofQueryParameters(reqPath.databind().modelContext(), queryParameters);
         } catch (IllegalArgumentException e) {
             return RestconfFuture.failed(new RestconfDocumentedException(e.getMessage(),
                 ErrorType.PROTOCOL, ErrorTag.INVALID_VALUE, e));

diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/jaxrs/QueryParamsTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/jaxrs/QueryParamsTest.java
index c38371f0be633380d9367551b26b8de7d1c9b28d..71e09f999a95224adb981938c450be474cefa781 100644 (file)
--- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/jaxrs/QueryParamsTest.java
+++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/jaxrs/QueryParamsTest.java
@@ -185,7 +185,7 @@ public class QueryParamsTest {
         final var iid = InstanceIdentifierContext.ofStack(DatabindContext.ofModel(context), stack);
 
         final var queryParameters = QueryParameters.ofFields(params, WriterFieldsTranslator.translate(
-            iid.getSchemaContext(), (DataSchemaNode) iid.getSchemaNode(), paramsFields));
+            iid.databind().modelContext(), (DataSchemaNode) iid.getSchemaNode(), paramsFields));
         final var fields = queryParameters.fields();
         assertNotNull(fields);
         assertEquals(1, fields.size());

diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/ParserIdentifierTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/ParserIdentifierTest.java
index d5de088f93dee5f89aa2d615987381daf06565ca..02901cbee84517150fe5075b321566888f5eb78f 100644 (file)
--- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/ParserIdentifierTest.java
+++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/ParserIdentifierTest.java
@@ -119,7 +119,7 @@ public class ParserIdentifierTest {
             mountPointService);
         assertEquals(TEST_IDENT_RESULT.toString(), context.getInstanceIdentifier().toString());
         assertEquals(mountPoint, context.getMountPoint());
-        assertEquals(MODEL_CONTEXT_ON_MOUNT_POINT, context.getSchemaContext());
+        assertSame(MODEL_CONTEXT_ON_MOUNT_POINT, context.databind().modelContext());
     }
 
     /**
@@ -222,7 +222,7 @@ public class ParserIdentifierTest {
         assertEquals(IdentifierCodec.deserialize(ApiPath.parse(INVOKE_RPC), MODEL_CONTEXT),
             result.getInstanceIdentifier());
         assertEquals(null, result.getMountPoint());
-        assertEquals(MODEL_CONTEXT, result.getSchemaContext());
+        assertSame(MODEL_CONTEXT, result.databind().modelContext());
     }
 
     /**
@@ -242,7 +242,7 @@ public class ParserIdentifierTest {
         assertEquals(IdentifierCodec.deserialize(ApiPath.parse(INVOKE_RPC), MODEL_CONTEXT),
             result.getInstanceIdentifier());
         assertEquals(mountPoint, result.getMountPoint());
-        assertEquals(MODEL_CONTEXT_ON_MOUNT_POINT, result.getSchemaContext());
+        assertSame(MODEL_CONTEXT_ON_MOUNT_POINT, result.databind().modelContext());
     }
 
     /**
@@ -261,7 +261,7 @@ public class ParserIdentifierTest {
         assertEquals(IdentifierCodec.deserialize(ApiPath.parse(INVOKE_ACTION), MODEL_CONTEXT),
             result.getInstanceIdentifier());
         assertNull(result.getMountPoint());
-        assertSame(MODEL_CONTEXT, result.getSchemaContext());
+        assertSame(MODEL_CONTEXT, result.databind().modelContext());
     }
 
     /**
@@ -281,6 +281,6 @@ public class ParserIdentifierTest {
         assertEquals(IdentifierCodec.deserialize(ApiPath.parse(INVOKE_ACTION), MODEL_CONTEXT),
             result.getInstanceIdentifier());
         assertEquals(mountPoint, result.getMountPoint());
-        assertEquals(MODEL_CONTEXT_ON_MOUNT_POINT, result.getSchemaContext());
+        assertSame(MODEL_CONTEXT_ON_MOUNT_POINT, result.databind().modelContext());
     }
 }