gCubeSystem
/
smart-executor
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed wrong constructors 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/vre-management/smart-executor@119893 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Luca Frosini 2015-10-20 13:01:14 +00:00
parent ee2118327a
commit 14a346e9c7
2 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/org/gcube/vremanagement/executor/configuration/jsonbased/JSONLaunchParameter.java
View File

@ -47,37 +47,29 @@ public class JSONLaunchParameter extends LaunchParameter {
}
public JSONLaunchParameter(String pluginName, Map<String, String> pluginCapabilities, Map<String, Object> inputs) {
super(pluginName, pluginCapabilities, inputs, false, null);
super(pluginName, pluginCapabilities, inputs);
}
public JSONLaunchParameter(String pluginName, Map<String, Object> inputs, boolean persist) {
super(pluginName, inputs, persist);
}
public JSONLaunchParameter(String pluginName, Map<String, String> pluginCapabilities, Map<String, Object> inputs, boolean persist) {
super(pluginName, pluginCapabilities, inputs, persist, null);
}
public JSONLaunchParameter(String pluginName, Map<String, Object> inputs, Scheduling scheduling) throws ParseException {
this(pluginName, null, inputs, false, scheduling);
super(pluginName, inputs, scheduling);
}
public JSONLaunchParameter(String pluginName, Map<String, String> pluginCapabilities, Map<String, Object> inputs, Scheduling scheduling) throws ParseException {
this(pluginName, pluginCapabilities, inputs, false, scheduling);
super(pluginName, pluginCapabilities, inputs, scheduling);
}
public JSONLaunchParameter(String pluginName, Map<String, Object> inputs, boolean persist, Scheduling scheduling) throws ParseException {
this(pluginName, null, inputs, persist, scheduling);
public JSONLaunchParameter(String pluginName, Map<String, Object> inputs, Scheduling scheduling, boolean persist) throws ParseException {
super(pluginName, inputs, scheduling, persist);
}
public JSONLaunchParameter(String pluginName, Map<String, String> pluginCapabilities, Map<String, Object> inputs, boolean persist, Scheduling scheduling) throws ParseException {
super(pluginName, pluginCapabilities, inputs, persist, scheduling);
public JSONLaunchParameter(String pluginName, Map<String, String> pluginCapabilities, Map<String, Object> inputs, Scheduling scheduling, boolean persist) throws ParseException {
super(pluginName, pluginCapabilities, inputs, scheduling, persist);
this.scheduling = new JSONScheduling(scheduling);
this.scope = ScopeProvider.instance.get();
}
public JSONLaunchParameter(LaunchParameter parameter) throws ParseException {
super(parameter.getPluginName(), parameter.getPluginCapabilities(), parameter.getInputs(), parameter.isPersist(), parameter.getScheduling());
super(parameter.getPluginName(), parameter.getPluginCapabilities(), parameter.getInputs(), parameter.getScheduling(), parameter.isPersist());
this.scheduling = new JSONScheduling(parameter.getScheduling());
this.scope = ScopeProvider.instance.get();
}

2
src/test/java/org/gcube/vremanagement/executor/configuration/ConfiguredTasksTest.java
View File

@ -77,7 +77,7 @@ public class ConfiguredTasksTest {
Map<String, Object> inputs = new HashMap<String, Object>();
inputs.put(HelloWorldPlugin.SLEEP_TIME, 1000);
inputs.put(TEST, 4);
JSONLaunchParameter added = new JSONLaunchParameter(HelloWorldPluginDeclaration.NAME, inputs, true);
JSONLaunchParameter added = new JSONLaunchParameter(HelloWorldPluginDeclaration.NAME, inputs);
parser.addLaunch(added);
parser = new FileScheduledTaskConfiguration(location);