Migrate the last listener of itm-impl module to use the new framework

- This must be the very last listener in the itm-impl module after [1].

[1] https://git.opendaylight.org/gerrit/#/c/70256/

Change-Id: I2ee2b95c31db0668992f42dd273f48b042ba779e
Signed-off-by: David Suarez <david.suarez.fuentes@gmail.com>

diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/listeners/cache/ExternalTunnelListener.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/listeners/cache/ExternalTunnelListener.java
index a06c9b4db939a7cec92c22809899fa2e913007a1..c2cfe1174043563a31d29ca0e9515566bda1e375 100644 (file)
--- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/listeners/cache/ExternalTunnelListener.java
+++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/listeners/cache/ExternalTunnelListener.java
@@ -8,14 +8,17 @@
 
 package org.opendaylight.genius.itm.listeners.cache;
 
-import javax.annotation.PostConstruct;
+import com.google.common.util.concurrent.MoreExecutors;
+import java.util.concurrent.TimeUnit;
+import javax.annotation.Nonnull;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.genius.datastoreutils.AsyncClusteredDataTreeChangeListenerBase;
 import org.opendaylight.genius.itm.impl.ItmUtils;
+import org.opendaylight.genius.tools.mdsal.listener.AbstractClusteredAsyncDataTreeChangeListener;
+import org.opendaylight.infrautils.utils.concurrent.Executors;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.op.rev160406.ExternalTunnelList;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.op.rev160406.external.tunnel.list.ExternalTunnel;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
@@ -23,53 +26,41 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @Singleton
-public class ExternalTunnelListener extends
-        AsyncClusteredDataTreeChangeListenerBase<ExternalTunnel,ExternalTunnelListener> {
+public class ExternalTunnelListener extends AbstractClusteredAsyncDataTreeChangeListener<ExternalTunnel> {
+
+    private static final long TIMEOUT_FOR_SHUTDOWN = 30;
+
     private static final Logger LOG = LoggerFactory.getLogger(ExternalTunnelListener.class);
-    private final DataBroker broker;
 
     @Inject
     public ExternalTunnelListener(final DataBroker dataBroker) {
-        super(ExternalTunnel.class, ExternalTunnelListener.class);
-        this.broker = dataBroker;
-        registerListener(LogicalDatastoreType.CONFIGURATION, this.broker);
-    }
-
-    @PostConstruct
-    public void start() {
-        LOG.info("Tunnel Interface State Listener Started");
+        super(dataBroker, LogicalDatastoreType.CONFIGURATION,
+              InstanceIdentifier.create(ExternalTunnelList.class).child(ExternalTunnel.class),
+              Executors.newSingleThreadExecutor("ExternalTunnelListener", LOG));
     }
 
     @Override
-    @PreDestroy
-    public void close() {
-        LOG.info("Tunnel Interface State Listener Closed");
+    public void remove(@Nonnull InstanceIdentifier<ExternalTunnel> instanceIdentifier,
+                       @Nonnull ExternalTunnel externalTunnel) {
+        ItmUtils.ITM_CACHE.removeExternalTunnelfromExternalTunnelKeyCache(externalTunnel.getKey());
     }
 
     @Override
-    protected void remove(InstanceIdentifier<ExternalTunnel> identifier, ExternalTunnel del) {
-        ItmUtils.ITM_CACHE.removeExternalTunnelfromExternalTunnelKeyCache(del.getKey());
+    public void update(@Nonnull InstanceIdentifier<ExternalTunnel> instanceIdentifier,
+                       @Nonnull ExternalTunnel originalExternalTunnel, @Nonnull ExternalTunnel updatedExternalTunnel) {
+        ItmUtils.ITM_CACHE.addExternalTunnelKeyToExternalTunnelCache(updatedExternalTunnel);
     }
 
     @Override
-    protected void update(InstanceIdentifier<ExternalTunnel> identifier, ExternalTunnel original,
-                          ExternalTunnel update) {
-        ItmUtils.ITM_CACHE.addExternalTunnelKeyToExternalTunnelCache(update);
+    public void add(@Nonnull InstanceIdentifier<ExternalTunnel> instanceIdentifier,
+                    @Nonnull ExternalTunnel externalTunnel) {
+        ItmUtils.ITM_CACHE.addExternalTunnelKeyToExternalTunnelCache(externalTunnel);
     }
 
     @Override
-    protected void add(InstanceIdentifier<ExternalTunnel> identifier, ExternalTunnel add) {
-        ItmUtils.ITM_CACHE.addExternalTunnelKeyToExternalTunnelCache(add);
-    }
-
-    @Override
-    protected ExternalTunnelListener getDataTreeChangeListener() {
-        return this;
-    }
-
-    @Override
-    protected InstanceIdentifier<ExternalTunnel> getWildCardPath() {
-        return InstanceIdentifier.create(ExternalTunnelList.class).child(ExternalTunnel.class);
+    @PreDestroy
+    public void close() {
+        super.close();
+        MoreExecutors.shutdownAndAwaitTermination(getExecutorService(), TIMEOUT_FOR_SHUTDOWN, TimeUnit.SECONDS);
     }
-
 }