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

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

This commit is contained in:
Francesco Mangiacrapa 2018-05-16 10:46:32 +00:00
parent 424c41fe78
commit 0c9b10a1c2
5 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.classpath
View File

@ -28,9 +28,9 @@
<attribute name="org.eclipse.jst.component.nondependency" value=""/> <attribute name="org.eclipse.jst.component.nondependency" value=""/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes> <attributes>
<attribute name="owner.project.facets" value="java"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>

2
.settings/org.eclipse.jdt.core.prefs
View File

@ -1,6 +1,6 @@
eclipse.preferences.version=1 eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.7 org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

5
src/main/java/org/gcube/common/workspacetaskexecutor/dataminer/WorkspaceDataMinerTaskExecutor.java
View File

@ -228,7 +228,8 @@ public class WorkspaceDataMinerTaskExecutor implements ExecutableTask<TaskConfig
*/ */
@Override @Override
public Boolean removeTaskConfiguration(TaskConfiguration taskConfiguration) throws ItemNotExecutableException, Exception { public Boolean removeTaskConfiguration(TaskConfiguration taskConfiguration) throws ItemNotExecutableException, Exception {
logger.debug("Remove task configuration "+taskConfiguration+ "starts...");
logger.info("Removing task configuration with key: "+taskConfiguration.getConfigurationKey() + " starts...");
ValidateTaskConfiguration(taskConfiguration); ValidateTaskConfiguration(taskConfiguration);
checkOwner(); checkOwner();
@ -255,7 +256,7 @@ public class WorkspaceDataMinerTaskExecutor implements ExecutableTask<TaskConfig
if(found){ if(found){
JSONArray newConfgs = jsonUtil.toJSONArray(newConfigurations); JSONArray newConfgs = jsonUtil.toJSONArray(newConfigurations);
WsUtil.setPropertyValue(item, WS_DM_TASK_TASK_CONF, newConfgs.toString()); WsUtil.setPropertyValue(item, WS_DM_TASK_TASK_CONF, newConfgs.toString());
logger.info("Removed task configuration "+taskConfiguration+ " from saved configurations"); logger.info("Removed correclty the task configuration "+taskConfiguration+ " from saved configurations");
return true; return true;
} }

2
src/main/java/org/gcube/common/workspacetaskexecutor/shared/dataminer/TaskConfiguration.java
View File

@ -286,6 +286,8 @@ public class TaskConfiguration implements BaseTaskConfiguration, Serializable {
builder.append(listParameters); builder.append(listParameters);
builder.append(", configurationKey="); builder.append(", configurationKey=");
builder.append(configurationKey); builder.append(configurationKey);
builder.append(", owner=");
builder.append(owner);
builder.append("]"); builder.append("]");
return builder.toString(); return builder.toString();
} }

18
src/test/java/org/gcube/common/workspacetaskexecutor/TestDataMinerTaskExecutor.java
View File

@ -14,7 +14,6 @@ import org.gcube.common.homelibrary.home.exceptions.InternalErrorException;
import org.gcube.common.homelibrary.home.workspace.WorkspaceItem; import org.gcube.common.homelibrary.home.workspace.WorkspaceItem;
import org.gcube.common.homelibrary.home.workspace.exceptions.ItemNotFoundException; import org.gcube.common.homelibrary.home.workspace.exceptions.ItemNotFoundException;
import org.gcube.common.homelibrary.home.workspace.exceptions.WorkspaceFolderNotFoundException; import org.gcube.common.homelibrary.home.workspace.exceptions.WorkspaceFolderNotFoundException;
import org.gcube.common.scope.api.ScopeProvider;
import org.gcube.common.workspacetaskexecutor.dataminer.WorkspaceDataMinerTaskExecutor; import org.gcube.common.workspacetaskexecutor.dataminer.WorkspaceDataMinerTaskExecutor;
import org.gcube.common.workspacetaskexecutor.shared.TaskParameter; import org.gcube.common.workspacetaskexecutor.shared.TaskParameter;
import org.gcube.common.workspacetaskexecutor.shared.TaskParameterType; import org.gcube.common.workspacetaskexecutor.shared.TaskParameterType;
@ -46,7 +45,8 @@ public class TestDataMinerTaskExecutor {
private static JsonUtil jUtil = new JsonUtil(); private static JsonUtil jUtil = new JsonUtil();
//CREATE DUMMY CONFIGURATIONS //CREATE DUMMY CONFIGURATIONS
private static List<TaskConfiguration> listDummyConf = gelDummyListOfConfigurations(3); private static List<TaskConfiguration> listDummyConf;
/** /**
* *
@ -93,13 +93,15 @@ public class TestDataMinerTaskExecutor {
public static void main(String[] args) { public static void main(String[] args) {
ScopeProvider.instance.set(SCOPE); // ScopeProvider.instance.set(SCOPE);
WorkspaceDataMinerTaskExecutor exec = WorkspaceDataMinerTaskExecutor.getInstance(); // listDummyConf = gelDummyListOfConfigurations(3);
exec.withOwner(USERNAME); // WorkspaceDataMinerTaskExecutor exec = WorkspaceDataMinerTaskExecutor.getInstance();
//jsonCheck(); // exec.withOwner(USERNAME);
// //jsonCheck();
//
// //ERASE ALL CONFIGURATIONS
// eraseAllTaskConfigurations(exec);
//ERASE ALL CONFIGURATIONS
eraseAllTaskConfigurations(exec);
//GET LIST CONFIGURATIONS //GET LIST CONFIGURATIONS
//getConfigurations(exec); //getConfigurations(exec);