Do not pass outer model context

createDeviceNotificationListener() is not using this argument at all, do
not pass it down.

Change-Id: I177aa0dfa3fffa706f1e9194326ba261eb2f186d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/CreateStreamUtil.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/CreateStreamUtil.java
index 9ddce5fbae6a464842f1815d3646f0539ddcd54a..c5e7757fcfdcc4fdd5b5e69008f73081d1dbe3f6 100644 (file)
--- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/CreateStreamUtil.java
+++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/CreateStreamUtil.java
@@ -145,14 +145,12 @@ final class CreateStreamUtil {
      *
      * @param baseUrl base Url
      * @param payload data
-     * @param refSchemaCtx Reference to {@link EffectiveModelContext}.
      * @param streamUtil stream utility
      * @param mountPointService dom mount point service
      * @return {@link DOMRpcResult} - Output of RPC - example in JSON
      */
     static DOMRpcResult createDeviceNotificationListener(final String baseUrl, final NormalizedNodePayload payload,
-            final EffectiveModelContext refSchemaCtx, final SubscribeToStreamUtil streamUtil,
-            final DOMMountPointService mountPointService) {
+            final SubscribeToStreamUtil streamUtil, final DOMMountPointService mountPointService) {
         // parsing out of container with settings and path
         // FIXME: ugly cast
         final ContainerNode data = (ContainerNode) requireNonNull(payload).getData();
@@ -181,7 +179,6 @@ final class CreateStreamUtil {
             .orElseThrow(() -> new RestconfDocumentedException("Mount point does not support notifications",
                 ErrorType.APPLICATION, ErrorTag.OPERATION_FAILED));
 
-        // FIXME: what is the relationship to the unused refSchemaCtx?
         final EffectiveModelContext mountModelContext = mountPoint.getService(DOMSchemaService.class)
             .orElseThrow(() -> new RestconfDocumentedException("Mount point schema not available",
                 ErrorType.APPLICATION, ErrorTag.OPERATION_FAILED))

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfInvokeOperationsServiceImpl.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfInvokeOperationsServiceImpl.java
index 24387b0f52473c967ca88327dc0279c4921dcbeb..a25538794aee65d55dc668d8eb6fcac8f0678d58 100644 (file)
--- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfInvokeOperationsServiceImpl.java
+++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfInvokeOperationsServiceImpl.java
@@ -98,9 +98,8 @@ public class RestconfInvokeOperationsServiceImpl implements RestconfInvokeOperat
             } else if (DEVICE_NOTIFICATION_NAMESPACE.equals(rpcName.getModule())) {
                 // FIXME: this should be a match on RPC QName
                 final String baseUrl = streamUtils.prepareUriByStreamName(uriInfo, "").toString();
-                future = Futures.immediateFuture(
-                    CreateStreamUtil.createDeviceNotificationListener(baseUrl, payload, schemaContext, streamUtils,
-                        mountPointService));
+                future = Futures.immediateFuture(CreateStreamUtil.createDeviceNotificationListener(baseUrl, payload,
+                    streamUtils, mountPointService));
             } else {
                 future = invokeRpc((ContainerNode)payload.getData(), rpcName, rpcService);
             }