From 02ce058348514525e04315ae5051d3b17be45e9a Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Fri, 18 Feb 2022 18:10:53 +0100 Subject: [PATCH] Moved ImplementationProvider to framework --- .../cms/implementations/ISInterface.java | 6 +++ .../ImplementationProvider.java | 45 +------------------ .../plugins/reports/StepExecutionReport.java | 15 +++++++ 3 files changed, 22 insertions(+), 44 deletions(-) diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/implementations/ISInterface.java b/cms-plugin-framework/src/main/java/org/gcube/application/cms/implementations/ISInterface.java index 9939651..53845af 100644 --- a/cms-plugin-framework/src/main/java/org/gcube/application/cms/implementations/ISInterface.java +++ b/cms-plugin-framework/src/main/java/org/gcube/application/cms/implementations/ISInterface.java @@ -1,4 +1,10 @@ package org.gcube.application.cms.implementations; +import org.gcube.application.geoportal.common.model.rest.ConfigurationException; +import org.gcube.application.geoportal.common.model.rest.DatabaseConnection; + public interface ISInterface { + + public DatabaseConnection queryForDatabase(String platform, String flag) throws ConfigurationException; + } diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/implementations/ImplementationProvider.java b/cms-plugin-framework/src/main/java/org/gcube/application/cms/implementations/ImplementationProvider.java index 17408ef..88cc28a 100644 --- a/cms-plugin-framework/src/main/java/org/gcube/application/cms/implementations/ImplementationProvider.java +++ b/cms-plugin-framework/src/main/java/org/gcube/application/cms/implementations/ImplementationProvider.java @@ -4,7 +4,6 @@ package org.gcube.application.cms.implementations; import lombok.Synchronized; import org.gcube.application.cms.caches.Engine; import org.gcube.application.geoportal.common.model.rest.ConfigurationException; -import org.gcube.application.geoportal.service.engine.providers.*; import java.util.concurrent.ConcurrentHashMap; @@ -30,47 +29,5 @@ public class ImplementationProvider { public void setEngine(Engine engine, Class clazz){ implementationsRegistry.put(clazz,engine); } - -// @Getter -// @Setter -// private MongoClientProvider mongoClientProvider=new MongoClientProvider(); -// -// -// @Getter -// @Setter -// private StorageClientProvider storageProvider=new StorageClientProvider(); -// -// @Getter -// @Setter -// private PostgisConnectionProvider dbProvider=new PostgisConnectionProvider(); -// -// @Getter -// @Setter -// private ISProvider isProvider=new ISProvider(); -// -// @Getter -// @Setter -// private ProfileMapCache profiles=new ProfileMapCache(); -// -// @Getter -// @Setter -// private PluginManager pluginManager=new PluginManager(); -// -// @Getter -// @Setter -// private StorageHubProvider sHubProvider=new StorageHubProvider(); -// -// public void shutdown() { -// // Stop JPA -//// AbstractRecordManager.shutdown(); -// -// mongoClientProvider.shutdown(); -// pluginManager.shutdown(); -// } -// -// public void startup() { -//// AbstractRecordManager.setDefaultProvider(emfProvider); -// pluginManager.init(); -// mongoClientProvider.init(); -// } + } diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/StepExecutionReport.java b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/StepExecutionReport.java index 214be56..78029ae 100644 --- a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/StepExecutionReport.java +++ b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/StepExecutionReport.java @@ -5,6 +5,7 @@ import org.gcube.application.cms.plugins.requests.EventExecutionRequest; import org.gcube.application.cms.plugins.requests.StepExecutionRequest; import org.gcube.application.geoportal.common.model.document.ProfiledDocument; +import java.util.ArrayList; import java.util.List; @Data @@ -13,4 +14,18 @@ public class StepExecutionReport extends DocumentHandlingReport toTriggerEvents; List cascadeSteps; + + + public StepExecutionReport addToTriggerEvent(EventExecutionRequest req){ + if(toTriggerEvents==null) toTriggerEvents = new ArrayList<>(); + toTriggerEvents.add(req); + return this; + } + + + public StepExecutionReport addCascadeStep(StepExecutionRequest req){ + if(cascadeSteps == null ) cascadeSteps = new ArrayList<>(); + cascadeSteps.add(req); + return this; + } }