From 1f33b37a589efe89986555b50ec26ad9d6bbdfb3 Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Fri, 26 May 2017 14:35:13 +0000 Subject: [PATCH] git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/data-transfer/data-transfer-library@149155 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../gcube/data/transfer/library/TransferResult.java | 10 ++++++++-- .../data/transfer/library/transferers/Transferer.java | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/gcube/data/transfer/library/TransferResult.java b/src/main/java/org/gcube/data/transfer/library/TransferResult.java index 97b89fd..c46268b 100644 --- a/src/main/java/org/gcube/data/transfer/library/TransferResult.java +++ b/src/main/java/org/gcube/data/transfer/library/TransferResult.java @@ -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 executionReports; } diff --git a/src/main/java/org/gcube/data/transfer/library/transferers/Transferer.java b/src/main/java/org/gcube/data/transfer/library/transferers/Transferer.java index 4ab1cbf..ed1ac9b 100644 --- a/src/main/java/org/gcube/data/transfer/library/transferers/Transferer.java +++ b/src/main/java/org/gcube/data/transfer/library/transferers/Transferer.java @@ -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); }