Clean up mdsal-netconf-notification

Remove impl.ops package and modernize classes a bit.

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

diff --git a/netconf/mdsal-netconf-notification/src/main/java/org/opendaylight/netconf/mdsal/notification/impl/ops/CreateSubscription.java b/netconf/mdsal-netconf-notification/src/main/java/org/opendaylight/netconf/mdsal/notification/impl/CreateSubscription.java
similarity index 97%
rename from netconf/mdsal-netconf-notification/src/main/java/org/opendaylight/netconf/mdsal/notification/impl/ops/CreateSubscription.java
rename to netconf/mdsal-netconf-notification/src/main/java/org/opendaylight/netconf/mdsal/notification/impl/CreateSubscription.java
index 685ba761881c2cf9521dd096a0d25e1b0918dac0..729ef97b6e27d2bb9f2975bc339083d632db1ee6 100644 (file)
--- a/netconf/mdsal-netconf-notification/src/main/java/org/opendaylight/netconf/mdsal/notification/impl/ops/CreateSubscription.java
+++ b/netconf/mdsal-netconf-notification/src/main/java/org/opendaylight/netconf/mdsal/notification/impl/CreateSubscription.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.netconf.mdsal.notification.impl.ops;
+package org.opendaylight.netconf.mdsal.notification.impl;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static java.util.Objects.requireNonNull;
@@ -19,7 +19,6 @@ import org.opendaylight.netconf.api.NetconfSession;
 import org.opendaylight.netconf.api.xml.XmlElement;
 import org.opendaylight.netconf.api.xml.XmlNetconfConstants;
 import org.opendaylight.netconf.mapping.api.SessionAwareNetconfOperation;
-import org.opendaylight.netconf.mdsal.notification.impl.NetconfNotificationManager;
 import org.opendaylight.netconf.notifications.NetconfNotification;
 import org.opendaylight.netconf.notifications.NetconfNotificationListener;
 import org.opendaylight.netconf.notifications.NetconfNotificationRegistry;

diff --git a/netconf/mdsal-netconf-notification/src/main/java/org/opendaylight/netconf/mdsal/notification/impl/NetconfNotificationManager.java b/netconf/mdsal-netconf-notification/src/main/java/org/opendaylight/netconf/mdsal/notification/impl/NetconfNotificationManager.java
index 0a1bac8a2ada4ff47e883c313137845121189e6e..0960aaa37212e3bffdbbe7ae0a356349b2bf0e9c 100644 (file)
--- a/netconf/mdsal-netconf-notification/src/main/java/org/opendaylight/netconf/mdsal/notification/impl/NetconfNotificationManager.java
+++ b/netconf/mdsal-netconf-notification/src/main/java/org/opendaylight/netconf/mdsal/notification/impl/NetconfNotificationManager.java
@@ -27,7 +27,6 @@ import javax.inject.Singleton;
 import org.checkerframework.checker.lock.qual.GuardedBy;
 import org.opendaylight.mdsal.binding.dom.codec.spi.BindingDOMCodecFactory;
 import org.opendaylight.mdsal.binding.runtime.api.BindingRuntimeGenerator;
-import org.opendaylight.netconf.mdsal.notification.impl.ops.NotificationsTransformUtil;
 import org.opendaylight.netconf.notifications.BaseNotificationPublisherRegistration;
 import org.opendaylight.netconf.notifications.NetconfNotification;
 import org.opendaylight.netconf.notifications.NetconfNotificationCollector;

diff --git a/netconf/mdsal-netconf-notification/src/main/java/org/opendaylight/netconf/mdsal/notification/impl/NetconfNotificationOperationService.java b/netconf/mdsal-netconf-notification/src/main/java/org/opendaylight/netconf/mdsal/notification/impl/NetconfNotificationOperationService.java
index 3bfa7baaf7312db261e72250b118ca6430a40a17..b36cc8029bfecf5cadaa06a7ad6ffd67c6cdef3c 100644 (file)
--- a/netconf/mdsal-netconf-notification/src/main/java/org/opendaylight/netconf/mdsal/notification/impl/NetconfNotificationOperationService.java
+++ b/netconf/mdsal-netconf-notification/src/main/java/org/opendaylight/netconf/mdsal/notification/impl/NetconfNotificationOperationService.java
@@ -5,42 +5,29 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.netconf.mdsal.notification.impl;
 
