diff --git a/src/main/java/org/gcube/common/workspacetaskexecutor/dataminer/WorkspaceDataMinerTaskExecutor.java b/src/main/java/org/gcube/common/workspacetaskexecutor/dataminer/WorkspaceDataMinerTaskExecutor.java index ecee082..13439c6 100644 --- a/src/main/java/org/gcube/common/workspacetaskexecutor/dataminer/WorkspaceDataMinerTaskExecutor.java +++ b/src/main/java/org/gcube/common/workspacetaskexecutor/dataminer/WorkspaceDataMinerTaskExecutor.java @@ -7,7 +7,6 @@ import org.apache.commons.lang.Validate; import org.gcube.common.homelibrary.home.workspace.WorkspaceItem; import org.gcube.common.workspacetaskexecutor.shared.ExecutableItem; import org.gcube.common.workspacetaskexecutor.shared.ExecutableTask; -import org.gcube.common.workspacetaskexecutor.shared.TaskParameterAvailableTypes; import org.gcube.common.workspacetaskexecutor.shared.TaskParameterType; import org.gcube.common.workspacetaskexecutor.shared.dataminer.TaskComputation; import org.gcube.common.workspacetaskexecutor.shared.dataminer.TaskConfiguration; @@ -320,19 +319,18 @@ public class WorkspaceDataMinerTaskExecutor implements ExecutableTask getParameterTypes(){ String[] typeNames = Converter.convertEnumNamesToArraString(ParameterType.class); List types = new ArrayList(); for (String string : typeNames) { types.add(new TaskParameterType(string)); } - return new TaskParameterAvailableTypes(types); + return types; } diff --git a/src/main/java/org/gcube/common/workspacetaskexecutor/shared/TaskParameterAvailableTypes.java b/src/main/java/org/gcube/common/workspacetaskexecutor/shared/TaskParameterAvailableTypes.java deleted file mode 100644 index 161d152..0000000 --- a/src/main/java/org/gcube/common/workspacetaskexecutor/shared/TaskParameterAvailableTypes.java +++ /dev/null @@ -1,67 +0,0 @@ -/** - * - */ - -package org.gcube.common.workspacetaskexecutor.shared; - -import java.io.Serializable; -import java.util.List; - - -/** - * The Class TaskParameterAvailableTypes. - * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it - * May 7, 2018 - */ -public class TaskParameterAvailableTypes implements Serializable { - - /** - * - */ - private static final long serialVersionUID = 5005902773845652944L; - public List parametersTypes; - - /** - * Instantiates a new base task parameter types. - */ - public TaskParameterAvailableTypes() { - - } - - /** - * Instantiates a new task parameter available types. - * - * @param availableParameterTypes the available parameter types - */ - public TaskParameterAvailableTypes(List availableParameterTypes) { - - this.parametersTypes = availableParameterTypes; - } - - - /** - * Gets the parameters types. - * - * @return the parameters types - */ - public List getParametersTypes() { - - return parametersTypes; - } - - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - - StringBuilder builder = new StringBuilder(); - builder.append("TaskParameterTypes [parametersTypes="); - builder.append(parametersTypes); - builder.append("]"); - return builder.toString(); - } - - -} diff --git a/src/test/java/org/gcube/common/workspacetaskexecutor/TestDataMinerTaskExecutor.java b/src/test/java/org/gcube/common/workspacetaskexecutor/TestDataMinerTaskExecutor.java index 616836d..8a0db29 100644 --- a/src/test/java/org/gcube/common/workspacetaskexecutor/TestDataMinerTaskExecutor.java +++ b/src/test/java/org/gcube/common/workspacetaskexecutor/TestDataMinerTaskExecutor.java @@ -19,7 +19,6 @@ import org.gcube.common.homelibrary.home.workspace.exceptions.WorkspaceFolderNot import org.gcube.common.scope.api.ScopeProvider; import org.gcube.common.workspacetaskexecutor.dataminer.WorkspaceDataMinerTaskExecutor; import org.gcube.common.workspacetaskexecutor.shared.TaskParameter; -import org.gcube.common.workspacetaskexecutor.shared.TaskParameterAvailableTypes; import org.gcube.common.workspacetaskexecutor.shared.TaskParameterType; import org.gcube.common.workspacetaskexecutor.shared.dataminer.TaskConfiguration; import org.gcube.common.workspacetaskexecutor.util.Converter; @@ -230,8 +229,7 @@ public class TestDataMinerTaskExecutor { types.add(new TaskParameterType(string)); } - TaskParameterAvailableTypes tpt = new TaskParameterAvailableTypes(types); - System.out.println(tpt.toString()); + System.out.println(types.toString()); // for (String availableType : tpt.getParametersTypes()) { // System.out.println(availableType); @@ -249,7 +247,7 @@ public class TestDataMinerTaskExecutor { TaskParameter tp2 = new TaskParameter(); tp2.setKey("key"+index); tp2.setValue("value "+index); - tp2.setType(tpt.getParametersTypes().get(new Random().nextInt(tpt.getParametersTypes().size()))); + tp2.setType(types.get(new Random().nextInt(types.size()))); mapParameters.put("publiclink", tp2); return new TaskConfiguration(index+"", UUID.randomUUID().toString(), null, SCOPE, "my token", WORKSPACE_FOLDER_ID, mapParameters);