Merge remote-tracking branch 'origin/jan-team-image' into ftes-file-storage

Conflicts: java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/TeamResource.java java/com.sap.sse.filestorage/src/com/sap/sse/filestorage/impl/AmazonS3FileStorageServiceImpl.java
2026-09-25 06:58:39 +00:00 · 2015-01-23 15:13:02 +01:00
parent b18632dda6 a15ccafbdb
commit c99af6e6a7
9 changed files with 224 additions and 123 deletions
@@ -91,7 +91,8 @@ public class AmazonS3FileStorageServiceImpl implements FileStorageService {

    private URI getUri(String key) {
        try {
-            return new URI(retrievalProtocol, bucketName.getValue() + "." + baseUrl, "/" + key, null);
+            // FIXME: region is missing s3-... see: http://stackoverflow.com/questions/10975475/amazon-s3-upload-file-and-get-url
+            return new URI(retrievalProtocol, baseUrl, "/" + bucketName.getValue() + "/" + key, null);
        } catch (URISyntaxException e) {
            logger.log(Level.WARNING, "Could not create URI for uploaded file with key " + key, e);
            return null;
@@ -128,7 +129,6 @@ public class AmazonS3FileStorageServiceImpl implements FileStorageService {
        }
        logger.info("Removed file " + uri);
    }
-
    @Override
    public Property[] getProperties() {
        return new Property[] { accessId, accessKey, bucketName };
@@ -0,0 +1,112 @@
+package com.sap.sse.filestorage.impl;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.UUID;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import com.sap.sse.filestorage.FileStorageService;
+import com.sap.sse.filestorage.InvalidPropertiesException;
+import com.sap.sse.filestorage.Property;
+
+public class LocalFileStorageServiceImpl implements FileStorageService {
+    private static final Logger logger = Logger.getLogger(LocalFileStorageServiceImpl.class.getName());
+
+    private static final String host = "media.sapsailing.com";
+    private static final String path = "images";
+    private static final String retrievalProtocol = "http";
+
+    @Override
+    public URI storeFile(InputStream is, String originalFileName, long lengthInBytes) throws IOException {
+        OutputStream outputStream = null;
+        String pathToFile = path + "/" + getKey(originalFileName);
+
+        outputStream = new FileOutputStream(new File(pathToFile));
+
+        try {
+            int read = 0;
+            byte[] bytes = new byte[1024];
+
+            while ((read = is.read(bytes)) != -1) {
+                outputStream.write(bytes, 0, read);
+            }
+
+        } finally {
+            if (is != null) {
+                is.close();
+            }
+            if (outputStream != null) {
+                outputStream.flush();
+                outputStream.close();
+            }
+        }
+
+        return getUri(pathToFile);
+    }
+
+    private static String getKey(String originalFileName) {
+        String key = UUID.randomUUID().toString();
+        if (originalFileName != null) {
+            String ending = originalFileName.substring(originalFileName.lastIndexOf("."));
+            key += ending;
+            // key += "/" + originalFileName;
+        }
+        return key;
+    }
+
+    private static URI getUri(String pathToFile) {
+        try {
+            return new URI(retrievalProtocol, host, pathToFile, null);
+        } catch (URISyntaxException e) {
+            logger.log(Level.WARNING, "Could not create URI for uploaded file with path " + pathToFile, e);
+            return null;
+        }
+    }
+
+    @Override
+    public void removeFile(URI uri) {
+        String filePath = uri.getPath();
+        File file = new File(filePath);
+        
+        if(!file.delete()){
+            logger.warning("Could not delete file with path "+filePath);
+        }
+    }
+
+    @Override
+    public Property[] getProperties() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public void setProperty(String name, String value) throws IllegalArgumentException {
+        // TODO Auto-generated method stub
+        
+    }
+
+    @Override
+    public String getName() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public String getDescription() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public void testProperties() throws InvalidPropertiesException {
+        // TODO Auto-generated method stub
+        
+    }
+
+}