Handle disposable table sources

Author: ymarcon

mica-core/src/main/java/org/obiba/mica/core/service/StudyTableSourceServiceRegistry.java

@@ -12,8 +12,10 @@
 
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.RemovalListener;
 import org.apache.commons.math3.util.Pair;
 import org.obiba.magma.NoSuchValueTableException;
+import org.obiba.magma.support.Disposables;
 import org.obiba.mica.core.source.ExcelTableSource;
 import org.obiba.mica.core.source.OpalTableSource;
 import org.obiba.mica.dataset.domain.StudyDataset;
@@ -29,6 +31,8 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import java.io.InputStream;
 import java.util.NoSuchElementException;
@@ -56,12 +60,28 @@ public class StudyTableSourceServiceRegistry {
   @Inject
   private FileStoreService fileStoreService;
 
-  private Cache<String, StudyTableSource> sourcesCache = CacheBuilder.newBuilder().maximumSize(1000).expireAfterWrite(1, TimeUnit.MINUTES).build();
+  private Cache<String, StudyTableSource> sourcesCache;
+
+  @PostConstruct
+  public void initialize() {
+    sourcesCache = CacheBuilder.newBuilder()
+      .maximumSize(1000)
+      .expireAfterWrite(1, TimeUnit.MINUTES)
+      .removalListener((RemovalListener<String, StudyTableSource>) notification -> {
+        Disposables.silentlyDispose(notification.getValue());
+      })
+      .build();
+  }
+
+  @PreDestroy
+  public void close() {
+    sourcesCache.cleanUp();
+  }
 
   public synchronized StudyTableSource makeStudyTableSource(IDataset dataset, IStudy study, String source) {
     StudyTableContext context = new StudyTableContext(dataset, study, micaConfigService.getConfig().getPrivacyThreshold());
 
-    String cacheKey = String.format("%s::%s", study.getId(), source);
+    String cacheKey = String.format("%s::%s::%s", dataset.getId(), study.getId(), source);
     try {
       return sourcesCache.get(cacheKey, () -> makeStudyTableSourceInternal(context, source));
     } catch (ExecutionException e) {

mica-core/src/main/java/org/obiba/mica/dataset/service/CollectedDatasetService.java

@@ -18,6 +18,7 @@
 import org.obiba.magma.NoSuchValueTableException;
 import org.obiba.magma.NoSuchVariableException;
 import org.obiba.magma.ValueTable;
+import org.obiba.magma.support.Disposables;
 import org.obiba.mica.NoSuchEntityException;
 import org.obiba.mica.core.domain.AbstractGitPersistable;
 import org.obiba.mica.core.domain.PublishCascadingScope;
@@ -431,14 +432,18 @@ public DatasetVariable getDatasetVariable(StudyDataset dataset, String variableN
   public Mica.DatasetVariableAggregationDto getVariableSummary(@NotNull StudyDataset dataset, String variableName) {
     log.info("Caching variable summary {} {}", dataset.getId(), variableName);
     StudyTableSource tableSource = getStudyTableSource(dataset, dataset.getSafeStudyTable());
-    return tableSource.providesVariableSummary() ? tableSource.getVariableSummary(variableName) : null;
+    Mica.DatasetVariableAggregationDto summary = tableSource.providesVariableSummary() ? tableSource.getVariableSummary(variableName) : null;
+    Disposables.silentlyDispose(tableSource);
+    return summary;
   }
 
   public Mica.DatasetVariableContingencyDto getContingencyTable(@NotNull StudyDataset dataset, DatasetVariable variable,
                                                                 DatasetVariable crossVariable) throws NoSuchValueTableException, NoSuchVariableException {
 
     StudyTableSource tableSource = getStudyTableSource(dataset, dataset.getSafeStudyTable());
-    return tableSource.providesContingency() ? tableSource.getContingency(variable, crossVariable) : null;
+    Mica.DatasetVariableContingencyDto results = tableSource.providesContingency() ? tableSource.getContingency(variable, crossVariable) : null;
+    Disposables.silentlyDispose(tableSource);
+    return results;
   }
 
   public void delete(String id) {

mica-core/src/main/java/org/obiba/mica/dataset/service/HarmonizedDatasetService.java

@@ -16,6 +16,7 @@
 import com.google.common.collect.Sets;
 import com.google.common.eventbus.EventBus;
 import org.obiba.magma.*;
+import org.obiba.magma.support.Disposables;
 import org.obiba.mica.NoSuchEntityException;
 import org.obiba.mica.core.domain.BaseStudyTable;
 import org.obiba.mica.core.domain.PublishCascadingScope;
@@ -383,7 +384,9 @@ public Mica.DatasetVariableAggregationDto getVariableSummary(@NotNull Harmonizat
       if(baseTable.isFor(studyId, source)) {
         log.info("Caching variable summary {} {} {} {}", dataset.getId(), variableName, studyId, source);
         StudyTableSource tableSource = getStudyTableSource(dataset, baseTable);
-        return tableSource.providesVariableSummary() ? tableSource.getVariableSummary(variableName) : null;
+        Mica.DatasetVariableAggregationDto summary = tableSource.providesVariableSummary() ? tableSource.getVariableSummary(variableName) : null;
+        Disposables.silentlyDispose(tableSource);
+        return summary;
       }
     }
 
@@ -393,7 +396,9 @@ public Mica.DatasetVariableAggregationDto getVariableSummary(@NotNull Harmonizat
   public Mica.DatasetVariableContingencyDto getContingencyTable(@NotNull HarmonizationDataset dataset, @NotNull BaseStudyTable studyTable, DatasetVariable variable,
                                                                 DatasetVariable crossVariable) throws NoSuchStudyException, NoSuchValueTableException {
     StudyTableSource tableSource = getStudyTableSource(dataset, studyTable);
-    return tableSource.providesContingency() ? tableSource.getContingency(variable, crossVariable) : null;
+    Mica.DatasetVariableContingencyDto results = tableSource.providesContingency() ? tableSource.getContingency(variable, crossVariable) : null;
+    Disposables.silentlyDispose(tableSource);
+    return results;
   }
 
   @Override