Use FilterParameter for communicating its value

[netconf.git] / restconf / restconf-nb-rfc8040 / src / main / java / org / opendaylight / restconf / nb / rfc8040 / streams / listeners / NotificationListenerAdapter.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/NotificationListenerAdapter.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/NotificationListenerAdapter.java
index ce76d77ed5d86f4146f3c9efc38fc0f54204c790..3fc2c7af4708fb6c7174a657e82d58629dad91f9 100644 (file)
--- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/NotificationListenerAdapter.java
+++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/NotificationListenerAdapter.java
@@ -15,6 +15,7 @@ import com.google.common.base.MoreObjects;
 import java.time.Instant;
 import java.util.Optional;
 import javax.xml.xpath.XPathExpressionException;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.mdsal.dom.api.DOMNotification;
 import org.opendaylight.mdsal.dom.api.DOMNotificationListener;
 import org.opendaylight.mdsal.dom.api.DOMNotificationService;
@@ -74,20 +75,10 @@ public class NotificationListenerAdapter extends AbstractCommonSubscriber implem
         }
     }
 
-    private NotificationFormatter getFormatter(final String filter) throws XPathExpressionException {
-        NotificationFormatterFactory factory = getFormatterFactory();
-        return filter == null || filter.isEmpty() ? factory.getFormatter() : factory.getFormatter(filter);
-    }
-
     @Override
-    public void setQueryParams(final Instant startTime, final Instant stopTime, final String filter,
-                               final boolean leafNodesOnly, final boolean skipNotificationData) {
-        setQueryParams(startTime, stopTime, leafNodesOnly, skipNotificationData);
-        try {
-            formatter = getFormatter(filter);
-        } catch (XPathExpressionException e) {
-            throw new IllegalArgumentException("Failed to get filter", e);
-        }
+    final void setFilter(final @Nullable String filter) throws XPathExpressionException {
+        final NotificationFormatterFactory factory = getFormatterFactory();
+        formatter = filter == null || filter.isEmpty() ? factory.getFormatter() : factory.getFormatter(filter);
     }
 
     /**