git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/branches/data-transfer/data-transfer-service/2.0@149083 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
c9e75fc11b
commit
d07932b803
|
@ -2,9 +2,9 @@ package org.gcube.data.transfer.service.transfers.engine;
|
|||
|
||||
import java.util.Map;
|
||||
|
||||
import org.gcube.data.transfer.model.ExecutionReport;
|
||||
import org.gcube.data.transfer.model.PluginDescription;
|
||||
import org.gcube.data.transfer.model.PluginInvocation;
|
||||
import org.gcube.data.transfer.plugin.ExecutionReport;
|
||||
import org.gcube.data.transfer.service.transfers.engine.faults.PluginExecutionException;
|
||||
import org.gcube.data.transfer.service.transfers.engine.faults.PluginNotFoundException;
|
||||
|
||||
|
|
|
@ -9,12 +9,14 @@ import java.io.InputStream;
|
|||
import java.io.OutputStream;
|
||||
import java.net.HttpURLConnection;
|
||||
import java.net.URL;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map.Entry;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import org.apache.commons.io.FileUtils;
|
||||
import org.apache.commons.io.IOUtils;
|
||||
import org.gcube.data.transfer.model.ExecutionReport;
|
||||
import org.gcube.data.transfer.model.PluginInvocation;
|
||||
import org.gcube.data.transfer.model.TransferTicket;
|
||||
import org.gcube.data.transfer.model.TransferTicket.Status;
|
||||
|
@ -64,6 +66,13 @@ public abstract class AbstractTicketHandler {
|
|||
onStep(msg,progress,status,ticket.getTransferredBytes());
|
||||
}
|
||||
|
||||
protected void addExecutionReport(ExecutionReport toAdd){
|
||||
if(ticket.getExecutionReports()==null) ticket.setExecutionReports(new HashMap<String,ExecutionReport>());
|
||||
ticket.getExecutionReports().put(toAdd.getInvocation().getPluginId(), toAdd);
|
||||
onStep(ticket.getMessage(),ticket.getPercent(),ticket.getStatus());
|
||||
}
|
||||
|
||||
|
||||
public TransferTicket getTicket(){
|
||||
return ticket;
|
||||
}
|
||||
|
@ -128,7 +137,8 @@ public abstract class AbstractTicketHandler {
|
|||
|
||||
}
|
||||
onStep("Executing invocation "+invocation.getPluginId(),1d,Status.PLUGIN_EXECUTION);
|
||||
pluginManager.execute(invocation);
|
||||
ExecutionReport report=pluginManager.execute(invocation);
|
||||
addExecutionReport(report);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -6,11 +6,11 @@ import java.util.ServiceLoader;
|
|||
|
||||
import javax.inject.Singleton;
|
||||
|
||||
import org.gcube.data.transfer.model.ExecutionReport;
|
||||
import org.gcube.data.transfer.model.PluginDescription;
|
||||
import org.gcube.data.transfer.model.PluginInvocation;
|
||||
import org.gcube.data.transfer.plugin.AbstractPlugin;
|
||||
import org.gcube.data.transfer.plugin.AbstractPluginFactory;
|
||||
import org.gcube.data.transfer.plugin.ExecutionReport;
|
||||
import org.gcube.data.transfer.plugin.fails.PluginException;
|
||||
import org.gcube.data.transfer.service.transfers.engine.PluginManager;
|
||||
import org.gcube.data.transfer.service.transfers.engine.faults.PluginExecutionException;
|
||||
|
|
|
@ -25,7 +25,7 @@ no. 654119), SoBigData (grant no. 654024);
|
|||
Version
|
||||
--------------------------------------------------
|
||||
|
||||
2.0.0-SNAPSHOT (2017-05-19)
|
||||
2.0.0-SNAPSHOT (2017-05-24)
|
||||
|
||||
Please see the file named "changelog.xml" in this directory for the release notes.
|
||||
|
||||
|
|
Loading…
Reference in New Issue