CAMEL-12275 - Use Regions.valueOf since all other components use the …

…same approach
apache · Feb 17, 2018 · 8c04bdb · 8c04bdb
1 parent f240487
commit 8c04bdb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.../main/java/org/apache/camel/component/aws/s3/client/impl/IAMOptimizedAWSS3ClientImpl.java b/.../main/java/org/apache/camel/component/aws/s3/client/impl/IAMOptimizedAWSS3ClientImpl.java
@@ -92,13 +92,13 @@ public AmazonS3 getS3Client() {
 
         if (!configuration.isUseEncryption()) {
             if (ObjectHelper.isNotEmpty(configuration.getRegion())) {
-                clientBuilder = clientBuilder.withRegion(Regions.fromName(configuration.getRegion()));
+                clientBuilder = clientBuilder.withRegion(Regions.valueOf(configuration.getRegion()));
             }
             clientBuilder = clientBuilder.withPathStyleAccessEnabled(configuration.isPathStyleAccess());
             client = clientBuilder.build();
         } else {
             if (ObjectHelper.isNotEmpty(configuration.getRegion())) {
-                encClientBuilder = encClientBuilder.withRegion(Regions.fromName(configuration.getRegion()));
+                encClientBuilder = encClientBuilder.withRegion(Regions.valueOf(configuration.getRegion()));
             }
             encClientBuilder = encClientBuilder.withPathStyleAccessEnabled(configuration.isPathStyleAccess());
             client = encClientBuilder.build();

diff --git a/.../src/main/java/org/apache/camel/component/aws/s3/client/impl/StandardAWSS3ClientImpl.java b/.../src/main/java/org/apache/camel/component/aws/s3/client/impl/StandardAWSS3ClientImpl.java
@@ -94,13 +94,13 @@ public AmazonS3 getS3Client() {
 
             if (!configuration.isUseEncryption()) {
                 if (ObjectHelper.isNotEmpty(configuration.getRegion())) {
-                    clientBuilder = clientBuilder.withRegion(Regions.fromName(configuration.getRegion()));
+                    clientBuilder = clientBuilder.withRegion(Regions.valueOf(configuration.getRegion()));
                 }
                 clientBuilder = clientBuilder.withPathStyleAccessEnabled(configuration.isPathStyleAccess());
                 client = clientBuilder.build();
             } else {
                 if (ObjectHelper.isNotEmpty(configuration.getRegion())) {
-                    encClientBuilder = encClientBuilder.withRegion(Regions.fromName(configuration.getRegion()));
+                    encClientBuilder = encClientBuilder.withRegion(Regions.valueOf(configuration.getRegion()));
                 }
                 encClientBuilder = encClientBuilder.withPathStyleAccessEnabled(configuration.isPathStyleAccess());
                 client = encClientBuilder.build();