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

Removed logs 

Fixed switch to read defaultValue

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/Common/workspace-task-executor-library@167767 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Francesco Mangiacrapa 2018-05-25 15:01:00 +00:00
parent e6368eab3a
commit e6c5b43c34
3 changed files with 17 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,22 +86,11 @@ public class DMConverter {
if(op==null) if(op==null)
return null; return null;
// List<TaskParameter> listOperator = null;
// if(op.getOperatorParameters()!=null){
// listOperator = new ArrayList<TaskParameter>(op.getOperatorParameters().size());
// for (Parameter param : op.getOperatorParameters()) {
// TaskParameter tp = toTaskParameter(param);
// if(tp!=null)
// listOperator.add(tp);
// }
// }
//Converting input parameters //Converting input parameters
List<TaskParameter> listInOperator = null; List<TaskParameter> listInOperator = null;
if(inputParameters!=null){ if(inputParameters!=null){
listInOperator = new ArrayList<TaskParameter>(inputParameters.size()); listInOperator = new ArrayList<TaskParameter>(inputParameters.size());
for (Parameter param :inputParameters) { for (Parameter param: inputParameters) {
TaskParameter tp = toTaskParameter(param); TaskParameter tp = toTaskParameter(param);
if(tp!=null) if(tp!=null)
listInOperator.add(tp); listInOperator.add(tp);
@ -111,8 +100,8 @@ public class DMConverter {
//Converting output parameters //Converting output parameters
List<TaskParameter> listOutOperator = null; List<TaskParameter> listOutOperator = null;
if(outputParameters!=null){ if(outputParameters!=null){
listOutOperator = new ArrayList<TaskParameter>(inputParameters.size()); listOutOperator = new ArrayList<TaskParameter>(outputParameters.size());
for (Parameter param : outputParameters) { for (Parameter param: outputParameters) {
TaskParameter tp = toTaskParameter(param); TaskParameter tp = toTaskParameter(param);
if(tp!=null) if(tp!=null)
listOutOperator.add(tp); listOutOperator.add(tp);
@ -134,46 +123,45 @@ public class DMConverter {
if(parameter==null) if(parameter==null)
return null; return null;
Parameter p;
String defaultValue = ""; String defaultValue = "";
switch (parameter.getTypology()) { switch (parameter.getTypology()) {
case FILE: case FILE:
FileParameter fp = new FileParameter(); FileParameter fp = (FileParameter) parameter;
break; break;
case OBJECT: case OBJECT:
ObjectParameter op = new ObjectParameter(); ObjectParameter op = (ObjectParameter) parameter;
defaultValue = op.getDefaultValue(); defaultValue = op.getDefaultValue();
break; break;
case TABULAR: case TABULAR:
TabularParameter tp = new TabularParameter(); TabularParameter tp = (TabularParameter) parameter;
break; break;
case ENUM: case ENUM:
EnumParameter ep = new EnumParameter(); EnumParameter ep = (EnumParameter) parameter;
defaultValue = ep.getDefaultValue(); defaultValue = ep.getDefaultValue();
break; break;
case LIST: case LIST:
ListParameter lp = new ListParameter(); ListParameter lp = (ListParameter) parameter;
break; break;
case COLUMN: case COLUMN:
ColumnParameter cp = new ColumnParameter(); ColumnParameter cp = (ColumnParameter) parameter;
defaultValue = cp.getDefaultColumn(); defaultValue = cp.getDefaultColumn();
break; break;
case COLUMN_LIST: case COLUMN_LIST:
ColumnListParameter clp = new ColumnListParameter(); ColumnListParameter clp = (ColumnListParameter) parameter;
break; break;
case DATE: case DATE:
DateParameter dp = new DateParameter(); DateParameter dp = (DateParameter) parameter;
defaultValue = dp.getDefaultValue(); defaultValue = dp.getDefaultValue();
break; break;
case TABULAR_LIST: case TABULAR_LIST:
TabularListParameter tlp = new TabularListParameter(); TabularListParameter tlp = (TabularListParameter) parameter;
break; break;
case TIME: case TIME:
TimeParameter timep = new TimeParameter(); TimeParameter timep = (TimeParameter) parameter;
defaultValue = timep.getDefaultValue(); defaultValue = timep.getDefaultValue();
break; break;
case WKT: case WKT:
WKTParameter wktp = new WKTParameter(); WKTParameter wktp = (WKTParameter) parameter;
defaultValue = wktp.getDefaultValue(); defaultValue = wktp.getDefaultValue();
break; break;
default: default:

4
src/main/java/org/gcube/common/workspacetaskexecutor/dataminer/DataMinerAccessPoint.java
View File

@ -397,8 +397,8 @@ public class DataMinerAccessPoint {
if(firstCategory.getOperators()!=null&& !firstCategory.getOperators().isEmpty()){ if(firstCategory.getOperators()!=null&& !firstCategory.getOperators().isEmpty()){
for (Operator operator : firstCategory.getOperators()) { for (Operator operator : firstCategory.getOperators()) {
List<Parameter> inputParameters=sClient.getInputParameters(operator); List<Parameter> inputParameters = sClient.getInputParameters(operator);
List<Parameter> outputParameters=sClient.getOutputParameters(operator); List<Parameter> outputParameters = sClient.getOutputParameters(operator);
TaskOperator to = DMConverter.toTaskOperator(operator, inputParameters, outputParameters); TaskOperator to = DMConverter.toTaskOperator(operator, inputParameters, outputParameters);
if(to!=null) if(to!=null)
listOperator.add(to); listOperator.add(to);

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

@ -41,10 +41,9 @@ public class TaskParameter implements Serializable{
* @param type the type * @param type the type
*/ */
public TaskParameter(String key, String value, String defaultValue, TaskParameterType type) { public TaskParameter(String key, String value, String defaultValue, TaskParameterType type) {
this.key = key; this.key = key;
this.defaultValue = defaultValue;
this.value = value; this.value = value;
this.defaultValue = defaultValue;
this.type = type; this.type = type;
} }
@ -140,6 +139,4 @@ public class TaskParameter implements Serializable{
} }
} }