import java.util.Collection;
import uk.ac.dundee.compbio.slivkaclient.Job;
-import uk.ac.dundee.compbio.slivkaclient.JobRequest;
+import uk.ac.dundee.compbio.slivkaclient.RequestValues;
import uk.ac.dundee.compbio.slivkaclient.Parameter;
import uk.ac.dundee.compbio.slivkaclient.RemoteFile;
import uk.ac.dundee.compbio.slivkaclient.SlivkaClient;
WsParamSetI preset, List<ArgumentI> args) throws Throwable
{
var parameters = service.getParameters();
- var request = new JobRequest();
+ var request = new RequestValues();
for (Parameter param : parameters)
{
if (param instanceof Parameter.FileParameter)
}
}
}
- var job = service.submitJob(request);
- return new JobId(service.getName(), service.getName(), job.getId());
+ var jobId = client.submitJob(service, request);
+ return new JobId(service.getName(), service.getName(), jobId);
}
@Override
{
try
{
- var slivkaJob = client.getJob(job.getJobId());
- job.setState(stateMap.get(slivkaJob.getStatus()));
+ job.setState(stateMap.get(client.fetchJobStatus(job.getJobId())));
} catch (IOException e)
{
throw new IOError(e);
@Override
public final boolean updateJobProgress(WsJob job) throws IOException
{
- var slivkaJob = client.getJob(job.getJobId());
- Collection<RemoteFile> files = slivkaJob.getResults();
+ Collection<RemoteFile> files = client.fetchFilesList(job.getJobId());
RemoteFile logFile=null;
for (RemoteFile f : files)
{
if (logFile!=null)
{
ByteArrayOutputStream output = new ByteArrayOutputStream();
- logFile.writeTo(output);
+ client.writeFileTo(logFile, output);
if (output.size() > job.getNextChunk())
{
newContent = true;
if (errLogFile!=null)
{
ByteArrayOutputStream output = new ByteArrayOutputStream();
- errLogFile.writeTo(output);
+ client.writeFileTo(errLogFile, output);
if (output.size() > 0)
{
newContent = true;