This is an automated email from the ASF dual-hosted git repository. rouazana pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit e81028fb91715217b1798192110f444fcb86a7fc Author: Antoine Duprat <adup...@linagora.com> AuthorDate: Wed Feb 27 09:26:52 2019 +0100 JAMES-2669 Standardize methods name for reading the object storage configuration --- .../james/modules/objectstorage/ObjectStorageBlobConfiguration.java | 4 ++-- .../james/modules/objectstorage/aws/s3/AwsS3ConfigurationReader.java | 2 +- .../james/modules/objectstorage/swift/SwiftAuthConfiguration.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/ObjectStorageBlobConfiguration.java b/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/ObjectStorageBlobConfiguration.java index e17da58..03d0b78 100644 --- a/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/ObjectStorageBlobConfiguration.java +++ b/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/ObjectStorageBlobConfiguration.java @@ -79,9 +79,9 @@ public class ObjectStorageBlobConfiguration { private static SpecificAuthConfiguration authConfiguration(String provider, Configuration configuration) throws ConfigurationException { switch (ObjectStorageProvider.from(provider)) { case SWIFT: - return SwiftAuthConfiguration.defineAuthApi(configuration); + return SwiftAuthConfiguration.from(configuration); case AWSS3: - return AwsS3ConfigurationReader.readAwsS3Configuration(configuration); + return AwsS3ConfigurationReader.from(configuration); } throw new ConfigurationException("Unknown object storage provider: " + provider); } diff --git a/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/aws/s3/AwsS3ConfigurationReader.java b/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/aws/s3/AwsS3ConfigurationReader.java index 6f36c91..0c23845 100644 --- a/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/aws/s3/AwsS3ConfigurationReader.java +++ b/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/aws/s3/AwsS3ConfigurationReader.java @@ -27,7 +27,7 @@ public class AwsS3ConfigurationReader { static final String OBJECTSTORAGE_ACCESKEYID = "objectstorage.s3.accessKeyId"; static final String OBJECTSTORAGE_SECRETKEY = "objectstorage.s3.secretKey"; - public static AwsS3AuthConfiguration readAwsS3Configuration(Configuration configuration) { + public static AwsS3AuthConfiguration from(Configuration configuration) { return AwsS3AuthConfiguration.builder() .endpoint(configuration.getString(OBJECTSTORAGE_ENDPOINT)) diff --git a/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/swift/SwiftAuthConfiguration.java b/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/swift/SwiftAuthConfiguration.java index 9ded9a5..bdda2d6 100644 --- a/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/swift/SwiftAuthConfiguration.java +++ b/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/swift/SwiftAuthConfiguration.java @@ -38,7 +38,7 @@ public class SwiftAuthConfiguration implements SpecificAuthConfiguration { private static final String OBJECTSTORAGE_SWIFT_AUTH_API = "objectstorage.swift.authapi"; - public static SwiftAuthConfiguration defineAuthApi(Configuration configuration) throws ConfigurationException { + public static SwiftAuthConfiguration from(Configuration configuration) throws ConfigurationException { String authApi = configuration.getString(OBJECTSTORAGE_SWIFT_AUTH_API, null); if (Strings.isNullOrEmpty(authApi)) { throw new ConfigurationException("Mandatory configuration value " + OBJECTSTORAGE_SWIFT_AUTH_API + " is missing from " + ObjectStorageBlobConfiguration.OBJECTSTORAGE_CONFIGURATION_NAME + " configuration"); --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org