From 45c3dee7c19ee1084ffd890008654cb7eacf39d6 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Fri, 2 Aug 2019 18:29:46 +0200 Subject: [PATCH] Redesigning REST interface --- .../executor/api/rest/RestConstants.java | 7 +++--- .../executor/api/rest/SmartExecutor.java | 24 ++++++------------- 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/src/main/java/org/gcube/vremanagement/executor/api/rest/RestConstants.java b/src/main/java/org/gcube/vremanagement/executor/api/rest/RestConstants.java index ed17019..11c39dc 100644 --- a/src/main/java/org/gcube/vremanagement/executor/api/rest/RestConstants.java +++ b/src/main/java/org/gcube/vremanagement/executor/api/rest/RestConstants.java @@ -4,11 +4,12 @@ public class RestConstants { public static final String PLUGINS_PATH_PART = "plugins"; - public static final String SCHEDULED_PATH_PART = "scheduled"; + public static final String ALL_PATH_PART = "ALL"; - public static final String ITERATION_NUMBER_PARAM = "iterationNumber"; + public static final String EXECUTIONS_PATH_PART = "executions"; - public static final String GLOBALLY_PARAM = "globally"; + public static final String ITERATION_PARAM = "iteration"; + public static final String UNSCHEDULE_PARAM = "unschedule"; } diff --git a/src/main/java/org/gcube/vremanagement/executor/api/rest/SmartExecutor.java b/src/main/java/org/gcube/vremanagement/executor/api/rest/SmartExecutor.java index 1fb48e2..ed3c27b 100644 --- a/src/main/java/org/gcube/vremanagement/executor/api/rest/SmartExecutor.java +++ b/src/main/java/org/gcube/vremanagement/executor/api/rest/SmartExecutor.java @@ -1,31 +1,21 @@ package org.gcube.vremanagement.executor.api.rest; -import java.util.UUID; - -import org.gcube.vremanagement.executor.api.types.LaunchParameter; import org.gcube.vremanagement.executor.exception.ExecutorException; -import org.gcube.vremanagement.executor.exception.InputsNullException; -import org.gcube.vremanagement.executor.exception.LaunchException; import org.gcube.vremanagement.executor.exception.PluginInstanceNotFoundException; -import org.gcube.vremanagement.executor.exception.PluginNotFoundException; -import org.gcube.vremanagement.executor.plugin.PluginStateEvolution; public interface SmartExecutor { - public String launch(String launchParameterString) throws ExecutorException; + public String getAvailablePlugins() throws ExecutorException; - public UUID launch(LaunchParameter launchParameter) - throws InputsNullException, PluginNotFoundException, LaunchException, ExecutorException; + public String getLaunches(String pluginName) throws ExecutorException; - public String getPluginStateEvolution(String executionIdentifier, Integer iterationNumber) throws PluginInstanceNotFoundException, ExecutorException; + public String launch(String pluginName, String launchParameterString) throws ExecutorException; - public PluginStateEvolution getPluginStateEvolution(UUID executionIdentifier, Integer iterationNumber) + public String getPluginStateEvolution(String pluginName, String executionIdentifier, Integer iteration) throws PluginInstanceNotFoundException, ExecutorException; - public boolean delete(String executionIdentifier, boolean globally) - throws ExecutorException; + public boolean delete(String pluginName, String executionIdentifier, Boolean unschedule) throws ExecutorException; + + public boolean purge(String pluginName, String executionIdentifier) throws ExecutorException; - public boolean delete(UUID executionIdentifier, boolean globally) - throws ExecutorException; - }