refs #508: Support Config File to run task at service startup
https://support.d4science.org/issues/508 git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/vre-management/smart-executor-api@117761 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
888ce28828
commit
97fb6fc64c
|
@ -18,7 +18,7 @@ import org.gcube.vremanagement.executor.api.types.adapter.MapAdapter;
|
||||||
*/
|
*/
|
||||||
@XmlRootElement()
|
@XmlRootElement()
|
||||||
@XmlAccessorType(XmlAccessType.FIELD)
|
@XmlAccessorType(XmlAccessType.FIELD)
|
||||||
public class LaunchParameter implements Comparable<LaunchParameter> {
|
public class LaunchParameter {
|
||||||
|
|
||||||
@XmlElement
|
@XmlElement
|
||||||
protected String pluginName;
|
protected String pluginName;
|
||||||
|
@ -137,17 +137,22 @@ public class LaunchParameter implements Comparable<LaunchParameter> {
|
||||||
this.persist = persist;
|
this.persist = persist;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
public boolean equals(LaunchParameter launchParameter){
|
||||||
* {@inheritDoc}
|
if(this.persist!=launchParameter.persist){
|
||||||
*/
|
return false;
|
||||||
@Override
|
|
||||||
public int compareTo(LaunchParameter launchParameter) {
|
|
||||||
int compare = pluginName.compareTo(launchParameter.pluginName);
|
|
||||||
if(compare!=0){
|
|
||||||
return pluginName.compareTo(launchParameter.pluginName);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
if(!pluginName.equals(launchParameter.pluginName)){
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(!scheduling.equals(launchParameter.scheduling)){
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return this.inputs.equals(launchParameter.inputs);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -172,5 +172,30 @@ public class Scheduling {
|
||||||
return String.format("CronExpression %s, Delay %d, SchedulingTimes %d, FirstStartTime %d, EndTime %d, PreviuosExecutionsMustBeCompleted %b",
|
return String.format("CronExpression %s, Delay %d, SchedulingTimes %d, FirstStartTime %d, EndTime %d, PreviuosExecutionsMustBeCompleted %b",
|
||||||
cronExpression, delay, schedulingTimes, firstStartTime, endTime, previuosExecutionsMustBeCompleted);
|
cronExpression, delay, schedulingTimes, firstStartTime, endTime, previuosExecutionsMustBeCompleted);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public boolean equals(Scheduling scheduling) {
|
||||||
|
if(cronExpression.equals(scheduling.cronExpression)){
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(delay.equals(scheduling.delay)){
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(schedulingTimes != scheduling.schedulingTimes){
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(firstStartTime.equals(scheduling.firstStartTime)){
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(endTime.equals(scheduling.endTime)){
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return previuosExecutionsMustBeCompleted==scheduling.previuosExecutionsMustBeCompleted;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue