Change CreateStreamUtil return types

Move RestconfFuture allocation down to CreateStreamUtil, as we will need
asynchronous operations. Prepare for that by pushing the future down a
layer.

JIRA: NETCONF-1102
Change-Id: I0d3474319ce0de766483b527831fe507ab70ad5a
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 d1ee8a2b83083fe6d50672d7b20d3a26b49d6a39..c7a25d1a6de3f479de2d3a633917d068c8c75649 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
@@ -8,6 +8,7 @@
 package org.opendaylight.restconf.nb.rfc8040.rests.services.impl;
 
 import com.google.common.collect.ImmutableSet;
+import java.util.Optional;
 import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.mdsal.dom.api.DOMMountPoint;
@@ -16,6 +17,7 @@ import org.opendaylight.mdsal.dom.api.DOMNotificationService;
 import org.opendaylight.mdsal.dom.api.DOMRpcResult;
 import org.opendaylight.mdsal.dom.api.DOMSchemaService;
 import org.opendaylight.restconf.common.errors.RestconfDocumentedException;
+import org.opendaylight.restconf.common.errors.RestconfFuture;
 import org.opendaylight.restconf.nb.rfc8040.rests.utils.RestconfStreamsConstants;
 import org.opendaylight.restconf.nb.rfc8040.streams.listeners.ListenersBroker;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.device.notification.rev221106.SubscribeDeviceNotificationInput;
@@ -94,7 +96,7 @@ final class CreateStreamUtil {
      *                  }
      *              }
      *              </pre>
