Bulk merge of l2gw changes

[netvirt.git] / elanmanager / impl / src / main / java / org / opendaylight / netvirt / elan / l2gw / listeners / HwvtepConfigNodeCache.java

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepConfigNodeCache.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepConfigNodeCache.java
index 839d53b627383b5b9022853e0584e1b8fb11edb5..4b9ec63f236dff7ec5409801812e1ce169a4cf99 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepConfigNodeCache.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepConfigNodeCache.java
@@ -12,61 +12,49 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
+import org.opendaylight.genius.mdsalutil.cache.InstanceIdDataObjectCache;
+import org.opendaylight.genius.utils.batching.ResourceBatchingManager;
 import org.opendaylight.genius.utils.hwvtep.HwvtepSouthboundConstants;
-import org.opendaylight.infrautils.utils.concurrent.Executors;
+import org.opendaylight.infrautils.caches.CacheProvider;
 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.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.TopologyKey;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 @Singleton
-public class HwvtepConfigNodeCache extends AbstractClusteredAsyncDataTreeChangeListener<Node> {
-    private static final Logger LOG = LoggerFactory.getLogger(HwvtepConfigNodeCache.class);
+public class HwvtepConfigNodeCache extends InstanceIdDataObjectCache<Node> {
 
     private final DataBroker dataBroker;
     private final Map<InstanceIdentifier<Node>, Node> cache = new ConcurrentHashMap<>();
     private final Map<InstanceIdentifier<Node>, List<Runnable>> waitList = new ConcurrentHashMap<>();
 
     @Inject
-    public HwvtepConfigNodeCache(final DataBroker dataBroker) {
-        super(dataBroker, LogicalDatastoreType.CONFIGURATION, InstanceIdentifier.create(NetworkTopology.class)
+    public HwvtepConfigNodeCache(final DataBroker dataBroker, CacheProvider cacheProvider) {
+        super(Node.class, dataBroker, LogicalDatastoreType.CONFIGURATION,
+            InstanceIdentifier.create(NetworkTopology.class)
                 .child(Topology.class, new TopologyKey(HwvtepSouthboundConstants.HWVTEP_TOPOLOGY_ID))
-                .child(Node.class), Executors.newListeningSingleThreadExecutor("HwvtepConfigNodeCache", LOG));
+                .child(Node.class), cacheProvider);
         this.dataBroker = dataBroker;
-    }
-
-    public void init() {
-        LOG.info("{} init", getClass().getSimpleName());
+        ResourceBatchingManager.getInstance().registerDefaultBatchHandlers(this.dataBroker);
     }
 
     @Override
-    @PreDestroy
-    public void close() {
-        super.close();
-        Executors.shutdownAndAwaitTermination(getExecutorService());
-    }
-
-    @Override
-    public void remove(InstanceIdentifier<Node> key, Node deleted) {
+    protected void removed(InstanceIdentifier<Node> key, Node deleted) {
         cache.remove(key);
     }
 
-    @Override
-    public void update(InstanceIdentifier<Node> key, Node old, Node added) {
+    /*@Override
+    protected void update(InstanceIdentifier<Node> key, Node old, Node added) {
         cache.put(key, added);
-    }
+    }*/
 
     @Override
-    public synchronized void add(InstanceIdentifier<Node> key, Node added) {
+    protected synchronized void added(InstanceIdentifier<Node> key, Node added) {
         cache.put(key, added);
         if (waitList.containsKey(key)) {
             waitList.remove(key).stream().forEach(runnable -> runnable.run());