diff --git a/pom.xml b/pom.xml
index 042c056..baf089a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
org.gcube.vremanagement
smart-executor-api
- 2.0.0-SNAPSHOT
+ 2.0.0
Smart Executor Service API Library
jar
@@ -31,7 +31,7 @@
org.gcube.distribution
gcube-bom
- LATEST
+ 1.4.0
pom
import
@@ -82,7 +82,6 @@
ch.qos.logback
logback-classic
- 1.0.13
test
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 59914e2..1f83054 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
@@ -1,5 +1,8 @@
package org.gcube.vremanagement.executor.api.rest;
+/**
+ * @author Luca Frosini (ISTI - CNR)
+ */
public class RestConstants {
public static final String PLUGINS_PATH_PART = "plugins";
@@ -10,4 +13,6 @@ public class RestConstants {
public static final String UNSCHEDULE_PARAM = "unschedule";
+ public static final String ORPHAN_PATH_PARAM = "ORPHAN";
+
}
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
deleted file mode 100644
index 5f9215c..0000000
--- a/src/main/java/org/gcube/vremanagement/executor/api/rest/SmartExecutor.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.gcube.vremanagement.executor.api.rest;
-
-import org.gcube.vremanagement.executor.exception.ExecutorException;
-import org.gcube.vremanagement.executor.exception.PluginInstanceNotFoundException;
-
-public interface SmartExecutor {
-
- public static final String ORPHAN_PATH_PARAM = "ORPHAN";
-
- public String getAvailablePlugins() throws ExecutorException;
-
- public String getScheduled(String pluginName) throws ExecutorException;
-
- public String launch(String pluginName, String launchParameterString) throws ExecutorException;
-
- public String getLaunchState(String pluginName, String executionIdentifier, Integer iteration)
- throws PluginInstanceNotFoundException, ExecutorException;
-
- public boolean delete(String pluginName, String executionIdentifier, Boolean unschedule) throws ExecutorException;
-
- public boolean purge(String pluginName, String executionIdentifier) throws ExecutorException;
-
-}
diff --git a/src/main/java/org/gcube/vremanagement/executor/exception/PluginInstanceNotFoundException.java b/src/main/java/org/gcube/vremanagement/executor/exception/PluginInstanceNotFoundException.java
index 8aa23fc..c2e45e3 100644
--- a/src/main/java/org/gcube/vremanagement/executor/exception/PluginInstanceNotFoundException.java
+++ b/src/main/java/org/gcube/vremanagement/executor/exception/PluginInstanceNotFoundException.java
@@ -3,6 +3,8 @@
*/
package org.gcube.vremanagement.executor.exception;
+import java.util.UUID;
+
/**
* @author Luca Frosini (ISTI - CNR)
*/
@@ -13,14 +15,14 @@ public class PluginInstanceNotFoundException extends ExecutorException {
*/
private static final long serialVersionUID = -7609491801703267843L;
- private static final String DEFAULT_MESSAGE = "The requested plugin instance does not exists";
+ private static final String DEFAULT_MESSAGE = "No plugin instance with UUID %s found";
- public PluginInstanceNotFoundException() {
- super(DEFAULT_MESSAGE);
+ public PluginInstanceNotFoundException(UUID uuid) {
+ super(String.format(DEFAULT_MESSAGE,uuid.toString()));
}
- public PluginInstanceNotFoundException(Throwable cause) {
- this(DEFAULT_MESSAGE, cause);
+ public PluginInstanceNotFoundException(UUID uuid, Throwable cause) {
+ this(String.format(DEFAULT_MESSAGE,uuid.toString()), cause);
}
public PluginInstanceNotFoundException(String message) {