NETVIRT-1630 migrate to md-sal APIs

[netvirt.git] / ipv6service / impl / src / main / java / org / opendaylight / netvirt / ipv6service / NeutronRouterChangeListener.java

diff --git a/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/NeutronRouterChangeListener.java b/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/NeutronRouterChangeListener.java
index c01d91866755b5fa73692d740fbf50d64c61ee08..47c5b2f6b39169f6cc7840834ec54a762353db93 100644 (file)
--- a/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/NeutronRouterChangeListener.java
+++ b/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/NeutronRouterChangeListener.java
@@ -7,12 +7,13 @@
  */
 package org.opendaylight.netvirt.ipv6service;
 
-import javax.annotation.PostConstruct;
+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.infrautils.utils.concurrent.Executors;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
+import org.opendaylight.serviceutils.tools.listener.AbstractClusteredAsyncDataTreeChangeListener;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l3.rev150712.routers.attributes.Routers;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l3.rev150712.routers.attributes.routers.Router;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.rev150712.Neutron;
@@ -21,49 +22,45 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @Singleton
-public class NeutronRouterChangeListener extends AsyncClusteredDataTreeChangeListenerBase<Router,
-        NeutronRouterChangeListener> {
+public class NeutronRouterChangeListener extends AbstractClusteredAsyncDataTreeChangeListener<Router> {
     private static final Logger LOG = LoggerFactory.getLogger(NeutronRouterChangeListener.class);
     private final DataBroker dataBroker;
     private final IfMgr ifMgr;
 
     @Inject
     public NeutronRouterChangeListener(final DataBroker dataBroker, IfMgr ifMgr) {
+        super(dataBroker, LogicalDatastoreType.CONFIGURATION, InstanceIdentifier.create(Neutron.class)
+                .child(Routers.class).child(Router.class),
+                Executors.newListeningSingleThreadExecutor("NeutronRouterChangeListener", LOG));
         this.dataBroker = dataBroker;
         this.ifMgr = ifMgr;
     }
 
-    @PostConstruct
     public void init() {
         LOG.info("{} init", getClass().getSimpleName());
-        registerListener(LogicalDatastoreType.CONFIGURATION, dataBroker);
     }
 
     @Override
-    protected InstanceIdentifier<Router> getWildCardPath() {
-        return InstanceIdentifier.create(Neutron.class).child(Routers.class).child(Router.class);
+    @PreDestroy
+    public void close() {
+        super.close();
+        Executors.shutdownAndAwaitTermination(getExecutorService());
     }
 
     @Override
-    protected void add(InstanceIdentifier<Router> identifier, Router input) {
+    public void add(InstanceIdentifier<Router> identifier, Router input) {
         LOG.info("Add Router notification handler is invoked {}.", input.getUuid());
         ifMgr.addRouter(input.getUuid(), input.getName(), input.getTenantId());
     }
 
     @Override
-    protected void remove(InstanceIdentifier<Router> identifier, Router input) {
+    public void remove(InstanceIdentifier<Router> identifier, Router input) {
         LOG.info("Remove Router notification handler is invoked {}.", input.getUuid());
         ifMgr.removeRouter(input.getUuid());
     }
 
     @Override
-    protected void update(InstanceIdentifier<Router> identifier, Router original, Router update) {
+    public void update(InstanceIdentifier<Router> identifier, Router original, Router update) {
         LOG.debug("Update Router notification handler is invoked. Original: {}, Updated: {}.", original, update);
     }
-
-    @Override
-    protected NeutronRouterChangeListener getDataTreeChangeListener() {
-        return NeutronRouterChangeListener.this;
-    }
-
 }