Removed unnecessary diffs from master and applied code formatter to all diffs

java/com.sap.sse.filestorage/src/com/sap/sse/filestorage/FileStorageService.java

@@ -35,7 +35,7 @@ public interface FileStorageService extends IsManagedByCache<FileStorageServiceR
      * From the given {@code uri} it should be possible to determine the file to remove.
      */
     void removeFile(URI uri) throws OperationFailedException, InvalidPropertiesException, IOException;
-    
+
     FileStorageServiceProperty[] getProperties();
 
     /**

java/com.sap.sse.filestorage/src/com/sap/sse/filestorage/impl/AmazonS3FileStorageServiceImpl.java

@@ -54,7 +54,7 @@ public class AmazonS3FileStorageServiceImpl extends BaseFileStorageServiceImpl i
 
     private AmazonS3Client createS3Client() throws InvalidPropertiesException {
         AWSCredentials creds;
-        
+
         // first try to use properties
         if (accessId.getValue() != null && accessKey.getValue() != null) {
             creds = new BasicAWSCredentials(accessId.getValue(), accessKey.getValue());
@@ -124,7 +124,7 @@ public class AmazonS3FileStorageServiceImpl extends BaseFileStorageServiceImpl i
         AmazonS3Client s3 = createS3Client();
 
         
-        if(bucketName.getValue().equals("")) {
+        if (bucketName.getValue().equals("")) {
             throw new InvalidPropertiesException("empty bucketname is not allowed");
         }
         // test if credentials are valid

java/com.sap.sse.filestorage/src/com/sap/sse/filestorage/impl/LocalFileStorageServiceImpl.java

@@ -82,7 +82,7 @@ public class LocalFileStorageServiceImpl extends BaseFileStorageServiceImpl impl
 
         return getUri(fileName);
     }
-    
+
     private static String getKey(String fileEnding) {
         String key = UUID.randomUUID().toString();
         key += fileEnding;

java/com.sap.sse.filestorage/src/com/sap/sse/filestorage/testsupport/DummyFileStorageService.java

@@ -41,4 +41,5 @@ public class DummyFileStorageService extends BaseFileStorageServiceImpl implemen
     @Override
     public void testProperties() throws InvalidPropertiesException {
     }
+
 }