gCubeSystem
/
workspace-task-executor-library
15
0
Fork 0
Code Issues Releases Wiki Activity

Changed defaultVale to list of default value to manane Enum case 

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/Common/workspace-task-executor-library@169297 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Francesco Mangiacrapa 2018-06-18 13:39:25 +00:00
parent da918cd90e
commit cae510b7bd
2 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/org/gcube/common/workspacetaskexecutor/dataminer/DMConverter.java
View File

@ -131,52 +131,59 @@ public class DMConverter {
if(parameter==null)
return null;
String defaultValue = "";
List<String> defaultValues = null;
switch (parameter.getTypology()) {
case FILE:
FileParameter fp = (FileParameter) parameter;
break;
case OBJECT:
ObjectParameter op = (ObjectParameter) parameter;
defaultValue = op.getDefaultValue();
defaultValues = new ArrayList<String>(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<String>(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<String>(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<String>(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<String>(1);
defaultValues.add(timep.getDefaultValue());
break;
case WKT:
WKTParameter wktp = (WKTParameter) parameter;
defaultValue = wktp.getDefaultValue();
defaultValues = new ArrayList<String>(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()));
}

35
src/main/java/org/gcube/common/workspacetaskexecutor/shared/TaskParameter.java
View File

@ -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<String> 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<String> 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<String> getDefaultValues() {
this.defaultValue = defaultValue;
return defaultValues;
}
/**
* @param defaultValues the defaultValues to set
*/
public void setDefaultValues(List<String> 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("]");