NETVIRT-1630 migrate to md-sal APIs

[netvirt.git] / elanmanager / impl / src / main / java / org / opendaylight / netvirt / elan / cache / ElanInstanceCache.java

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cache/ElanInstanceCache.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cache/ElanInstanceCache.java
index f55230ed1f731b35341546e6fb0d810c8f2decae..7c691273c6a002b81d679832f4dbca03f247c063 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cache/ElanInstanceCache.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cache/ElanInstanceCache.java
@@ -7,18 +7,20 @@
  */
 package org.opendaylight.netvirt.elan.cache;
 
-import com.google.common.base.Optional;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.TimeUnit;
 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.controller.md.sal.common.api.data.ReadFailedException;
-import org.opendaylight.genius.mdsalutil.cache.DataObjectCache;
+import org.opendaylight.genius.mdsalutil.cache.InstanceIdDataObjectCache;
 import org.opendaylight.infrautils.caches.CacheProvider;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
+import org.opendaylight.mdsal.common.api.ReadFailedException;
+import org.opendaylight.netvirt.elan.utils.Scheduler;
 import org.opendaylight.netvirt.elanmanager.api.ElanHelper;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.ElanInstances;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.instances.ElanInstance;
@@ -32,15 +34,28 @@ import org.slf4j.LoggerFactory;
  * @author Thomas Pantelis
  */
 @Singleton
-public class ElanInstanceCache extends DataObjectCache<ElanInstance> {
+public class ElanInstanceCache extends InstanceIdDataObjectCache<ElanInstance> {
     private static final Logger LOG = LoggerFactory.getLogger(ElanInstanceCache.class);
 
+    //TODO: Make it configurable
+    private static final int ELAN_CLEANUP_DELAY_IN_MINS = 30;
+
     private final Map<InstanceIdentifier<ElanInstance>, Collection<Runnable>> waitingJobs = new HashMap<>();
 
+    private final Scheduler scheduler;
+
     @Inject
-    public ElanInstanceCache(DataBroker dataBroker, CacheProvider cacheProvider) {
+    public ElanInstanceCache(DataBroker dataBroker, CacheProvider cacheProvider, Scheduler scheduler) {
         super(ElanInstance.class, dataBroker, LogicalDatastoreType.CONFIGURATION,
                 InstanceIdentifier.create(ElanInstances.class).child(ElanInstance.class), cacheProvider);
+        this.scheduler = scheduler;
+    }
+
+    @Override
+    protected void removed(InstanceIdentifier<ElanInstance> path, ElanInstance dataObject) {
+        scheduler.getScheduledExecutorService().schedule(() -> {
+            super.removed(path, dataObject);
+        }, ELAN_CLEANUP_DELAY_IN_MINS, TimeUnit.MINUTES);
     }
 
     public Optional<ElanInstance> get(String elanInstanceName) {
@@ -48,7 +63,7 @@ public class ElanInstanceCache extends DataObjectCache<ElanInstance> {
             return get(ElanHelper.getElanInstanceConfigurationDataPath(elanInstanceName));
         } catch (ReadFailedException e) {
             LOG.warn("Error reading ElanInstance {}", elanInstanceName, e);
-            return Optional.absent();
+            return Optional.empty();
         }
     }