-     * @param refSchemaCtx Reference to {@link EffectiveModelContext}.
+     * @param modelContext Reference to {@link EffectiveModelContext}.
      * @return {@link DOMRpcResult} - Output of RPC - example in JSON:
      *     <pre>
      *     {@code
@@ -107,24 +109,24 @@ final class CreateStreamUtil {
      *     </pre>
      */
     // FIXME: this really should be a normal RPC implementation
-    static ContainerNode createDataChangeNotifiStream(final ListenersBroker listenersBroker, final ContainerNode input,
-            final EffectiveModelContext refSchemaCtx) {
+    static RestconfFuture<Optional<ContainerNode>> createDataChangeNotifiStream(final ListenersBroker listenersBroker,
+            final ContainerNode input, final EffectiveModelContext modelContext) {
         final var datastoreName = extractStringLeaf(input, DATASTORE_NODEID);
         final var scopeName = extractStringLeaf(input, SCOPE_NODEID);
-        final var adapter = listenersBroker.registerDataChangeListener(refSchemaCtx,
+        final var adapter = listenersBroker.registerDataChangeListener(modelContext,
             datastoreName != null ? LogicalDatastoreType.valueOf(datastoreName) : LogicalDatastoreType.CONFIGURATION,
             preparePath(input), scopeName != null ? Scope.ofName(scopeName) : Scope.BASE, prepareOutputType(input));
 
         // building of output
-        return Builders.containerBuilder()
+        return RestconfFuture.of(Optional.of(Builders.containerBuilder()
             .withNodeIdentifier(SAL_REMOTE_OUTPUT_NODEID)
             .withChild(ImmutableNodes.leafNode(STREAM_NAME_NODEID, adapter.getStreamName()))
-            .build();
+            .build()));
     }
 
     // FIXME: this really should be a normal RPC implementation
-    static ContainerNode createNotificationStream(final ListenersBroker listenersBroker, final ContainerNode input,
-            final EffectiveModelContext refSchemaCtx) {
+    static RestconfFuture<Optional<ContainerNode>> createNotificationStream(final ListenersBroker listenersBroker,
+            final ContainerNode input, final EffectiveModelContext modelContext) {
         final var qnames = ((LeafSetNode<String>) input.getChildByArg(NOTIFICATIONS)).body().stream()
             .map(LeafSetEntryNode::body)
             .map(QName::create)
@@ -132,20 +134,20 @@ final class CreateStreamUtil {
             .collect(ImmutableSet.toImmutableSet());
 
         for (var qname : qnames) {
-            if (refSchemaCtx.findNotification(qname).isEmpty()) {
+            if (modelContext.findNotification(qname).isEmpty()) {
                 throw new RestconfDocumentedException(qname + " refers to an unknown notification",
                     ErrorType.APPLICATION, ErrorTag.INVALID_VALUE);
             }
         }
 
         // registration of the listener
-        final var adapter = listenersBroker.registerNotificationListener(refSchemaCtx, qnames,
+        final var adapter = listenersBroker.registerNotificationListener(modelContext, qnames,
             prepareOutputType(input));
 
-        return Builders.containerBuilder()
+        return RestconfFuture.of(Optional.of(Builders.containerBuilder()
             .withNodeIdentifier(SAL_REMOTE_OUTPUT_NODEID)
             .withChild(ImmutableNodes.leafNode(STREAM_NAME_NODEID, adapter.getStreamName()))
-            .build();
+            .build()));
     }
 
     /**
@@ -158,9 +160,9 @@ final class CreateStreamUtil {
      * @return {@link DOMRpcResult} - Output of RPC - example in JSON
      */
     // FIXME: this should be an RPC invocation
-    static ContainerNode createDeviceNotificationListener(final String baseUrl, final ContainerNode input,
-            final SubscribeToStreamUtil streamUtil, final DOMMountPointService mountPointService,
-            final ListenersBroker listenersBroker) {
+    static RestconfFuture<Optional<ContainerNode>> createDeviceNotificationListener(
+            final ListenersBroker listenersBroker, final ContainerNode input, final String baseUrl,
+            final DOMMountPointService mountPointService) {
         // parsing out of container with settings and path
         // FIXME: ugly cast
         final var path = (YangInstanceIdentifier) input.findChildByArg(DEVICE_NOTIFICATION_PATH_NODEID)
@@ -203,12 +205,12 @@ final class CreateStreamUtil {
             prepareOutputType(input), mountModelContext, mountPointService, mountPoint.getIdentifier());
         notificationListenerAdapter.listen(mountNotifService, notificationPaths);
 
-        return Builders.containerBuilder()
+        return RestconfFuture.of(Optional.of(Builders.containerBuilder()
             .withNodeIdentifier(new NodeIdentifier(SubscribeDeviceNotificationOutput.QNAME))
             .withChild(ImmutableNodes.leafNode(DEVICE_NOTIFICATION_STREAM_PATH,
                 baseUrl + notificationListenerAdapter.getStreamName() + "?"
                     + RestconfStreamsConstants.NOTIFICATION_TYPE + "=" + RestconfStreamsConstants.DEVICE))
-            .build();
+            .build()));
     }
 
     /**

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 d02b994f208d60a2acaba6acc91ef5ba7e565f5c..8d2464103fcbb56dfbe51d520805aa129f6ae173 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
@@ -154,7 +154,6 @@ public final class RestconfInvokeOperationsServiceImpl {
                     .orElseGet(() -> Response.noContent().build());
             }
         });
-
     }
 
     private RestconfFuture<Optional<ContainerNode>> hackInvokeRpc(final DatabindContext localDatabind,
@@ -165,15 +164,14 @@ public final class RestconfInvokeOperationsServiceImpl {
         if (mountPoint == null) {
             // Hacked-up integration of streams
             if (CreateDataChangeEventSubscription.QNAME.equals(type)) {
-                return RestconfFuture.of(Optional.of(CreateStreamUtil.createDataChangeNotifiStream(
-                    streamUtils.listenersBroker(), input, localDatabind.modelContext())));
+                return CreateStreamUtil.createDataChangeNotifiStream(streamUtils.listenersBroker(), input,
+                    localDatabind.modelContext());
             } else if (CreateNotificationStream.QNAME.equals(type)) {
-                return RestconfFuture.of(Optional.of(CreateStreamUtil.createNotificationStream(
-                    streamUtils.listenersBroker(), input, localDatabind.modelContext())));
+                return CreateStreamUtil.createNotificationStream(streamUtils.listenersBroker(), input,
+                    localDatabind.modelContext());
             } else if (SubscribeDeviceNotification.QNAME.equals(type)) {
-                final var baseUrl = streamUtils.prepareUriByStreamName(uriInfo, "").toString();
-                return RestconfFuture.of(Optional.of(CreateStreamUtil.createDeviceNotificationListener(baseUrl, input,
-                    streamUtils, mountPointService, listenersBroker)));
+                return CreateStreamUtil.createDeviceNotificationListener(listenersBroker, input,
+                    streamUtils.prepareUriByStreamName(uriInfo, "").toString(), mountPointService);
             }
         }
 

diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/CreateStreamUtilTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/CreateStreamUtilTest.java
index 6dae3dfa49840f216ced4314dbcf62bfa8a90d05..c0ad276ce1fb8f7c4bc88720233a904def93101a 100644 (file)
--- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/CreateStreamUtilTest.java
+++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/CreateStreamUtilTest.java
@@ -54,7 +54,7 @@ public class CreateStreamUtilTest {
             "data-change-event-subscription/toaster:toaster/datastore=CONFIGURATION/scope=BASE", "stream-name"),
             CreateStreamUtil.createDataChangeNotifiStream(listenersBroker,
                 prepareDomPayload("create-data-change-event-subscription", RpcDefinition::getInput, "toaster", "path"),
-                SCHEMA_CTX));
+                SCHEMA_CTX).getOrThrow().orElseThrow());
     }
 
     @Test