diff --git a/src/main/java/org/gcube/common/workspacetaskexecutor/dataminer/DMConverter.java b/src/main/java/org/gcube/common/workspacetaskexecutor/dataminer/DMConverter.java index 37d9528..53234b1 100644 --- a/src/main/java/org/gcube/common/workspacetaskexecutor/dataminer/DMConverter.java +++ b/src/main/java/org/gcube/common/workspacetaskexecutor/dataminer/DMConverter.java @@ -131,52 +131,59 @@ public class DMConverter { if(parameter==null) return null; - String defaultValue = ""; + List defaultValues = null; switch (parameter.getTypology()) { case FILE: FileParameter fp = (FileParameter) parameter; break; case OBJECT: ObjectParameter op = (ObjectParameter) parameter; - defaultValue = op.getDefaultValue(); + defaultValues = new ArrayList(1); + defaultValues.add(op.getDefaultValue()); break; case TABULAR: TabularParameter tp = (TabularParameter) parameter; break; case ENUM: EnumParameter ep = (EnumParameter) parameter; - defaultValue = ep.getDefaultValue(); + defaultValues = new ArrayList(ep.getValues().size()); + defaultValues.addAll(ep.getValues()); + System.out.println("############### The VALUES ARE" +ep.getValues()); break; case LIST: ListParameter lp = (ListParameter) parameter; break; case COLUMN: ColumnParameter cp = (ColumnParameter) parameter; - defaultValue = cp.getDefaultColumn(); + defaultValues = new ArrayList(1); + defaultValues.add(cp.getDefaultColumn()); break; case COLUMN_LIST: ColumnListParameter clp = (ColumnListParameter) parameter; break; case DATE: DateParameter dp = (DateParameter) parameter; - defaultValue = dp.getDefaultValue(); + defaultValues = new ArrayList(1); + defaultValues.add(dp.getDefaultValue()); break; case TABULAR_LIST: TabularListParameter tlp = (TabularListParameter) parameter; break; case TIME: TimeParameter timep = (TimeParameter) parameter; - defaultValue = timep.getDefaultValue(); + defaultValues = new ArrayList(1); + defaultValues.add(timep.getDefaultValue()); break; case WKT: WKTParameter wktp = (WKTParameter) parameter; - defaultValue = wktp.getDefaultValue(); + defaultValues = new ArrayList(1); + defaultValues.add(wktp.getDefaultValue()); break; default: break; } - return new TaskParameter(parameter.getName(), parameter.getValue(), defaultValue, toTaskParameterType(parameter.getTypology())); + return new TaskParameter(parameter.getName(), parameter.getValue(), defaultValues, toTaskParameterType(parameter.getTypology())); } diff --git a/src/main/java/org/gcube/common/workspacetaskexecutor/shared/TaskParameter.java b/src/main/java/org/gcube/common/workspacetaskexecutor/shared/TaskParameter.java index db10e6a..a2ee54a 100644 --- a/src/main/java/org/gcube/common/workspacetaskexecutor/shared/TaskParameter.java +++ b/src/main/java/org/gcube/common/workspacetaskexecutor/shared/TaskParameter.java @@ -4,6 +4,7 @@ package org.gcube.common.workspacetaskexecutor.shared; import java.io.Serializable; +import java.util.List; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -23,7 +24,7 @@ public class TaskParameter implements Serializable{ private String key; private String value; @JsonIgnoreProperties - private String defaultValue; //optional + private List defaultValues; //optional private TaskParameterType type; /** @@ -38,12 +39,13 @@ public class TaskParameter implements Serializable{ * * @param key the key * @param value the value + * @param defaultValues the default values * @param type the type */ - public TaskParameter(String key, String value, String defaultValue, TaskParameterType type) { + public TaskParameter(String key, String value, List defaultValues, TaskParameterType type) { this.key = key; this.value = value; - this.defaultValue = defaultValue; + this.defaultValues = defaultValues; this.type = type; } @@ -66,15 +68,6 @@ public class TaskParameter implements Serializable{ } - /** - * @return the defaultValue - */ - public String getDefaultValue() { - - return defaultValue; - } - - /** * @return the type */ @@ -103,14 +96,22 @@ public class TaskParameter implements Serializable{ /** - * @param defaultValue the defaultValue to set + * @return the defaultValues */ - public void setDefaultValue(String defaultValue) { + public List getDefaultValues() { - this.defaultValue = defaultValue; + return defaultValues; } + /** + * @param defaultValues the defaultValues to set + */ + public void setDefaultValues(List defaultValues) { + + this.defaultValues = defaultValues; + } + /** * @param type the type to set */ @@ -130,8 +131,8 @@ public class TaskParameter implements Serializable{ builder.append(key); builder.append(", value="); builder.append(value); - builder.append(", defaultValue="); - builder.append(defaultValue); + builder.append(", defaultValues="); + builder.append(defaultValues); builder.append(", type="); builder.append(type); builder.append("]");