Fabio Sinibaldi 2017-05-26 14:35:13 +00:00
parent decf004df0
commit 1f33b37a58
2 changed files with 10 additions and 4 deletions

View File

@ -1,11 +1,16 @@
package org.gcube.data.transfer.library;
import java.util.Map;
import org.gcube.data.transfer.library.model.Source;
import org.gcube.data.transfer.model.ExecutionReport;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NonNull;
import org.gcube.data.transfer.library.model.Source;
@Data
@AllArgsConstructor
public class TransferResult {
@NonNull
@ -19,4 +24,5 @@ public class TransferResult {
@NonNull
private String remotePath;
private Map<String,ExecutionReport> executionReports;
}

View File

@ -108,7 +108,7 @@ public abstract class Transferer {
do{
ticket=client.getTransferStatus(submissionResponse.getId());
System.out.println("Status : "+ticket);
continuePolling=ticket.getStatus().equals(Status.PENDING)||ticket.getStatus().equals(Status.TRANSFERRING)||ticket.getStatus().equals(Status.WAITING);
continuePolling=ticket.getStatus().equals(Status.PENDING)||ticket.getStatus().equals(Status.TRANSFERRING)||ticket.getStatus().equals(Status.WAITING)||ticket.getStatus().equals(Status.PLUGIN_EXECUTION);
try{
Thread.sleep(500);
}catch(InterruptedException e){}
@ -116,7 +116,7 @@ public abstract class Transferer {
if(ticket.getStatus().equals(Status.ERROR)) throw new FailedTransferException("Remote Message : "+ticket.getMessage());
if(ticket.getStatus().equals(Status.STOPPED)) throw new FailedTransferException("Stopped transfer : "+ticket.getMessage());
long elapsedTime=System.currentTimeMillis()-ticket.getSubmissionTime().value.getTimeInMillis();
return new TransferResult(source, client.getEndpoint(), elapsedTime, ticket.getTransferredBytes(), ticket.getDestinationFileName());
return new TransferResult(source, client.getEndpoint(), elapsedTime, ticket.getTransferredBytes(), ticket.getDestinationFileName(), ticket.getExecutionReports());
}catch(RemoteServiceException e){
throw new FailedTransferException(e);
}