CAMEL-12275 - Renamed classes to be compliant with other classes name

apache · Feb 17, 2018 · 18634f4 · 18634f4
1 parent 8c04bdb
commit 18634f4
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 32 deletions.
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java
@@ -30,7 +30,7 @@
 import org.apache.camel.Message;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
-import org.apache.camel.component.aws.s3.client.AWSS3ClientFactory;
+import org.apache.camel.component.aws.s3.client.S3ClientFactory;
 import org.apache.camel.impl.ScheduledPollEndpoint;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriEndpoint;
@@ -93,7 +93,7 @@ public void doStart() throws Exception {
         super.doStart();
 
         s3Client = configuration.getAmazonS3Client() != null ? configuration.getAmazonS3Client()
-                : AWSS3ClientFactory.getAWSS3Client(configuration, getMaxConnections()).getS3Client();
+                : S3ClientFactory.getAWSS3Client(configuration, getMaxConnections()).getS3Client();
 
         String fileName = getConfiguration().getFileName();
 

diff --git a/.../component/aws/s3/client/AWSS3Client.java → ...mel/component/aws/s3/client/S3Client.java b/.../component/aws/s3/client/AWSS3Client.java → ...mel/component/aws/s3/client/S3Client.java
@@ -21,7 +21,7 @@
 /**
  * Mange the required actions of an s3 client for either local or remote.
  */
-public interface AWSS3Client {
+public interface S3Client {
 
     /**
      * Returns an s3 client after a factory method determines which one to return.

diff --git a/...ent/aws/s3/client/AWSS3ClientFactory.java → ...ponent/aws/s3/client/S3ClientFactory.java b/...ent/aws/s3/client/AWSS3ClientFactory.java → ...ponent/aws/s3/client/S3ClientFactory.java
@@ -17,15 +17,15 @@
 package org.apache.camel.component.aws.s3.client;
 
 import org.apache.camel.component.aws.s3.S3Configuration;
-import org.apache.camel.component.aws.s3.client.impl.IAMOptimizedAWSS3ClientImpl;
-import org.apache.camel.component.aws.s3.client.impl.StandardAWSS3ClientImpl;
+import org.apache.camel.component.aws.s3.client.impl.S3ClientIAMOptimizedImpl;
+import org.apache.camel.component.aws.s3.client.impl.S3ClientStandardImpl;
 
 /**
  * Factory class to return the correct type of AWS S3 aws.
  */
-public final class AWSS3ClientFactory {
+public final class S3ClientFactory {
 
-    private AWSS3ClientFactory() {
+    private S3ClientFactory() {
         // Prevent instantiation of this factory class.
         throw new RuntimeException("Do not instantiate a Factory class! Refer to the class "
                                    + "to learn how to properly use this factory implementation.");
@@ -36,8 +36,8 @@ private AWSS3ClientFactory() {
      * @param maxConnections max connections
      * @return AWSS3Client
      */
-    public static AWSS3Client getAWSS3Client(S3Configuration configuration, int maxConnections) {
-        return configuration.isUseIAMCredentials() ? new IAMOptimizedAWSS3ClientImpl(configuration, maxConnections)
-                : new StandardAWSS3ClientImpl(configuration, maxConnections);
+    public static S3Client getAWSS3Client(S3Configuration configuration, int maxConnections) {
+        return configuration.isUseIAMCredentials() ? new S3ClientIAMOptimizedImpl(configuration, maxConnections)
+                : new S3ClientStandardImpl(configuration, maxConnections);
     }
 }
diff --git a/...ent/impl/IAMOptimizedAWSS3ClientImpl.java → ...client/impl/S3ClientIAMOptimizedImpl.java b/...ent/impl/IAMOptimizedAWSS3ClientImpl.java → ...client/impl/S3ClientIAMOptimizedImpl.java
@@ -25,7 +25,7 @@
 import com.amazonaws.services.s3.AmazonS3EncryptionClientBuilder;
 import com.amazonaws.services.s3.model.StaticEncryptionMaterialsProvider;
 import org.apache.camel.component.aws.s3.S3Configuration;
-import org.apache.camel.component.aws.s3.client.AWSS3Client;
+import org.apache.camel.component.aws.s3.client.S3Client;
 import org.apache.camel.util.ObjectHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -34,15 +34,15 @@
  * Manage an AWS s3 client for all users to use (enabling temporary creds).
  * This implementation is for remote instances to manage the credentials on their own (eliminating credential rotations)
  */
-public class IAMOptimizedAWSS3ClientImpl implements AWSS3Client {
-    private static final Logger LOG = LoggerFactory.getLogger(IAMOptimizedAWSS3ClientImpl.class);
+public class S3ClientIAMOptimizedImpl implements S3Client {
+    private static final Logger LOG = LoggerFactory.getLogger(S3ClientIAMOptimizedImpl.class);
     private S3Configuration configuration;
     private int maxConnections;
 
     /**
      * Constructor that uses the config file.
      */
-    public IAMOptimizedAWSS3ClientImpl(S3Configuration configuration, int maxConnections) {
+    public S3ClientIAMOptimizedImpl(S3Configuration configuration, int maxConnections) {
         LOG.trace("Creating an AWS S3 client for an ec2 instance with IAM temporary credentials (normal for ec2s).");
         this.configuration = configuration;
         this.maxConnections = maxConnections;

diff --git a/.../client/impl/StandardAWSS3ClientImpl.java → .../s3/client/impl/S3ClientStandardImpl.java b/.../client/impl/StandardAWSS3ClientImpl.java → .../s3/client/impl/S3ClientStandardImpl.java
@@ -28,7 +28,7 @@
 import com.amazonaws.services.s3.AmazonS3EncryptionClientBuilder;
 import com.amazonaws.services.s3.model.StaticEncryptionMaterialsProvider;
 import org.apache.camel.component.aws.s3.S3Configuration;
-import org.apache.camel.component.aws.s3.client.AWSS3Client;
+import org.apache.camel.component.aws.s3.client.S3Client;
 import org.apache.camel.util.ObjectHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -37,15 +37,15 @@
  * Manage an AWS s3 client for all users to use.
  * This implementation is for local instances to use a static and solid credential set.
  */
-public class StandardAWSS3ClientImpl implements AWSS3Client {
-    private static final Logger LOG = LoggerFactory.getLogger(StandardAWSS3ClientImpl.class);
+public class S3ClientStandardImpl implements S3Client {
+    private static final Logger LOG = LoggerFactory.getLogger(S3ClientStandardImpl.class);
     private S3Configuration configuration;
     private int maxConnections;
 
     /**
      * Constructor that uses the config file.
      */
-    public StandardAWSS3ClientImpl(S3Configuration configuration, int maxConnections) {
+    public S3ClientStandardImpl(S3Configuration configuration, int maxConnections) {
         LOG.trace("Creating an AWS S3 manager using static credentials.");
         this.configuration = configuration;
         this.maxConnections = maxConnections;

diff --git a/...nts/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AWSS3ClientFactoryTest.java b/...nts/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AWSS3ClientFactoryTest.java
@@ -17,10 +17,10 @@
 
 package org.apache.camel.component.aws.s3;
 
-import org.apache.camel.component.aws.s3.client.AWSS3Client;
-import org.apache.camel.component.aws.s3.client.AWSS3ClientFactory;
-import org.apache.camel.component.aws.s3.client.impl.IAMOptimizedAWSS3ClientImpl;
-import org.apache.camel.component.aws.s3.client.impl.StandardAWSS3ClientImpl;
+import org.apache.camel.component.aws.s3.client.S3Client;
+import org.apache.camel.component.aws.s3.client.S3ClientFactory;
+import org.apache.camel.component.aws.s3.client.impl.S3ClientIAMOptimizedImpl;
+import org.apache.camel.component.aws.s3.client.impl.S3ClientStandardImpl;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -30,23 +30,23 @@ public class AWSS3ClientFactoryTest {
     @Test
     public void getStandardS3ClientDefault() {
         S3Configuration s3Configuration = new S3Configuration();
-        AWSS3Client awss3Client = AWSS3ClientFactory.getAWSS3Client(s3Configuration, MAX_CONNECTIONS);
-        Assert.assertTrue(awss3Client instanceof StandardAWSS3ClientImpl);
+        S3Client awss3Client = S3ClientFactory.getAWSS3Client(s3Configuration, MAX_CONNECTIONS);
+        Assert.assertTrue(awss3Client instanceof S3ClientStandardImpl);
     }
 
     @Test
     public void getStandardS3Client() {
         S3Configuration s3Configuration = new S3Configuration();
         s3Configuration.setUseIAMCredentials(false);
-        AWSS3Client awss3Client = AWSS3ClientFactory.getAWSS3Client(s3Configuration, MAX_CONNECTIONS);
-        Assert.assertTrue(awss3Client instanceof StandardAWSS3ClientImpl);
+        S3Client awss3Client = S3ClientFactory.getAWSS3Client(s3Configuration, MAX_CONNECTIONS);
+        Assert.assertTrue(awss3Client instanceof S3ClientStandardImpl);
     }
 
     @Test
     public void getIAMOptimizedS3Client() {
         S3Configuration s3Configuration = new S3Configuration();
         s3Configuration.setUseIAMCredentials(true);
-        AWSS3Client awss3Client = AWSS3ClientFactory.getAWSS3Client(s3Configuration, MAX_CONNECTIONS);
-        Assert.assertTrue(awss3Client instanceof IAMOptimizedAWSS3ClientImpl);
+        S3Client awss3Client = S3ClientFactory.getAWSS3Client(s3Configuration, MAX_CONNECTIONS);
+        Assert.assertTrue(awss3Client instanceof S3ClientIAMOptimizedImpl);
     }
 }
diff --git a/...t/java/org/apache/camel/component/aws/s3/client/impl/IAMOptimizedAWSS3ClientImplTest.java b/...t/java/org/apache/camel/component/aws/s3/client/impl/IAMOptimizedAWSS3ClientImplTest.java
@@ -37,15 +37,15 @@ public class IAMOptimizedAWSS3ClientImplTest {
 
     @Test
     public void iamOptimizedAWSS3ClientImplNoEncryption() {
-        IAMOptimizedAWSS3ClientImpl iamOptimizedAWSS3Client = new IAMOptimizedAWSS3ClientImpl(getS3ConfigurationNoEncryption(), MAX_CONNECTIONS);
+        S3ClientIAMOptimizedImpl iamOptimizedAWSS3Client = new S3ClientIAMOptimizedImpl(getS3ConfigurationNoEncryption(), MAX_CONNECTIONS);
         AmazonS3 s3Client = iamOptimizedAWSS3Client.getS3Client();
         Assert.assertNotNull(s3Client);
         Assert.assertFalse(s3Client instanceof AmazonS3EncryptionClient);
     }
 
     @Test
     public void iamOptimizedAWSS3ClientImplUseEncryption() {
-        IAMOptimizedAWSS3ClientImpl iamOptimizedAWSS3Client = new IAMOptimizedAWSS3ClientImpl(getS3ConfigurationUseEncryption(), MAX_CONNECTIONS);
+        S3ClientIAMOptimizedImpl iamOptimizedAWSS3Client = new S3ClientIAMOptimizedImpl(getS3ConfigurationUseEncryption(), MAX_CONNECTIONS);
         AmazonS3 s3Client = iamOptimizedAWSS3Client.getS3Client();
         Assert.assertNotNull(s3Client);
         Assert.assertTrue(s3Client instanceof AmazonS3EncryptionClient);

diff --git a/.../test/java/org/apache/camel/component/aws/s3/client/impl/StandardAWSS3ClientImplTest.java b/.../test/java/org/apache/camel/component/aws/s3/client/impl/StandardAWSS3ClientImplTest.java
@@ -37,15 +37,15 @@ public class StandardAWSS3ClientImplTest {
 
     @Test
     public void standardAWSS3ClientImplNoEncryption() {
-        StandardAWSS3ClientImpl standardAWSS3Client = new StandardAWSS3ClientImpl(getS3ConfigurationNoEncryption(), MAX_CONNECTIONS);
+        S3ClientStandardImpl standardAWSS3Client = new S3ClientStandardImpl(getS3ConfigurationNoEncryption(), MAX_CONNECTIONS);
         AmazonS3 s3Client = standardAWSS3Client.getS3Client();
         Assert.assertNotNull(s3Client);
         Assert.assertFalse(s3Client instanceof AmazonS3EncryptionClient);
     }
 
     @Test
     public void standardAWSS3ClientImplUseEncryption() {
-        StandardAWSS3ClientImpl standardAWSS3Client = new StandardAWSS3ClientImpl(getS3ConfigurationUseEncryption(), MAX_CONNECTIONS);
+        S3ClientStandardImpl standardAWSS3Client = new S3ClientStandardImpl(getS3ConfigurationUseEncryption(), MAX_CONNECTIONS);
         AmazonS3 s3Client = standardAWSS3Client.getS3Client();
         Assert.assertNotNull(s3Client);
         Assert.assertTrue(s3Client instanceof AmazonS3EncryptionClient);