protected SlivkaDatastore store = null;
- protected final String operation;
-
protected final ArrayList<Operation> operations = new ArrayList<>();
protected int typeFlags = 0;
- protected static final EnumMap<Job.Status, WsJob.JobState> stateMap = new EnumMap<>(
+ protected static final EnumMap<Job.Status, WSJobStatus> statusMap = new EnumMap<>(
Job.Status.class);
{
- stateMap.put(Job.Status.PENDING, WsJob.JobState.QUEUED);
- stateMap.put(Job.Status.REJECTED, WsJob.JobState.INVALID);
- stateMap.put(Job.Status.ACCEPTED, WsJob.JobState.QUEUED);
- stateMap.put(Job.Status.QUEUED, WsJob.JobState.QUEUED);
- stateMap.put(Job.Status.RUNNING, WsJob.JobState.RUNNING);
- stateMap.put(Job.Status.COMPLETED, WsJob.JobState.FINISHED);
- stateMap.put(Job.Status.INTERRUPTED, WsJob.JobState.CANCELLED);
- stateMap.put(Job.Status.DELETED, WsJob.JobState.CANCELLED);
- stateMap.put(Job.Status.FAILED, WsJob.JobState.FAILED);
- stateMap.put(Job.Status.ERROR, WsJob.JobState.SERVERERROR);
- stateMap.put(Job.Status.UNKNOWN, WsJob.JobState.UNKNOWN);
+ statusMap.put(Job.Status.PENDING, WSJobStatus.SUBMITTED);
+ statusMap.put(Job.Status.REJECTED, WSJobStatus.INVALID);
+ statusMap.put(Job.Status.ACCEPTED, WSJobStatus.QUEUED);
+ statusMap.put(Job.Status.QUEUED, WSJobStatus.QUEUED);
+ statusMap.put(Job.Status.RUNNING, WSJobStatus.RUNNING);
+ statusMap.put(Job.Status.COMPLETED, WSJobStatus.FINISHED);
+ statusMap.put(Job.Status.INTERRUPTED, WSJobStatus.CANCELLED);
+ statusMap.put(Job.Status.DELETED, WSJobStatus.CANCELLED);
+ statusMap.put(Job.Status.FAILED, WSJobStatus.FAILED);
+ statusMap.put(Job.Status.ERROR, WSJobStatus.SERVER_ERROR);
+ statusMap.put(Job.Status.UNKNOWN, WSJobStatus.UNKNOWN);
}
- protected final Set<WsJob.JobState> failedStates = new HashSet<>(
- Arrays.asList(WsJob.JobState.INVALID, WsJob.JobState.BROKEN,
- WsJob.JobState.FAILED, WsJob.JobState.SERVERERROR,
- WsJob.JobState.CANCELLED));
-
- public SlivkaWebService(SlivkaClient client, SlivkaService service,
- String operation)
+ public SlivkaWebService(SlivkaClient client, SlivkaService service)
{
this.client = client;
this.service = service;
- this.operation = operation;
}
@Override
}
@Override
- public String getOperationType()
- {
- return operation;
- }
-
- @Override
public List<Operation> getOperations()
{
return operations;
@Override
public void updateProgress(WSJob job) throws IOException
{
- // TODO Auto-generated method stub
-
+ var slivkaJob = client.getJob(job.getJobId());
+ job.setStatus(statusMap.get(slivkaJob.getStatus()));
}
@Override