From e92a688be34d85f48387ccfcea7e7aa234af4d4e Mon Sep 17 00:00:00 2001
From: Axel Uhl <axel.uhl@sap.com>
Date: Fri, 27 Feb 2015 17:40:41 +0100
Subject: [PATCH] using Jersey Multipart 1.17.0 which is now consistent with
 our Jersey version 1.17.0 coming from the Eclipse Orbit

---
 .../META-INF/MANIFEST.MF                      |   2 +-
 .../jaxrs/api/FileStorageResource.java        |  31 +++++++++---------
 .../features/target-base/feature.xml          |   2 +-
 ...t-1.17.1.jar => jersey-multipart-1.17.jar} | Bin 52877 -> 52875 bytes
 .../adminconsole/URLFieldWithFileUpload.java  |   7 +++-
 5 files changed, 24 insertions(+), 18 deletions(-)
 rename java/com.sap.sailing.targetplatform.base/plugins/target-base/{jersey-multipart-1.17.1.jar => jersey-multipart-1.17.jar} (77%)
 mode change 100644 => 100755

diff --git a/java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF b/java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF
index 12fe41895b9..7798dd00600 100644
--- a/java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF
@@ -48,7 +48,7 @@ Require-Bundle: com.sap.sailing.domain,
  com.sap.sailing.server.gateway.serialization.shared.android,
  com.sap.sse.shared.android,
  com.sap.sse.filestorage,
- com.sun.jersey.contribs.jersey-multipart;bundle-version="1.17.1",
+ com.sun.jersey.contribs.jersey-multipart;bundle-version="1.17.0",
  com.sap.sse.security,
  org.apache.shiro.core;bundle-version="1.2.2",
  org.apache.shiro.web;bundle-version="1.2.2",
diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/FileStorageResource.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/FileStorageResource.java
index 40ceb741e09..0fa71f32ea4 100755
--- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/FileStorageResource.java
+++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/FileStorageResource.java
@@ -9,12 +9,12 @@ import java.util.logging.Logger;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
-import javax.ws.rs.HeaderParam;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 
@@ -24,6 +24,8 @@ import com.sap.sailing.server.gateway.jaxrs.AbstractSailingServerResource;
 import com.sap.sse.common.NoCorrespondingServiceRegisteredException;
 import com.sap.sse.filestorage.InvalidPropertiesException;
 import com.sap.sse.filestorage.OperationFailedException;
