Enhancement on Project Activity #11690

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/Common/workspace-task-executor-library@167301 82a268e6-3cf1-43bd-a215-b396298e98cf

src/main/java/org/gcube/common/workspacetaskexecutor/dataminer/DataMinerAccessPoint.java

@@ -78,6 +78,31 @@ public class DataMinerAccessPoint {
 
 	}
 
+	//TODO
+	public void abortTask(TaskConfiguration algConfiguration) throws TaskErrorException, TaskNotExecutableException{
+
+		TaskExecutionStatus task = getTask(algConfiguration);
+
+		if(task==null)
+			throw new TaskErrorException("The task with configuration: "+algConfiguration+" is not running");
+
+		Operator operator;
+		SClient sClient;
+		try {
+			sClient = dataMinerService.getClient();
+			operator = sClient.getOperatorById(algConfiguration.getTaskId());
+			addParametersToOperator(operator, algConfiguration.getMapParameters());
+
+
+			//TODO
+		}
+		catch (Exception e) {
+			String error = "Error on get Client or the Operator for id: "+algConfiguration.getTaskId();
+			logger.error(error, e);
+			throw new TaskNotExecutableException(error);
+		}
+	}
+
 
 	/**
 	 * Do run task.
@@ -153,7 +178,7 @@ public class DataMinerAccessPoint {
 	 */
 	private TaskExecutionStatus startComputationOnDataMiner(BaseTaskConfiguration algConfiguration, final ComputationId computationId, final SClient sClient){
 
-		TaskExecutionStatus status = new TaskExecutionStatus(algConfiguration);
+		TaskExecutionStatus status = new TaskExecutionStatus(algConfiguration, computationId.getId());
 
 		DMMonitorListener listener = new DMMonitorListener() {
 

src/main/java/org/gcube/common/workspacetaskexecutor/shared/dataminer/TaskExecutionStatus.java

@@ -7,12 +7,11 @@ import org.gcube.common.workspacetaskexecutor.shared.BaseTaskExecutionStatus;
 import org.gcube.common.workspacetaskexecutor.shared.Status;
 
 
-
 /**
  * The Class TaskExecutionStatus.
  *
  * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it
- * Apr 27, 2018
+ * May 3, 2018
  */
 public class TaskExecutionStatus implements BaseTaskExecutionStatus, Serializable {
 
@@ -26,6 +25,7 @@ public class TaskExecutionStatus implements BaseTaskExecutionStatus, Serializabl
 	private Float percentCompleted = new Float(0);
 	private String log;
 	private String currentMessage="Waiting to start..";
+	private String computationId;
 	private BaseTaskConfiguration taskConfiguration;
 
 
@@ -40,9 +40,11 @@ public class TaskExecutionStatus implements BaseTaskExecutionStatus, Serializabl
 	 * Instantiates a new task execution status.
 	 *
 	 * @param taskConfiguration the task configuration
+	 * @param computationId the computation id
 	 */
-	public TaskExecutionStatus(BaseTaskConfiguration taskConfiguration) {
+	public TaskExecutionStatus(BaseTaskConfiguration taskConfiguration, String computationId) {
 		this.taskConfiguration = taskConfiguration;
+		this.computationId = computationId;
 	}
 
 
@@ -68,6 +70,29 @@ public class TaskExecutionStatus implements BaseTaskExecutionStatus, Serializabl
 	}
 
 
+	/**
+	 * Gets the computation id.
+	 *
+	 * @return the computationId
+	 */
+	public String getComputationId() {
+
+		return computationId;
+	}
+
+
+
+	/**
+	 * Sets the computation id.
+	 *
+	 * @param computationId the computationId to set
+	 */
+	public void setComputationId(String computationId) {
+
+		this.computationId = computationId;
+	}
+
+
 	/**
 	 * Gets the error count.
 	 *
@@ -191,10 +216,14 @@ public class TaskExecutionStatus implements BaseTaskExecutionStatus, Serializabl
 		builder.append(log);
 		builder.append(", currentMessage=");
 		builder.append(currentMessage);
+		builder.append(", computationId=");
+		builder.append(computationId);
 		builder.append(", taskConfiguration=");
 		builder.append(taskConfiguration);
 		builder.append("]");
 		return builder.toString();
 	}
 
+
+
 }