gCubeSystem
/
data-transfer-service
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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:
Fabio Sinibaldi 2017-05-25 13:55:49 +00:00
parent c9e75fc11b
commit d07932b803
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/gcube/data/transfer/service/transfers/engine/PluginManager.java
View File

@ -2,9 +2,9 @@ package org.gcube.data.transfer.service.transfers.engine;
import java.util.Map; import java.util.Map;
import org.gcube.data.transfer.model.ExecutionReport;
import org.gcube.data.transfer.model.PluginDescription; import org.gcube.data.transfer.model.PluginDescription;
import org.gcube.data.transfer.model.PluginInvocation; 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.PluginExecutionException;
import org.gcube.data.transfer.service.transfers.engine.faults.PluginNotFoundException; import org.gcube.data.transfer.service.transfers.engine.faults.PluginNotFoundException;

12
src/main/java/org/gcube/data/transfer/service/transfers/engine/impl/AbstractTicketHandler.java
View File

@ -9,12 +9,14 @@ import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.net.HttpURLConnection; import java.net.HttpURLConnection;
import java.net.URL; import java.net.URL;
import java.util.HashMap;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils; 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.PluginInvocation;
import org.gcube.data.transfer.model.TransferTicket; import org.gcube.data.transfer.model.TransferTicket;
import org.gcube.data.transfer.model.TransferTicket.Status; import org.gcube.data.transfer.model.TransferTicket.Status;
@ -64,6 +66,13 @@ public abstract class AbstractTicketHandler {
onStep(msg,progress,status,ticket.getTransferredBytes()); 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(){ public TransferTicket getTicket(){
return ticket; return ticket;
} }
@ -128,7 +137,8 @@ public abstract class AbstractTicketHandler {
} }
onStep("Executing invocation "+invocation.getPluginId(),1d,Status.PLUGIN_EXECUTION); onStep("Executing invocation "+invocation.getPluginId(),1d,Status.PLUGIN_EXECUTION);
pluginManager.execute(invocation); ExecutionReport report=pluginManager.execute(invocation);
addExecutionReport(report);
} }
} }

2
src/main/java/org/gcube/data/transfer/service/transfers/engine/impl/PluginManagerImpl.java
View File

@ -6,11 +6,11 @@ import java.util.ServiceLoader;
import javax.inject.Singleton; import javax.inject.Singleton;
import org.gcube.data.transfer.model.ExecutionReport;
import org.gcube.data.transfer.model.PluginDescription; import org.gcube.data.transfer.model.PluginDescription;
import org.gcube.data.transfer.model.PluginInvocation; import org.gcube.data.transfer.model.PluginInvocation;
import org.gcube.data.transfer.plugin.AbstractPlugin; import org.gcube.data.transfer.plugin.AbstractPlugin;
import org.gcube.data.transfer.plugin.AbstractPluginFactory; 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.plugin.fails.PluginException;
import org.gcube.data.transfer.service.transfers.engine.PluginManager; import org.gcube.data.transfer.service.transfers.engine.PluginManager;
import org.gcube.data.transfer.service.transfers.engine.faults.PluginExecutionException; import org.gcube.data.transfer.service.transfers.engine.faults.PluginExecutionException;

2
src/main/webapp/WEB-INF/README
View File

@ -25,7 +25,7 @@ no. 654119), SoBigData (grant no. 654024);
Version 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. Please see the file named "changelog.xml" in this directory for the release notes.