dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 21028
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2015-11-11 09:57:16 +0100
message:
  Minor
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/fileresource/JCloudsFileResourceContentStore.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/fileresource/JCloudsFileResourceContentStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/fileresource/JCloudsFileResourceContentStore.java	2015-11-10 23:04:08 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/fileresource/JCloudsFileResourceContentStore.java	2015-11-11 08:57:16 +0000
@@ -56,7 +56,6 @@
 import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.attribute.UserPrincipalNotFoundException;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
@@ -75,6 +74,8 @@
 
     private static final long FIVE_MINUTES_IN_SECONDS = Minutes.minutes( 5 ).toStandardDuration().getStandardSeconds();
 
+    private static final String DEFAULT_CONTAINER = "files";
+
     private BlobStore blobStore;
     private BlobStoreContext blobStoreContext;
     private String container;
@@ -87,18 +88,7 @@
     private static final String JCLOUDS_PROVIDER_KEY_AWS_S3 = "aws-s3";
     private static final String JCLOUDS_PROVIDER_KEY_TRANSIENT = "transient";
 
-    private static final List<String> SUPPORTED_PROVIDERS = new ArrayList<String>() {{
-        addAll( Arrays.asList(
-            JCLOUDS_PROVIDER_KEY_FILESYSTEM,
-            JCLOUDS_PROVIDER_KEY_AWS_S3
-        ) );
-    }};
-
-    // -------------------------------------------------------------------------
-    // Defaults
-    // -------------------------------------------------------------------------
-
-    private static final String DEFAULT_CONTAINER = "files";
+    private static final List<String> SUPPORTED_PROVIDERS = Arrays.asList( JCLOUDS_PROVIDER_KEY_FILESYSTEM, JCLOUDS_PROVIDER_KEY_AWS_S3 );
 
     // -------------------------------------------------------------------------
     // Dependencies
@@ -124,11 +114,11 @@
 
     public void init()
     {
-        // ---------------------------------------------------------------------
-        // Parse properties
-        // ---------------------------------------------------------------------
-
         String provider = configurationProvider.getProperty( ConfigurationKey.FILESTORE_PROVIDER );
+        String location = configurationProvider.getProperty( ConfigurationKey.FILE_STORE_LOCATION );
+        String identity = configurationProvider.getProperty( ConfigurationKey.FILE_STORE_IDENTITY );
+        String secret = configurationProvider.getProperty( ConfigurationKey.FILE_STORE_SECRET );
+
         provider = validateAndSelectProvider( provider );
 
         container = configurationProvider.getProperty( ConfigurationKey.FILE_STORE_CONTAINER );
@@ -145,10 +135,6 @@
             container = DEFAULT_CONTAINER;
         }
 
-        String location = configurationProvider.getProperty( ConfigurationKey.FILE_STORE_LOCATION );
-        String identity = configurationProvider.getProperty( ConfigurationKey.FILE_STORE_IDENTITY );
-        String secret = configurationProvider.getProperty( ConfigurationKey.FILE_STORE_SECRET );
-
         Properties overrides = new Properties();
 
         Credentials credentials = new Credentials( "Unused", "Unused" );