git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/data-transfer/data-transfer-library@149155 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
decf004df0
commit
1f33b37a58
|
@ -1,11 +1,16 @@
|
||||||
package org.gcube.data.transfer.library;
|
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.Data;
|
||||||
import lombok.NonNull;
|
import lombok.NonNull;
|
||||||
|
|
||||||
import org.gcube.data.transfer.library.model.Source;
|
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
|
@AllArgsConstructor
|
||||||
public class TransferResult {
|
public class TransferResult {
|
||||||
|
|
||||||
@NonNull
|
@NonNull
|
||||||
|
@ -19,4 +24,5 @@ public class TransferResult {
|
||||||
@NonNull
|
@NonNull
|
||||||
private String remotePath;
|
private String remotePath;
|
||||||
|
|
||||||
|
private Map<String,ExecutionReport> executionReports;
|
||||||
}
|
}
|
||||||
|
|
|
@ -108,7 +108,7 @@ public abstract class Transferer {
|
||||||
do{
|
do{
|
||||||
ticket=client.getTransferStatus(submissionResponse.getId());
|
ticket=client.getTransferStatus(submissionResponse.getId());
|
||||||
System.out.println("Status : "+ticket);
|
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{
|
try{
|
||||||
Thread.sleep(500);
|
Thread.sleep(500);
|
||||||
}catch(InterruptedException e){}
|
}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.ERROR)) throw new FailedTransferException("Remote Message : "+ticket.getMessage());
|
||||||
if(ticket.getStatus().equals(Status.STOPPED)) throw new FailedTransferException("Stopped transfer : "+ticket.getMessage());
|
if(ticket.getStatus().equals(Status.STOPPED)) throw new FailedTransferException("Stopped transfer : "+ticket.getMessage());
|
||||||
long elapsedTime=System.currentTimeMillis()-ticket.getSubmissionTime().value.getTimeInMillis();
|
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){
|
}catch(RemoteServiceException e){
|
||||||
throw new FailedTransferException(e);
|
throw new FailedTransferException(e);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue