------------------------------------------------------------
revno: 20261
committer: Halvdan Hoem Grelland <halvda...@gmail.com>
branch nick: dhis2
timestamp: Mon 2015-09-21 14:56:46 +0200
message:
minor
modified:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/fileresource/DefaultFileResourceContentStore.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/DefaultFileResourceContentStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/fileresource/DefaultFileResourceContentStore.java 2015-09-18 21:24:50 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/fileresource/DefaultFileResourceContentStore.java 2015-09-21 12:56:46 +0000
@@ -130,14 +130,14 @@
Properties properties = configurationProvider.getConfiguration().getProperties();
- Map<String, String> filestoreConfiguration = properties
+ Map<String, String> fileStoreConfiguration = properties
.entrySet().stream().filter( p -> ((String) p.getKey()).startsWith( FILESTORE_CONFIG_NAMESPACE ) )
.collect( Collectors.toMap(
p -> StringUtils.strip( (String) p.getKey() ),
p -> StringUtils.strip( (String) p.getValue() )
) );
- String provider = filestoreConfiguration.getOrDefault( KEY_FILESTORE_PROVIDER, JCLOUDS_PROVIDER_KEY_FILESYSTEM );
+ String provider = fileStoreConfiguration.getOrDefault( KEY_FILESTORE_PROVIDER, JCLOUDS_PROVIDER_KEY_FILESYSTEM );
if ( !SUPPORTED_PROVIDERS.contains( provider ) )
{
@@ -151,9 +151,9 @@
provider = JCLOUDS_PROVIDER_KEY_TRANSIENT;
}
- container = filestoreConfiguration.getOrDefault( KEY_FILESTORE_CONTAINER, DEFAULT_CONTAINER );
+ container = fileStoreConfiguration.getOrDefault( KEY_FILESTORE_CONTAINER, DEFAULT_CONTAINER );
- String location = filestoreConfiguration.getOrDefault( KEY_FILESTORE_LOCATION, null );
+ String location = fileStoreConfiguration.getOrDefault( KEY_FILESTORE_LOCATION, null );
Properties overrides = new Properties();
Credentials credentials = new Credentials( "Unused", "Unused" );
@@ -169,8 +169,8 @@
}
else if ( provider.equals( JCLOUDS_PROVIDER_KEY_AWS_S3 ) )
{
- credentials = new Credentials( filestoreConfiguration.getOrDefault(
- KEY_FILESTORE_IDENTITY, "" ), filestoreConfiguration.getOrDefault( KEY_FILESTORE_SECRET, "" ) );
+ credentials = new Credentials( fileStoreConfiguration.getOrDefault(
+ KEY_FILESTORE_IDENTITY, "" ), fileStoreConfiguration.getOrDefault( KEY_FILESTORE_SECRET, "" ) );
log.info( "AWS S3 filestore provider configured." );
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