+import com.sun.jersey.multipart.FormDataBodyPart;
+import com.sun.jersey.multipart.FormDataParam;
 
 @Path("/v1/file")
 public class FileStorageResource extends AbstractSailingServerResource {
@@ -45,37 +47,36 @@ public class FileStorageResource extends AbstractSailingServerResource {
     //     --data-binary @<path-to-local-jpg> \
     //     http://127.0.0.1:8888/sailingserver/api/v1/file
     @POST
-    @Consumes({ "image/jpeg", "image/png" })
-    @Produces("application/json;charset=UTF-8")
-    public Response setTeamImage(InputStream uploadedInputStream,
-            @HeaderParam("Content-Type") String fileType, @HeaderParam("Content-Length") long sizeInBytes) {
+    @Consumes(MediaType.MULTIPART_FORM_DATA)
+    @Produces("text/html;charset=UTF-8")
+    public String uploadFile(@FormDataParam("file") InputStream uploadedInputStream, @FormDataParam("file") FormDataBodyPart filePart) {
         final JSONObject result = new JSONObject();
-        Response response;
         String fileExtension = "";
-        if (fileType.equals("image/jpeg")) {
-            fileExtension = ".jpg";
-        } else if (fileType.equals("image/png")) {
-            fileExtension = ".png";
+        MediaType fileType = filePart.getMediaType();
+        if (fileType.getType().equals("image")) {
+            if (fileType.getSubtype().equals("jpeg")) {
+                fileExtension = ".jpg";
+            } else if (fileType.getSubtype().equals("png")) {
+                fileExtension = ".png";
+            }
         }
 
         URI fileUri;
         try {
-            if (sizeInBytes > 1024 * 1024 * MAX_SIZE_IN_MB) {
+            if (filePart.getContentDisposition().getSize() > 1024 * 1024 * MAX_SIZE_IN_MB) {
                 throw new WebApplicationException(Response.status(Status.BAD_REQUEST)
                         .entity("Image is larger than " + MAX_SIZE_IN_MB + "MB").build());
             }
             fileUri = getService().getFileStorageManagementService().getActiveFileStorageService()
-                    .storeFile(uploadedInputStream, fileExtension, sizeInBytes);
+                    .storeFile(uploadedInputStream, fileExtension, filePart.getContentDisposition().getSize());
             result.put(JSON_FILE_URI, fileUri.toString());
-            response = Response.ok().entity(result.toJSONString()).build();
         } catch (IOException | OperationFailedException | InvalidPropertiesException e) {
             final String errorMessage = "Could not store file: "+e.getMessage();
             logger.log(Level.WARNING, "Could not store file", e);
             result.put("status", Status.INTERNAL_SERVER_ERROR.name());
             result.put("message", errorMessage);
-            response = Response.status(Status.INTERNAL_SERVER_ERROR).entity(result.toJSONString()).build();
         }
-        return response;
+        return result.toJSONString();
     }
     
     // Example test use:
diff --git a/java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml b/java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml
index a960807da65..cd5cd12d1b6 100755
--- a/java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml
+++ b/java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml
@@ -128,7 +128,7 @@
          id="com.sun.jersey.contribs.jersey-multipart"
          download-size="0"
          install-size="0"
-         version="1.17.1"
+         version="1.17.0"
          unpack="false"/>
 
    <plugin
diff --git a/java/com.sap.sailing.targetplatform.base/plugins/target-base/jersey-multipart-1.17.1.jar b/java/com.sap.sailing.targetplatform.base/plugins/target-base/jersey-multipart-1.17.jar
old mode 100644
new mode 100755
similarity index 77%
rename from java/com.sap.sailing.targetplatform.base/plugins/target-base/jersey-multipart-1.17.1.jar
rename to java/com.sap.sailing.targetplatform.base/plugins/target-base/jersey-multipart-1.17.jar
index f469e3948a3caf9ed6be9a46e4085591a704989c..34662e65646eb3f211c818b4ab9aa17576aef238
GIT binary patch
delta 5358
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

delta 5463
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
R@UMgkE+gz@?oIfW{{u+7YWM&E

diff --git a/java/com.sap.sse.gwt.adminconsole/src/com/sap/sse/gwt/adminconsole/URLFieldWithFileUpload.java b/java/com.sap.sse.gwt.adminconsole/src/com/sap/sse/gwt/adminconsole/URLFieldWithFileUpload.java
index 319dacf98f4..180cf511eb6 100755
--- a/java/com.sap.sse.gwt.adminconsole/src/com/sap/sse/gwt/adminconsole/URLFieldWithFileUpload.java
+++ b/java/com.sap.sse.gwt.adminconsole/src/com/sap/sse/gwt/adminconsole/URLFieldWithFileUpload.java
@@ -53,17 +53,21 @@ public class URLFieldWithFileUpload extends HorizontalPanel {
                 removePanel.submit();
             }
         });
+        removePanel.add(removeButton);
         urlTextBox = new TextBox();
         add(urlTextBox);
         FormPanel formPanel = new FormPanel();
+        HorizontalPanel formPanelContent = new HorizontalPanel();
+        formPanel.add(formPanelContent);
         formPanel.setAction("/sailingserver/api/v1/file");
         formPanel.setEncoding(FormPanel.ENCODING_MULTIPART);
         formPanel.setMethod(FormPanel.METHOD_POST);
         fileUploadField = new FileUpload();
+        formPanelContent.add(fileUploadField);
         final InputElement inputElement = fileUploadField.getElement().cast();
         inputElement.setName("file");
         SubmitButton submitButton = new SubmitButton(stringMessages.upload());
-        formPanel.add(submitButton);
+        formPanelContent.add(submitButton);
         add(formPanel);
         formPanel.addSubmitCompleteHandler(new SubmitCompleteHandler() {
             @Override
@@ -77,6 +81,7 @@ public class URLFieldWithFileUpload extends HorizontalPanel {
                 }
             }
         });
+        add(removePanel);
     }
 
     private void enableDelete() {