This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit 18634f4bc78e3c2222b9988f2970a51881d888d9 Author: Andrea Cosentino <[email protected]> AuthorDate: Sat Feb 17 11:44:42 2018 +0100 CAMEL-12275 - Renamed classes to be compliant with other classes name --- .../apache/camel/component/aws/s3/S3Endpoint.java | 4 ++-- .../s3/client/{AWSS3Client.java => S3Client.java} | 2 +- ...{AWSS3ClientFactory.java => S3ClientFactory.java} | 14 +++++++------- ...ClientImpl.java => S3ClientIAMOptimizedImpl.java} | 8 ++++---- ...WSS3ClientImpl.java => S3ClientStandardImpl.java} | 8 ++++---- .../component/aws/s3/AWSS3ClientFactoryTest.java | 20 ++++++++++---------- .../client/impl/IAMOptimizedAWSS3ClientImplTest.java | 4 ++-- .../s3/client/impl/StandardAWSS3ClientImplTest.java | 4 ++-- 8 files changed, 32 insertions(+), 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 index fd02c52..24dc311 100644 --- 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.ExchangePattern; 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 class S3Endpoint extends ScheduledPollEndpoint { 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/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/client/AWSS3Client.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/client/S3Client.java similarity index 97% rename from components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/client/AWSS3Client.java rename to components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/client/S3Client.java index b9dfe4c..d63a981 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/client/AWSS3Client.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/client/S3Client.java @@ -21,7 +21,7 @@ import com.amazonaws.services.s3.AmazonS3; /** * 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/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/client/AWSS3ClientFactory.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/client/S3ClientFactory.java similarity index 72% rename from components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/client/AWSS3ClientFactory.java rename to components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/client/S3ClientFactory.java index a38728a..95ea8d9 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/client/AWSS3ClientFactory.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/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 @@ public final class 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/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/client/impl/IAMOptimizedAWSS3ClientImpl.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/client/impl/S3ClientIAMOptimizedImpl.java similarity index 93% rename from components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/client/impl/IAMOptimizedAWSS3ClientImpl.java rename to components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/client/impl/S3ClientIAMOptimizedImpl.java index 020c9bd..21bfdcc 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/client/impl/IAMOptimizedAWSS3ClientImpl.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/client/impl/S3ClientIAMOptimizedImpl.java @@ -25,7 +25,7 @@ import com.amazonaws.services.s3.AmazonS3ClientBuilder; 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 @@ import org.slf4j.LoggerFactory; * 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/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/client/impl/StandardAWSS3ClientImpl.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/client/impl/S3ClientStandardImpl.java similarity index 95% rename from components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/client/impl/StandardAWSS3ClientImpl.java rename to components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/client/impl/S3ClientStandardImpl.java index 2a97163..24f0444 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/client/impl/StandardAWSS3ClientImpl.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/client/impl/S3ClientStandardImpl.java @@ -28,7 +28,7 @@ import com.amazonaws.services.s3.AmazonS3ClientBuilder; 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 @@ import org.slf4j.LoggerFactory; * 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/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AWSS3ClientFactoryTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AWSS3ClientFactoryTest.java index a28a704..2b240bb 100644 --- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AWSS3ClientFactoryTest.java +++ b/components/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); } } \ No newline at end of file diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/client/impl/IAMOptimizedAWSS3ClientImplTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/client/impl/IAMOptimizedAWSS3ClientImplTest.java index 571c409..7e14590 100644 --- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/client/impl/IAMOptimizedAWSS3ClientImplTest.java +++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/client/impl/IAMOptimizedAWSS3ClientImplTest.java @@ -37,7 +37,7 @@ 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); @@ -45,7 +45,7 @@ public class IAMOptimizedAWSS3ClientImplTest { @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/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/client/impl/StandardAWSS3ClientImplTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/client/impl/StandardAWSS3ClientImplTest.java index 014910d..5a95ccb 100644 --- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/client/impl/StandardAWSS3ClientImplTest.java +++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/client/impl/StandardAWSS3ClientImplTest.java @@ -37,7 +37,7 @@ 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); @@ -45,7 +45,7 @@ public class StandardAWSS3ClientImplTest { @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); -- To stop receiving notification emails like this one, please contact [email protected].
