Netconf Device Notification

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

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/AbstractCommonSubscriber.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/AbstractCommonSubscriber.java
index 82e7a6219dd32bf4196d0f8c5d91787a0110ae51..158511c3d18dd84d159e41888cebbd23636aef2f 100644 (file)
--- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/AbstractCommonSubscriber.java
+++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/AbstractCommonSubscriber.java
@@ -12,6 +12,7 @@ import static com.google.common.base.Preconditions.checkState;
 import static java.util.Objects.requireNonNull;
 
 import com.google.common.base.MoreObjects;
+import com.google.common.base.MoreObjects.ToStringHelper;
 import java.time.Instant;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatterBuilder;
@@ -39,7 +40,7 @@ import org.slf4j.LoggerFactory;
 /**
  * Features of subscribing part of both notifications.
  */
-abstract class AbstractCommonSubscriber<P, T> extends AbstractNotificationsData implements BaseListenerInterface {
+abstract class AbstractCommonSubscriber<T> extends AbstractNotificationsData implements BaseListenerInterface {
     private static final Logger LOG = LoggerFactory.getLogger(AbstractCommonSubscriber.class);
     private static final DateTimeFormatter FORMATTER = new DateTimeFormatterBuilder()
         .appendValue(ChronoField.YEAR, 4).appendLiteral('-')
@@ -54,7 +55,6 @@ abstract class AbstractCommonSubscriber<P, T> extends AbstractNotificationsData
     private final EventFormatterFactory<T> formatterFactory;
     private final NotificationOutputType outputType;
     private final String streamName;
-    private final P path;
 
     @GuardedBy("this")
     private final Set<StreamSessionHandler> subscribers = new HashSet<>();
@@ -69,12 +69,11 @@ abstract class AbstractCommonSubscriber<P, T> extends AbstractNotificationsData
     private boolean changedLeafNodesOnly = false;
     private EventFormatter<T> formatter;
 
-    AbstractCommonSubscriber(final QName lastQName, final String streamName, final P path,
-            final NotificationOutputType outputType, final EventFormatterFactory<T> formatterFactory) {
+    AbstractCommonSubscriber(final QName lastQName, final String streamName, final NotificationOutputType outputType,
+            final EventFormatterFactory<T> formatterFactory) {
         super(lastQName);
         this.streamName = requireNonNull(streamName);
         checkArgument(!streamName.isEmpty());
-        this.path = requireNonNull(path);
 
         this.outputType = requireNonNull(outputType);
         this.formatterFactory = requireNonNull(formatterFactory);
@@ -168,10 +167,6 @@ abstract class AbstractCommonSubscriber<P, T> extends AbstractNotificationsData
         }
     }
 
-    final P path() {
-        return path;
-    }
-
     /**
      * Check whether this query should only notify about leaf node changes.
      *
@@ -271,11 +266,11 @@ abstract class AbstractCommonSubscriber<P, T> extends AbstractNotificationsData
 
     @Override
     public final String toString() {
-        return MoreObjects.toStringHelper(this)
-            .add("path", path)
-            .add("stream-name", streamName)
-            .add("output-type", getOutputType())
-            .toString();
+        return addToStringAttributes(MoreObjects.toStringHelper(this)).toString();
+    }
+
+    ToStringHelper addToStringAttributes(final ToStringHelper helper) {
+        return helper.add("stream-name", streamName).add("output-type", getOutputType());
     }
 
     /**