Clean up DeviceNotificationListenerAdaptor

Reorg fields for clarity.

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

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/DeviceNotificationListenerAdaptor.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/DeviceNotificationListenerAdaptor.java
index 3922c0ba4fc65282ed376f5313ae9f4989caeaa9..697265c95ae4a721024e9755f0c802abc503fdd3 100644 (file)
--- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/DeviceNotificationListenerAdaptor.java
+++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/DeviceNotificationListenerAdaptor.java
@@ -27,17 +27,15 @@ import org.slf4j.LoggerFactory;
 /**
  * {@link DeviceNotificationListenerAdaptor} is responsible to track events on notifications.
  */
-public final class DeviceNotificationListenerAdaptor extends AbstractNotificationListenerAdaptor implements
-    DOMMountPointListener {
-
+public final class DeviceNotificationListenerAdaptor extends AbstractNotificationListenerAdaptor
+        implements DOMMountPointListener {
     private static final Logger LOG = LoggerFactory.getLogger(DeviceNotificationListenerAdaptor.class);
-    private final @NonNull EffectiveModelContext effectiveModel;
 
-    private  final @NonNull DOMMountPointService mountPointService;
+    private final @NonNull EffectiveModelContext effectiveModel;
+    private final @NonNull DOMMountPointService mountPointService;
+    private final @NonNull YangInstanceIdentifier instanceIdentifier;
 
     private ListenerRegistration<DOMMountPointListener> reg;
-    private final YangInstanceIdentifier instanceIdentifier;
-
 
     public DeviceNotificationListenerAdaptor(final String streamName, final NotificationOutputType outputType,
             final EffectiveModelContext effectiveModel, final DOMMountPointService mountPointService,
@@ -92,5 +90,4 @@ public final class DeviceNotificationListenerAdaptor extends AbstractNotificatio
             resetListenerRegistration();
         }
     }
-
 }