From e6c5b43c34347cdb1d2e0ce2397d041af514d939 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Fri, 25 May 2018 15:01:00 +0000 Subject: [PATCH] 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 --- .../dataminer/DMConverter.java | 40 +++++++------------ .../dataminer/DataMinerAccessPoint.java | 4 +- .../shared/TaskParameter.java | 5 +-- 3 files changed, 17 insertions(+), 32 deletions(-) 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 b3ee308..9c9ec0e 100644 --- a/src/main/java/org/gcube/common/workspacetaskexecutor/dataminer/DMConverter.java +++ b/src/main/java/org/gcube/common/workspacetaskexecutor/dataminer/DMConverter.java @@ -86,22 +86,11 @@ public class DMConverter { if(op==null) return null; - -// List listOperator = null; -// if(op.getOperatorParameters()!=null){ -// listOperator = new ArrayList(op.getOperatorParameters().size()); -// for (Parameter param : op.getOperatorParameters()) { -// TaskParameter tp = toTaskParameter(param); -// if(tp!=null) -// listOperator.add(tp); -// } -// } - //Converting input parameters List listInOperator = null; if(inputParameters!=null){ listInOperator = new ArrayList(inputParameters.size()); - for (Parameter param :inputParameters) { + for (Parameter param: inputParameters) { TaskParameter tp = toTaskParameter(param); if(tp!=null) listInOperator.add(tp); @@ -111,8 +100,8 @@ public class DMConverter { //Converting output parameters List listOutOperator = null; if(outputParameters!=null){ - listOutOperator = new ArrayList(inputParameters.size()); - for (Parameter param : outputParameters) { + listOutOperator = new ArrayList(outputParameters.size()); + for (Parameter param: outputParameters) { TaskParameter tp = toTaskParameter(param); if(tp!=null) listOutOperator.add(tp); @@ -134,46 +123,45 @@ public class DMConverter { if(parameter==null) return null; - Parameter p; String defaultValue = ""; switch (parameter.getTypology()) { case FILE: - FileParameter fp = new FileParameter(); + FileParameter fp = (FileParameter) parameter; break; case OBJECT: - ObjectParameter op = new ObjectParameter(); + ObjectParameter op = (ObjectParameter) parameter; defaultValue = op.getDefaultValue(); break; case TABULAR: - TabularParameter tp = new TabularParameter(); + TabularParameter tp = (TabularParameter) parameter; break; case ENUM: - EnumParameter ep = new EnumParameter(); + EnumParameter ep = (EnumParameter) parameter; defaultValue = ep.getDefaultValue(); break; case LIST: - ListParameter lp = new ListParameter(); + ListParameter lp = (ListParameter) parameter; break; case COLUMN: - ColumnParameter cp = new ColumnParameter(); + ColumnParameter cp = (ColumnParameter) parameter; defaultValue = cp.getDefaultColumn(); break; case COLUMN_LIST: - ColumnListParameter clp = new ColumnListParameter(); + ColumnListParameter clp = (ColumnListParameter) parameter; break; case DATE: - DateParameter dp = new DateParameter(); + DateParameter dp = (DateParameter) parameter; defaultValue = dp.getDefaultValue(); break; case TABULAR_LIST: - TabularListParameter tlp = new TabularListParameter(); + TabularListParameter tlp = (TabularListParameter) parameter; break; case TIME: - TimeParameter timep = new TimeParameter(); + TimeParameter timep = (TimeParameter) parameter; defaultValue = timep.getDefaultValue(); break; case WKT: - WKTParameter wktp = new WKTParameter(); + WKTParameter wktp = (WKTParameter) parameter; defaultValue = wktp.getDefaultValue(); break; default: 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 db15df4..ffe6aed 100644 --- a/src/main/java/org/gcube/common/workspacetaskexecutor/dataminer/DataMinerAccessPoint.java +++ b/src/main/java/org/gcube/common/workspacetaskexecutor/dataminer/DataMinerAccessPoint.java @@ -397,8 +397,8 @@ public class DataMinerAccessPoint { if(firstCategory.getOperators()!=null&& !firstCategory.getOperators().isEmpty()){ for (Operator operator : firstCategory.getOperators()) { - List inputParameters=sClient.getInputParameters(operator); - List outputParameters=sClient.getOutputParameters(operator); + List inputParameters = sClient.getInputParameters(operator); + List outputParameters = sClient.getOutputParameters(operator); TaskOperator to = DMConverter.toTaskOperator(operator, inputParameters, outputParameters); if(to!=null) listOperator.add(to); 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 aed913f..db10e6a 100644 --- a/src/main/java/org/gcube/common/workspacetaskexecutor/shared/TaskParameter.java +++ b/src/main/java/org/gcube/common/workspacetaskexecutor/shared/TaskParameter.java @@ -41,10 +41,9 @@ public class TaskParameter implements Serializable{ * @param type the type */ public TaskParameter(String key, String value, String defaultValue, TaskParameterType type) { - this.key = key; - this.defaultValue = defaultValue; this.value = value; + this.defaultValue = defaultValue; this.type = type; } @@ -140,6 +139,4 @@ public class TaskParameter implements Serializable{ } - - } \ No newline at end of file