gCubeSystem
/
gcube-cms-suite
14
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

UCD loading fixed MongoId in live Map

This commit is contained in:
Fabio Sinibaldi 2022-05-12 10:56:53 +02:00
parent 8eb1cd3f9d
commit 3d3f618f50
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/providers/ucd/SingleISResourceUCDProvider.java
View File

@ -54,7 +54,7 @@ public class SingleISResourceUCDProvider extends AbstractScopedMap<ProfileMap> i
public SingleISResourceUCDProvider() { public SingleISResourceUCDProvider() {
super("Single IS Resource UCD Provider"); super("Single IS Resource UCD Provider");
setTTL(Duration.of(2, ChronoUnit.MINUTES)); setTTL(Duration.of(1, ChronoUnit.MICROS)); // no cache
} }
@Override @Override

11
geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/providers/ucd/UCDManager.java
View File

@ -5,6 +5,7 @@ import org.gcube.application.cms.caches.AbstractScopedMap;
import org.gcube.application.cms.caches.Engine; import org.gcube.application.cms.caches.Engine;
import org.gcube.application.cms.caches.ObjectManager; import org.gcube.application.cms.caches.ObjectManager;
import org.gcube.application.cms.implementations.ImplementationProvider; import org.gcube.application.cms.implementations.ImplementationProvider;
import org.gcube.application.cms.serialization.Serialization;
import org.gcube.application.geoportal.common.model.rest.ConfigurationException; import org.gcube.application.geoportal.common.model.rest.ConfigurationException;
import org.gcube.application.geoportal.common.model.rest.QueryRequest; import org.gcube.application.geoportal.common.model.rest.QueryRequest;
import org.gcube.application.geoportal.common.model.useCaseDescriptor.UseCaseDescriptor; import org.gcube.application.geoportal.common.model.useCaseDescriptor.UseCaseDescriptor;
@ -48,7 +49,7 @@ public class UCDManager extends AbstractScopedMap<UCDManagerI> implements UCDMan
public UCDManager() { public UCDManager() {
super("UCD MANAGER"); super("UCD MANAGER");
setTTL(Duration.of(1, ChronoUnit.MINUTES)); setTTL(Duration.of(2, ChronoUnit.MINUTES));
} }
@ -186,11 +187,13 @@ public class UCDManager extends AbstractScopedMap<UCDManagerI> implements UCDMan
final UCDMongoManager manager = getMongoManager(); final UCDMongoManager manager = getMongoManager();
manager.deleteAll(); manager.deleteAll();
memCache.clear(); memCache.clear();
Engine<ProfileMap> liveMapProvider =ImplementationProvider.get().getEngineByManagedClass(ProfileMap.class);
ProfileMap liveMap=ImplementationProvider.get().getProvidedObjectByClass(ProfileMap.class); log.trace("LiveMap Provider class is {} ",liveMapProvider.getClass());
ProfileMap liveMap= liveMapProvider.getObject();
log.debug("LiveMap size is {} ",liveMap.size()); log.debug("LiveMap size is {} ",liveMap.size());
for (Map.Entry<String, UseCaseDescriptor> entry : liveMap.entrySet()) { for (Map.Entry<String, UseCaseDescriptor> entry : liveMap.entrySet()) {
UseCaseDescriptor useCaseDescriptor = entry.getValue(); // Copying object so we don't alter live Map
UseCaseDescriptor useCaseDescriptor = Serialization.convert(entry.getValue(),UseCaseDescriptor.class);
try { try {
log.debug("Updateing cache with {}, mongo id is {}", useCaseDescriptor.getId(),useCaseDescriptor.getMongoId()); log.debug("Updateing cache with {}, mongo id is {}", useCaseDescriptor.getId(),useCaseDescriptor.getMongoId());
if(useCaseDescriptor.getMongoId()!=null){ if(useCaseDescriptor.getMongoId()!=null){

8
geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/providers/ucd/UCDLoadingTest.java
View File

@ -40,6 +40,14 @@ public class UCDLoadingTest {
TokenSetter.set(GCubeTest.getContext()); TokenSetter.set(GCubeTest.getContext());
SingleISResourceUCDProvider provider = new SingleISResourceUCDProvider(); SingleISResourceUCDProvider provider = new SingleISResourceUCDProvider();
ProfileMap map = provider.getObject(); ProfileMap map = provider.getObject();
map.forEach((s, useCaseDescriptor) -> {
System.out.println("Checking "+s);
assertNotNull(useCaseDescriptor);
assertNotNull(useCaseDescriptor.getId());
assertNull(useCaseDescriptor.getMongoId());
assertNotNull(useCaseDescriptor.getDataAccessPolicies());
assertNotNull(useCaseDescriptor.getHandlers());
});
System.out.println("UCIDs IN "+GCubeTest.getContext()+": "+map.keySet()); System.out.println("UCIDs IN "+GCubeTest.getContext()+": "+map.keySet());
} }