From 34e9e8c34f0feec184b768072dbf16b7551a3b5c Mon Sep 17 00:00:00 2001 From: "fabio.sinibaldi" Date: Mon, 18 Dec 2017 15:25:26 +0000 Subject: [PATCH] git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/branches/data-transfer/data-transfer-service/2.0@160651 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../org/gcube/data/transfer/service/transfers/REST.java | 2 +- .../transfers/engine/impl/AbstractTicketHandler.java | 6 ++++-- .../transfers/engine/impl/PersistenceProviderImpl.java | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/gcube/data/transfer/service/transfers/REST.java b/src/main/java/org/gcube/data/transfer/service/transfers/REST.java index 5e1f6cd..1b601b9 100644 --- a/src/main/java/org/gcube/data/transfer/service/transfers/REST.java +++ b/src/main/java/org/gcube/data/transfer/service/transfers/REST.java @@ -144,7 +144,7 @@ public class REST { } case HTTPDownload :{ if(sourceID==null) throw new WebApplicationException("Parameter "+ServiceConstants.SOURCE_ID+" is mandatory.",Status.BAD_REQUEST); - destination.setDestinationFileName(destinationFileName==null?sourceID:destinationFileName); + if(destinationFileName!=null)destination.setDestinationFileName(destinationFileName); try{ HttpDownloadSettings settings=new HttpDownloadSettings(new URL(sourceID), new HttpDownloadOptions()); resultingRequest.setSettings(settings); diff --git a/src/main/java/org/gcube/data/transfer/service/transfers/engine/impl/AbstractTicketHandler.java b/src/main/java/org/gcube/data/transfer/service/transfers/engine/impl/AbstractTicketHandler.java index 67eeccf..de19b88 100644 --- a/src/main/java/org/gcube/data/transfer/service/transfers/engine/impl/AbstractTicketHandler.java +++ b/src/main/java/org/gcube/data/transfer/service/transfers/engine/impl/AbstractTicketHandler.java @@ -261,15 +261,17 @@ public abstract class AbstractTicketHandler { private static final void setDestinationFileName(TransferTicket ticket){ + switch(ticket.getSettings().getOptions().getMethod()){ case HTTPDownload : { HttpDownloadSettings options=(HttpDownloadSettings) (ticket.getSettings()); - - ticket.getDestinationSettings().setDestinationFileName(retrieveFileName(options.getSource().toString(), ticket.getId())); + String toSetFilename=retrieveFileName(options.getSource().toString(), ticket.getId()); + ticket.getDestinationSettings().setDestinationFileName(toSetFilename); break; } default : ticket.getDestinationSettings().setDestinationFileName(ticket.getId()); } + log.info("Set filename in ticket {} ",ticket); } diff --git a/src/main/java/org/gcube/data/transfer/service/transfers/engine/impl/PersistenceProviderImpl.java b/src/main/java/org/gcube/data/transfer/service/transfers/engine/impl/PersistenceProviderImpl.java index 6d4f038..b8e897f 100644 --- a/src/main/java/org/gcube/data/transfer/service/transfers/engine/impl/PersistenceProviderImpl.java +++ b/src/main/java/org/gcube/data/transfer/service/transfers/engine/impl/PersistenceProviderImpl.java @@ -135,7 +135,7 @@ public class PersistenceProviderImpl implements PersistenceProvider { destination.createNewFile(); return destination; }catch(IOException e){ - throw new DestinationAccessException("Unable to create file ",e); + throw new DestinationAccessException("Unable to create file "+destination.getAbsolutePath(),e); } } }