Update AbstractQueryParams

[netconf.git] / restconf / restconf-nb-rfc8040 / src / main / java / org / opendaylight / restconf / nb / rfc8040 / rests / services / impl / SubscribeToStreamUtil.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/SubscribeToStreamUtil.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/SubscribeToStreamUtil.java
index b95059beb5e3efb4198361ffab02c8df0050fe72..2019aff332720709ecd41264b09e136b4e768b74 100644 (file)
--- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/SubscribeToStreamUtil.java
+++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/SubscribeToStreamUtil.java
@@ -130,13 +130,8 @@ abstract class SubscribeToStreamUtil {
 
         final EffectiveModelContext schemaContext = handlersHolder.getSchemaHandler().get();
         final URI uri = prepareUriByStreamName(uriInfo, streamName);
+        notificationListenerAdapter.setQueryParams(notificationQueryParams);
         notificationListenerAdapter.listen(handlersHolder.getNotificationServiceHandler());
-        notificationListenerAdapter.setQueryParams(
-                notificationQueryParams.startTime(),
-                notificationQueryParams.stopTime(),
-                notificationQueryParams.filter(),
-                notificationQueryParams.leafNodesOnly(),
-                notificationQueryParams.skipNotificationData());
         final DOMDataBroker dataBroker = handlersHolder.getDataBroker();
         notificationListenerAdapter.setCloseVars(dataBroker, handlersHolder.getSchemaHandler());
         final MapEntryNode mapToStreams = RestconfMappingNodeUtil.mapYangNotificationStreamByIetfRestconfMonitoring(
@@ -183,13 +178,7 @@ abstract class SubscribeToStreamUtil {
         final ListenerAdapter listener = ListenersBroker.getInstance().getDataChangeListenerFor(streamName)
             .orElseThrow(() -> new RestconfDocumentedException("No listener found for stream " + streamName,
                 ErrorType.APPLICATION, ErrorTag.DATA_MISSING));
-
-        listener.setQueryParams(
-                notificationQueryParams.startTime(),
-                notificationQueryParams.stopTime(),
-                notificationQueryParams.filter(),
-                notificationQueryParams.leafNodesOnly(),
-                notificationQueryParams.skipNotificationData());
+        listener.setQueryParams(notificationQueryParams);
 
         final DOMDataBroker dataBroker = handlersHolder.getDataBroker();
         final SchemaContextHandler schemaHandler = handlersHolder.getSchemaHandler();