From a041a9f862b2d4aea58f300acccadfb8b5235b85 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Wed, 9 Jan 2019 14:40:51 +0000 Subject: [PATCH] removed ETag git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/data-transfer/uri-resolver@176400 82a268e6-3cf1-43bd-a215-b396298e98cf --- pom.xml | 8 ++++++++ .../gcube/datatransfer/resolver/ConstantsResolver.java | 2 +- .../resolver/services/StorageHubResolver.java | 8 +++----- .../datatransfer/resolver/services/StorageIDResolver.java | 2 +- .../resolver/util/StorageHubMetadataResponseBuilder.java | 7 ++++--- 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index b0a086b..ba2780d 100644 --- a/pom.xml +++ b/pom.xml @@ -84,6 +84,14 @@ [0.0.1-SNAPSHOT,1.0.0-SNAPSHOT) + + + org.gcube.common + gxHTTP + [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT) + compile + + org.gcube.core common-encryption diff --git a/src/main/java/org/gcube/datatransfer/resolver/ConstantsResolver.java b/src/main/java/org/gcube/datatransfer/resolver/ConstantsResolver.java index b3bb892..597690d 100644 --- a/src/main/java/org/gcube/datatransfer/resolver/ConstantsResolver.java +++ b/src/main/java/org/gcube/datatransfer/resolver/ConstantsResolver.java @@ -12,7 +12,7 @@ package org.gcube.datatransfer.resolver; */ public class ConstantsResolver { - public static final String CONTENT_DISPOSITION = "content-disposition"; + public static final String CONTENT_DISPOSITION = "Content-Disposition"; public static final String DEFAULT_CONTENTTYPE_UNKNOWN_UNKNOWN = "unknown/unknown"; public static final String DEFAULT_FILENAME_FROM_STORAGE_MANAGER = "fromStorageManager"; public static final String CONTENT_LENGTH = "Content-Length"; diff --git a/src/main/java/org/gcube/datatransfer/resolver/services/StorageHubResolver.java b/src/main/java/org/gcube/datatransfer/resolver/services/StorageHubResolver.java index 8b5269a..c71206d 100644 --- a/src/main/java/org/gcube/datatransfer/resolver/services/StorageHubResolver.java +++ b/src/main/java/org/gcube/datatransfer/resolver/services/StorageHubResolver.java @@ -1,7 +1,5 @@ package org.gcube.datatransfer.resolver.services; -import static org.gcube.common.storagehub.model.Constants.versionPrefix; - import javax.enterprise.context.RequestScoped; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.GET; @@ -142,13 +140,13 @@ public class StorageHubResolver { } /** - * Download version. + * Download version. NEVER USED * * @param req the req * @param version the version * @return the response */ - @GET + /*@GET @Path("{version}") public Response downloadVersion(@Context HttpServletRequest req, @PathParam("version") String version) { logger.info(this.getClass().getSimpleName() +" GET downloadVersion called"); @@ -195,5 +193,5 @@ public class StorageHubResolver { logger.error("Exception:", e); throw (WebApplicationException) e; } - } + }*/ } diff --git a/src/main/java/org/gcube/datatransfer/resolver/services/StorageIDResolver.java b/src/main/java/org/gcube/datatransfer/resolver/services/StorageIDResolver.java index 30eb13f..6bccdb0 100644 --- a/src/main/java/org/gcube/datatransfer/resolver/services/StorageIDResolver.java +++ b/src/main/java/org/gcube/datatransfer/resolver/services/StorageIDResolver.java @@ -162,7 +162,7 @@ public class StorageIDResolver { ResponseBuilder response = Response .ok(so) - .header(ConstantsResolver.CONTENT_DISPOSITION,"attachment; filename = \""+fileName+"\"") + .header(ConstantsResolver.CONTENT_DISPOSITION,"attachment; filename=\""+fileName+"\"") .header(ConstantsResolver.CONTENT_LENGTH, size); if (contentType!= null) diff --git a/src/main/java/org/gcube/datatransfer/resolver/util/StorageHubMetadataResponseBuilder.java b/src/main/java/org/gcube/datatransfer/resolver/util/StorageHubMetadataResponseBuilder.java index e40b3d9..cee3408 100644 --- a/src/main/java/org/gcube/datatransfer/resolver/util/StorageHubMetadataResponseBuilder.java +++ b/src/main/java/org/gcube/datatransfer/resolver/util/StorageHubMetadataResponseBuilder.java @@ -9,6 +9,7 @@ import javax.ws.rs.core.Response.ResponseBuilder; import org.gcube.common.storagehub.client.StreamDescriptor; import org.gcube.common.storagehub.client.plugins.AbstractPlugin; import org.gcube.common.storagehub.client.proxies.ItemManagerClient; +import org.gcube.datatransfer.resolver.ConstantsResolver; /** @@ -38,7 +39,6 @@ public class StorageHubMetadataResponseBuilder { /** * Fill metadata. - * By default it adds the ETag (see at https://tools.ietf.org/html/rfc7232#section-2.3) to last version of entity * @param streamDescriptor the stream descriptor * @param entityId the entity id * @return the response builder @@ -46,17 +46,18 @@ public class StorageHubMetadataResponseBuilder { public ResponseBuilder fillMetadata(StreamDescriptor streamDescriptor, String entityId){ //Adding "Content-Disposition" - responseBuilder.header("Content-Disposition","attachment; filename = \""+streamDescriptor.getFileName()+"\""); + responseBuilder.header(ConstantsResolver.CONTENT_DISPOSITION,"attachment; filename=\""+streamDescriptor.getFileName()+"\""); //Adding "Content-Location" String contentLocation = String.format("%s/%s/%s", Util.getServerURL(request), "shub", entityId); responseBuilder.header("Content-Location", contentLocation); //Managing "Content-Type" - if (streamDescriptor.getContentType() != null && !streamDescriptor.getContentType().isEmpty()) + if (streamDescriptor.getContentType()!= null && !streamDescriptor.getContentType().isEmpty()) responseBuilder.header("Content-Type", streamDescriptor.getContentType()+"; charset=utf-8"); //Managing "ETag" + //Here is not feasible because the entityId is cripted // List versions = client.getFileVersions(entityId); // if(versions!=null && !versions.isEmpty()){ // responseBuilder.header("ETag", versions.get(versions.size()));