From ca32991c18349ad11c73fd74a7b69a3059a84d1b Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Fri, 29 Apr 2022 17:00:12 +0200 Subject: [PATCH] Log --- .../implementations/AbstractLifeCycleManager.java | 1 + .../plugins/implementations/SimpleLifeCycleManager.java | 5 ++++- .../model/useCaseDescriptor/UseCaseDescriptor.java | 9 +++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/AbstractLifeCycleManager.java b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/AbstractLifeCycleManager.java index e021989..0b381bd 100644 --- a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/AbstractLifeCycleManager.java +++ b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/AbstractLifeCycleManager.java @@ -189,6 +189,7 @@ public abstract class AbstractLifeCycleManager extends AbstractPlugin implements @Override public EventExecutionReport onEvent(EventExecutionRequest request) throws EventException, InvalidPluginRequestException { + log.info("Executing Event {}",request); EventExecutionReport report=new EventExecutionReport(request); report.getToSetLifecycleInformation().addEventReport(new TriggeredEvents()); TriggeredEvents info = report.getToSetLifecycleInformation().getLastEvent(); diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/SimpleLifeCycleManager.java b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/SimpleLifeCycleManager.java index b772746..632cace 100644 --- a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/SimpleLifeCycleManager.java +++ b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/SimpleLifeCycleManager.java @@ -176,6 +176,7 @@ public class SimpleLifeCycleManager extends AbstractLifeCycleManager implements ArrayList toReturn=new ArrayList<>(); UseCaseDescriptor desc = request.getUseCaseDescriptor(); List indexers = desc.getHandlersMapByType().get(IndexerPluginDescriptor.INDEXER); + log.debug("Found UCD [{}] Indexers : {}",desc.getId(),indexers.size()); for (HandlerDeclaration handlerDeclaration : indexers) toReturn.add((IndexerPluginInterface) pluginManager.getById(handlerDeclaration.getId())); return toReturn; @@ -185,8 +186,10 @@ public class SimpleLifeCycleManager extends AbstractLifeCycleManager implements ArrayList toReturn=new ArrayList<>(); UseCaseDescriptor desc = request.getUseCaseDescriptor(); List materializers = desc.getHandlersMapByType().get(MaterializerPluginDescriptor.MATERIALIZER); - for (HandlerDeclaration handlerDeclaration : materializers) + log.debug("Found UCD [{}] Materializers : {}",desc.getId(),materializers.size()); + for (HandlerDeclaration handlerDeclaration : materializers) { toReturn.add((MaterializationPlugin) pluginManager.getById(handlerDeclaration.getId())); + } return toReturn; } diff --git a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/useCaseDescriptor/UseCaseDescriptor.java b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/useCaseDescriptor/UseCaseDescriptor.java index 4957441..5e5a4bf 100644 --- a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/useCaseDescriptor/UseCaseDescriptor.java +++ b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/useCaseDescriptor/UseCaseDescriptor.java @@ -70,10 +70,11 @@ public class UseCaseDescriptor { HashMap> toReturn=new HashMap<>(); handlers.forEach(h->{ try { - if(!toReturn.containsKey(h.getType())) - toReturn.put(h.getType(),new ArrayList<>()); - toReturn.get(h.getType()).add(h); - }catch (Throwable t){log.error("Invalid useCaseDescriptor : unable to get Handler Map by Type with {} in useCaseDescriptor [ID {}]",h,this.getId(),t);} + if(!toReturn.containsKey(h.getType())) + toReturn.put(h.getType(),new ArrayList<>()); + toReturn.get(h.getType()).add(h); + }catch (Throwable t){ + log.error("Invalid useCaseDescriptor : unable to get Handler Map by Type with {} in useCaseDescriptor [ID {}]",h,this.getId(),t);} }); return toReturn; }