-import java.util.Collections;
 import java.util.Set;
 import org.opendaylight.netconf.mapping.api.NetconfOperation;
 import org.opendaylight.netconf.mapping.api.NetconfOperationService;
-import org.opendaylight.netconf.mdsal.notification.impl.ops.CreateSubscription;
 import org.opendaylight.netconf.notifications.NetconfNotificationRegistry;
 
-public class NetconfNotificationOperationService implements NetconfOperationService {
-    private final Set<NetconfOperation> netconfOperations;
+public final class NetconfNotificationOperationService implements NetconfOperationService {
+    private final CreateSubscription createSubscription;
 
-    public NetconfNotificationOperationService(String netconfSessionIdForReporting, NetconfNotificationRegistry
-            netconfNotificationRegistry) {
-        this.netconfOperations = Collections.singleton(new CreateSubscription(netconfSessionIdForReporting,
-                netconfNotificationRegistry));
+    public NetconfNotificationOperationService(final String netconfSessionIdForReporting,
+            final NetconfNotificationRegistry netconfNotificationRegistry) {
+        createSubscription = new CreateSubscription(netconfSessionIdForReporting, netconfNotificationRegistry);
     }
 
-
     @Override
     public Set<NetconfOperation> getNetconfOperations() {
-        return netconfOperations;
+        return Set.of(createSubscription);
     }
 
     @SuppressWarnings("checkstyle:IllegalCatch")
     @Override
     public void close() {
-        for (NetconfOperation netconfOperation : netconfOperations) {
-            if (netconfOperation instanceof AutoCloseable) {
-                try {
-                    ((AutoCloseable) netconfOperation).close();
-                } catch (Exception e) {
-                    throw new IllegalStateException("Exception while closing " + netconfOperation, e);
-                }
-            }
-        }
+        createSubscription.close();
     }
 }

diff --git a/netconf/mdsal-netconf-notification/src/main/java/org/opendaylight/netconf/mdsal/notification/impl/ops/NotificationsTransformUtil.java b/netconf/mdsal-netconf-notification/src/main/java/org/opendaylight/netconf/mdsal/notification/impl/NotificationsTransformUtil.java
similarity index 98%
rename from netconf/mdsal-netconf-notification/src/main/java/org/opendaylight/netconf/mdsal/notification/impl/ops/NotificationsTransformUtil.java
rename to netconf/mdsal-netconf-notification/src/main/java/org/opendaylight/netconf/mdsal/notification/impl/NotificationsTransformUtil.java
index 28f04fdee7c1cc20d75f5a4cf7716c622b31914f..69f493fc123f407cf0de4043e2b6c05e36132411 100644 (file)
--- a/netconf/mdsal-netconf-notification/src/main/java/org/opendaylight/netconf/mdsal/notification/impl/ops/NotificationsTransformUtil.java
+++ b/netconf/mdsal-netconf-notification/src/main/java/org/opendaylight/netconf/mdsal/notification/impl/NotificationsTransformUtil.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.netconf.mdsal.notification.impl.ops;
+package org.opendaylight.netconf.mdsal.notification.impl;
 
 import static com.google.common.base.Verify.verify;
 

diff --git a/netconf/mdsal-netconf-notification/src/main/java/org/opendaylight/netconf/mdsal/notification/impl/OperationalDatastoreListener.java b/netconf/mdsal-netconf-notification/src/main/java/org/opendaylight/netconf/mdsal/notification/impl/OperationalDatastoreListener.java
index 5154b838746d7b33295ad7a125c66b45330aadc9..406e564025899aa3e89d5ca5270ae398c9eae647 100644 (file)
--- a/netconf/mdsal-netconf-notification/src/main/java/org/opendaylight/netconf/mdsal/notification/impl/OperationalDatastoreListener.java
+++ b/netconf/mdsal-netconf-notification/src/main/java/org/opendaylight/netconf/mdsal/notification/impl/OperationalDatastoreListener.java
@@ -7,6 +7,8 @@
  */
 package org.opendaylight.netconf.mdsal.notification.impl;
 
+import static java.util.Objects.requireNonNull;
+
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.DataTreeChangeListener;
 import org.opendaylight.mdsal.binding.api.DataTreeIdentifier;
@@ -21,7 +23,6 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
  * @param <T> data object class
  */
 abstract class OperationalDatastoreListener<T extends DataObject> implements DataTreeChangeListener<T> {
-
     private final InstanceIdentifier<T> instanceIdentifier;
 
     /**
@@ -30,7 +31,7 @@ abstract class OperationalDatastoreListener<T extends DataObject> implements Dat
      * @param instanceIdentifier instance identifier of subtree, on which this instance should listen on changes.
      */
     OperationalDatastoreListener(final InstanceIdentifier<T> instanceIdentifier) {
-        this.instanceIdentifier = instanceIdentifier;
+        this.instanceIdentifier = requireNonNull(instanceIdentifier);
     }
 
     /**

diff --git a/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/netconf/mdsal/notification/impl/ops/CreateSubscriptionTest.java b/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/netconf/mdsal/notification/impl/CreateSubscriptionTest.java
similarity index 97%
rename from netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/netconf/mdsal/notification/impl/ops/CreateSubscriptionTest.java
rename to netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/netconf/mdsal/notification/impl/CreateSubscriptionTest.java
index 329c274fa7167192bc7f20b6f8bff0da37663d51..3d79f8644619db0cde18435538be49fe2697ce3c 100644 (file)
--- a/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/netconf/mdsal/notification/impl/ops/CreateSubscriptionTest.java
+++ b/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/netconf/mdsal/notification/impl/CreateSubscriptionTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.netconf.mdsal.notification.impl.ops;
+package org.opendaylight.netconf.mdsal.notification.impl;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.MatcherAssert.assertThat;

diff --git a/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/netconf/mdsal/notification/impl/ops/NotificationsTransformUtilTest.java b/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/netconf/mdsal/notification/impl/NotificationsTransformUtilTest.java
similarity index 98%
rename from netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/netconf/mdsal/notification/impl/ops/NotificationsTransformUtilTest.java
rename to netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/netconf/mdsal/notification/impl/NotificationsTransformUtilTest.java
index 1b00fbd3da61e73fe3a4f2c46f17020564d30094..2357e1913d43e3c81efe2eb36158d3305db11b05 100644 (file)
--- a/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/netconf/mdsal/notification/impl/ops/NotificationsTransformUtilTest.java
+++ b/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/netconf/mdsal/notification/impl/NotificationsTransformUtilTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.netconf.mdsal.notification.impl.ops;
+package org.opendaylight.netconf.mdsal.notification.impl;
 
 import static org.junit.Assert.assertTrue;
 

diff --git a/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/netconf/mdsal/notification/impl/OperationalDatastoreListenerTest.java b/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/netconf/mdsal/notification/impl/OperationalDatastoreListenerTest.java
index c8b9faceae5c1e633d2377e668992ee19ae891ca..254489d4bb7932892b00a22c2ced18aad6721b1c 100644 (file)
--- a/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/netconf/mdsal/notification/impl/OperationalDatastoreListenerTest.java
+++ b/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/netconf/mdsal/notification/impl/OperationalDatastoreListenerTest.java
@@ -16,6 +16,7 @@ import java.util.Collection;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.mdsal.binding.api.DataBroker;
@@ -30,12 +31,12 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 public class OperationalDatastoreListenerTest {
     @Mock
     private DataBroker dataBroker;
+    @Captor
+    private ArgumentCaptor<DataTreeIdentifier<?>> argumentId;
 
     @Test
     public void testDataStoreListener() {
         final InstanceIdentifier<TestInterface> instanceIdentifier = InstanceIdentifier.create(TestInterface.class);
-        final DataTreeIdentifier<TestInterface> testId =
-                DataTreeIdentifier.create(LogicalDatastoreType.OPERATIONAL, instanceIdentifier);
 
         final var op = new OperationalDatastoreListener<>(instanceIdentifier) {
             @Override
@@ -45,12 +46,11 @@ public class OperationalDatastoreListenerTest {
         };
         doReturn(null).when(dataBroker).registerDataTreeChangeListener(any(), any());
 
-        ArgumentCaptor<DataTreeIdentifier> argumentId = ArgumentCaptor.forClass(DataTreeIdentifier.class);
         op.registerOnChanges(dataBroker);
         verify(dataBroker).registerDataTreeChangeListener(argumentId.capture(), any());
 
-        assertEquals(testId, argumentId.getValue());
-
+        assertEquals(DataTreeIdentifier.create(LogicalDatastoreType.OPERATIONAL, instanceIdentifier),
+            argumentId.getValue());
     }
 
     interface TestInterface extends ChildOf<DataRoot> {