diff --git a/src/main/java/org/gcube/common/workspacetaskexecutor/dataminer/DataMinerAccessPoint.java b/src/main/java/org/gcube/common/workspacetaskexecutor/dataminer/DataMinerAccessPoint.java index dfdf97c..10757f1 100644 --- a/src/main/java/org/gcube/common/workspacetaskexecutor/dataminer/DataMinerAccessPoint.java +++ b/src/main/java/org/gcube/common/workspacetaskexecutor/dataminer/DataMinerAccessPoint.java @@ -26,7 +26,6 @@ import org.gcube.data.analysis.dataminermanagercl.shared.data.computations.Compu import org.gcube.data.analysis.dataminermanagercl.shared.data.output.MapResource; import org.gcube.data.analysis.dataminermanagercl.shared.data.output.Resource; import org.gcube.data.analysis.dataminermanagercl.shared.parameters.Parameter; -import org.gcube.data.analysis.dataminermanagercl.shared.parameters.ParameterType; import org.gcube.data.analysis.dataminermanagercl.shared.process.ComputationStatus; import org.gcube.data.analysis.dataminermanagercl.shared.process.ComputationStatus.Status; import org.gcube.data.analysis.dataminermanagercl.shared.process.Operator; @@ -150,7 +149,7 @@ public class DataMinerAccessPoint { } try { - addParametersToOperator(operator, taskConfiguration.getMapParameters()); + addParametersToOperator(operator, taskConfiguration.getListParameters()); logger.debug("Start Computation"); ComputationId computationId = sClient.startComputation(operator); logger.debug("Started ComputationId: " + computationId); @@ -385,14 +384,11 @@ public class DataMinerAccessPoint { * @param parameters the parameters * @return the operator */ - private Operator addParametersToOperator(Operator operator, Map parameters) { + private Operator addParametersToOperator(Operator operator, List parameters) { logger.debug("Adding parameters to operator"); List listParameters = new ArrayList(); - for (String key : parameters.keySet()) { - - TaskParameter taskParameter = parameters.get(key); - ParameterType toParameterType = null; + for (TaskParameter taskParameter : parameters) { if(taskParameter.getType()==null) continue; 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 13439c6..54b44f6 100644 --- a/src/main/java/org/gcube/common/workspacetaskexecutor/dataminer/WorkspaceDataMinerTaskExecutor.java +++ b/src/main/java/org/gcube/common/workspacetaskexecutor/dataminer/WorkspaceDataMinerTaskExecutor.java @@ -166,9 +166,9 @@ public class WorkspaceDataMinerTaskExecutor implements ExecutableTask> mapType = new TypeReference>() {}; conf = jsonUtil.readList(arrayConf, mapType); }catch(Exception e){ + logger.warn("The item id "+workspaceItemId+" has a wrong "+TaskConfiguration.class.getSimpleName()+" saved"); logger.error("Error on serializing configuration: "+arrayConf, e); - logger.info("The item id "+workspaceItemId+" has a wrong "+TaskConfiguration.class.getSimpleName()+" saved. Deleting them.."); - eraseAllTaskConfigurations(workspaceItemId); + //eraseAllTaskConfigurations(workspaceItemId); } logger.debug("Found configuration/s: "+conf); diff --git a/src/main/java/org/gcube/common/workspacetaskexecutor/shared/BaseTaskConfiguration.java b/src/main/java/org/gcube/common/workspacetaskexecutor/shared/BaseTaskConfiguration.java index 9fe9f1c..875d9f7 100644 --- a/src/main/java/org/gcube/common/workspacetaskexecutor/shared/BaseTaskConfiguration.java +++ b/src/main/java/org/gcube/common/workspacetaskexecutor/shared/BaseTaskConfiguration.java @@ -3,7 +3,8 @@ */ package org.gcube.common.workspacetaskexecutor.shared; -import java.util.Map; +import java.util.List; + /** @@ -38,11 +39,11 @@ public interface BaseTaskConfiguration { /** - * Gets the map parameters. + * Gets the list parameters. * - * @return the map parameters + * @return the list parameters */ - Map getMapParameters(); + List getListParameters(); /** diff --git a/src/main/java/org/gcube/common/workspacetaskexecutor/shared/dataminer/TaskConfiguration.java b/src/main/java/org/gcube/common/workspacetaskexecutor/shared/dataminer/TaskConfiguration.java index 2f0daf9..78cd5c6 100644 --- a/src/main/java/org/gcube/common/workspacetaskexecutor/shared/dataminer/TaskConfiguration.java +++ b/src/main/java/org/gcube/common/workspacetaskexecutor/shared/dataminer/TaskConfiguration.java @@ -5,7 +5,7 @@ package org.gcube.common.workspacetaskexecutor.shared.dataminer; import java.io.Serializable; -import java.util.Map; +import java.util.List; import java.util.Random; import org.gcube.common.workspacetaskexecutor.shared.BaseTaskConfiguration; @@ -40,7 +40,7 @@ public class TaskConfiguration implements BaseTaskConfiguration, Serializable { private String maskedToken; private String workspaceItemId; @JsonIgnoreProperties - private Map mapParameters; // optional + private List listParameters; // optional private String configurationKey; /** @@ -59,12 +59,12 @@ public class TaskConfiguration implements BaseTaskConfiguration, Serializable { * @param scope the scope * @param maskedToken the token * @param workspaceItemId the workspace item id - * @param mapParameters the map parameters + * @param listParameters the map parameters */ public TaskConfiguration( String configurationKey, String taskId, String taskDescription, String scope, String maskedToken, String workspaceItemId, - Map mapParameters) { + List listParameters) { setConfigurationKey(configurationKey); this.taskId = taskId; @@ -72,7 +72,7 @@ public class TaskConfiguration implements BaseTaskConfiguration, Serializable { this.scope = scope; this.maskedToken = maskedToken; this.workspaceItemId = workspaceItemId; - this.mapParameters = mapParameters; + this.listParameters = listParameters; } @@ -149,20 +149,20 @@ public class TaskConfiguration implements BaseTaskConfiguration, Serializable { /** - * @return the mapParameters + * @return the listParameters */ - public Map getMapParameters() { + public List getListParameters() { - return mapParameters; + return listParameters; } /** - * @param mapParameters the mapParameters to set + * @param listParameters the listParameters to set */ - public void setMapParameters(Map mapParameters) { + public void setListParameters(List listParameters) { - this.mapParameters = mapParameters; + this.listParameters = listParameters; } /** @@ -234,8 +234,6 @@ public class TaskConfiguration implements BaseTaskConfiguration, Serializable { this.maskedToken = maskedToken; } - - /* (non-Javadoc) * @see java.lang.Object#toString() */ @@ -253,8 +251,8 @@ public class TaskConfiguration implements BaseTaskConfiguration, Serializable { builder.append(maskedToken); builder.append(", workspaceItemId="); builder.append(workspaceItemId); - builder.append(", mapParameters="); - builder.append(mapParameters); + builder.append(", listParameters="); + builder.append(listParameters); builder.append(", configurationKey="); builder.append(configurationKey); builder.append("]"); diff --git a/src/test/java/org/gcube/common/workspacetaskexecutor/TestDataMinerTaskExecutor.java b/src/test/java/org/gcube/common/workspacetaskexecutor/TestDataMinerTaskExecutor.java index 8a0db29..0ba75b9 100644 --- a/src/test/java/org/gcube/common/workspacetaskexecutor/TestDataMinerTaskExecutor.java +++ b/src/test/java/org/gcube/common/workspacetaskexecutor/TestDataMinerTaskExecutor.java @@ -5,9 +5,7 @@ package org.gcube.common.workspacetaskexecutor; import java.io.IOException; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.Random; import java.util.UUID; @@ -101,7 +99,7 @@ public class TestDataMinerTaskExecutor { //jsonCheck(); //ERASE ALL CONFIGURATIONS - eraseAllTaskConfigurations(exec); + //eraseAllTaskConfigurations(exec); //GET LIST CONFIGURATIONS //getConfigurations(exec); @@ -235,22 +233,22 @@ public class TestDataMinerTaskExecutor { // System.out.println(availableType); // } - Map mapParameters = new HashMap(); + List listParameters = new ArrayList(); TaskParameter tp = new TaskParameter(); tp.setKey("publiclink"); tp.setValue("this is the public link "+index); tp.setType(new TaskParameterType(ParameterType.FILE.toString())); - mapParameters.put("publiclink", tp); + listParameters.add(tp); TaskParameter tp2 = new TaskParameter(); tp2.setKey("key"+index); tp2.setValue("value "+index); tp2.setType(types.get(new Random().nextInt(types.size()))); - mapParameters.put("publiclink", tp2); + listParameters.add(tp2); - return new TaskConfiguration(index+"", UUID.randomUUID().toString(), null, SCOPE, "my token", WORKSPACE_FOLDER_ID, mapParameters); + return new TaskConfiguration(index+"", UUID.randomUUID().toString(), null, SCOPE, "my token", WORKSPACE_FOLDER_ID, listParameters); }