ref 6078:TDM - Create a new widget to support operations's invocation on DataMiner

https://support.d4science.org/issues/6078

Updated to support DataMiner

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@146423 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2017-03-29 12:45:12 +00:00
parent 47ce169021
commit 9876c66d37
1 changed files with 13 additions and 11 deletions

View File

@ -1,5 +1,6 @@
package org.gcube.portlets.user.td.gwtservice.server.opexecution; package org.gcube.portlets.user.td.gwtservice.server.opexecution;
import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -16,7 +17,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
/** /**
* Operation DataMiner * Operation DataMiner
* *
* @author "Giancarlo Panichi" email: <a * @author "Giancarlo Panichi" email: <a
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> * href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
@ -27,15 +28,14 @@ public class OpExecution4DataMinerOperation extends OpExecutionBuilder {
.getLogger(OpExecution4DataMinerOperation.class); .getLogger(OpExecution4DataMinerOperation.class);
private TabularDataService service; private TabularDataService service;
//private ServiceCredentials serviceCredentials; // private ServiceCredentials serviceCredentials;
private DataMinerOperationSession dataMinerOperationSession; private DataMinerOperationSession dataMinerOperationSession;
public OpExecution4DataMinerOperation(TabularDataService service,
public OpExecution4DataMinerOperation( ServiceCredentials serviceCredentials,
TabularDataService service,ServiceCredentials serviceCredentials,
DataMinerOperationSession dataMinerOperationSession) { DataMinerOperationSession dataMinerOperationSession) {
this.service = service; this.service = service;
//this.serviceCredentials = serviceCredentials; // this.serviceCredentials = serviceCredentials;
this.dataMinerOperationSession = dataMinerOperationSession; this.dataMinerOperationSession = dataMinerOperationSession;
} }
@ -49,14 +49,16 @@ public class OpExecution4DataMinerOperation extends OpExecutionBuilder {
operationDefinition = OperationDefinitionMap.map( operationDefinition = OperationDefinitionMap.map(
OperationsId.StatisticalOperation.toString(), service); OperationsId.StatisticalOperation.toString(), service);
//map.put(Constants.PARAMETER_DATAMINER_GCUBETOKEN, serviceCredentials.getToken()); // map.put(Constants.PARAMETER_DATAMINER_GCUBETOKEN,
map.put(Constants.PARAMETER_DATAMINER_OPERATOR, dataMinerOperationSession.getOperator()); // serviceCredentials.getToken());
map.put(Constants.PARAMETER_DATAMINER_OPERATOR, Collections
.singletonMap(Constants.PARAMETER_DATAMINER_OPERATOR,
dataMinerOperationSession.getOperator()));
invocation = new OperationExecution( invocation = new OperationExecution(
operationDefinition.getOperationId(), map); operationDefinition.getOperationId(), map);
operationExecutionSpec.setOp(invocation); operationExecutionSpec.setOp(invocation);
} }