You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/01/15 18:57:28 UTC

[camel] 02/09: CAMEL-13784 - Update to AWS SDK V2 - Created camel-aws2-translate, renamed to Translate2 avoiding clashes in endpoint-dsl

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 695bb7868929098a97589c554b690a502669c113
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Jan 15 15:45:07 2020 +0100

    CAMEL-13784 - Update to AWS SDK V2 - Created camel-aws2-translate, renamed to Translate2 avoiding clashes in endpoint-dsl
---
 .../src/main/docs/aws2-translate-component.adoc    |  6 +-
 ...lateComponent.java => Translate2Component.java} | 20 +++---
 ...a => Translate2ComponentVerifierExtension.java} |  8 +--
 ...iguration.java => Translate2Configuration.java} | 12 ++--
 ...lateConstants.java => Translate2Constants.java} |  2 +-
 ...nslateEndpoint.java => Translate2Endpoint.java} | 10 +--
 ...nguageEnum.java => Translate2LanguageEnum.java} |  4 +-
 ...teOperations.java => Translate2Operations.java} |  2 +-
 ...nslateProducer.java => Translate2Producer.java} | 24 +++----
 ...Test.java => Translate2ProducerSpringTest.java} | 16 ++---
 ...oducerTest.java => Translate2ProducerTest.java} | 10 +--
 ...java => Translate2ProducerIntegrationTest.java} | 18 ++---
 ...l => Translate2ComponentSpringTest-context.xml} |  0
 ....java => Translate2EndpointBuilderFactory.java} | 80 ++++++++++++----------
 .../dsl/TranslateEndpointBuilderFactory.java       | 34 ++++-----
 docs/components/modules/ROOT/nav.adoc              |  1 +
 .../ROOT/pages}/aws2-translate-component.adoc      |  1 +
 docs/components/modules/ROOT/pages/index.adoc      |  4 +-
 parent/pom.xml                                     |  5 ++
 19 files changed, 135 insertions(+), 122 deletions(-)

diff --git a/components/camel-aws2-translate/src/main/docs/aws2-translate-component.adoc b/components/camel-aws2-translate/src/main/docs/aws2-translate-component.adoc
index dff0724..cada20c 100644
--- a/components/camel-aws2-translate/src/main/docs/aws2-translate-component.adoc
+++ b/components/camel-aws2-translate/src/main/docs/aws2-translate-component.adoc
@@ -40,7 +40,7 @@ The AWS Translate component supports 6 options, which are listed below.
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
-| *configuration* (advanced) | The AWS Translate default configuration |  | TranslateConfiguration
+| *configuration* (advanced) | The AWS Translate default configuration |  | Translate2Configuration
 | *accessKey* (producer) | Amazon AWS Access Key |  | String
 | *secretKey* (producer) | Amazon AWS Secret Key |  | String
 | *region* (producer) | The region in which Translate client needs to work |  | String
@@ -80,7 +80,7 @@ with the following path and query parameters:
 | *accessKey* (producer) | Amazon AWS Access Key |  | String
 | *autodetectSourceLanguage* (producer) | Being able to autodetect the source language | false | boolean
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
-| *operation* (producer) | *Required* The operation to perform |  | TranslateOperations
+| *operation* (producer) | *Required* The operation to perform |  | Translate2Operations
 | *proxyHost* (producer) | To define a proxy host when instantiating the Translate client |  | String
 | *proxyPort* (producer) | To define a proxy port when instantiating the Translate client |  | Integer
 | *proxyProtocol* (producer) | To define a proxy protocol when instantiating the Translate client | HTTPS | Protocol
@@ -161,4 +161,4 @@ Maven users will need to add the following dependency to their pom.xml.
 </dependency>
 ---------------------------------------
 
-where `$\{camel-version\}` must be replaced by the actual version of Camel.
\ No newline at end of file
+where `$\{camel-version\}` must be replaced by the actual version of Camel.
diff --git a/components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/TranslateComponent.java b/components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2Component.java
similarity index 82%
rename from components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/TranslateComponent.java
rename to components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2Component.java
index f888807..82cbee0 100644
--- a/components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/TranslateComponent.java
+++ b/components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2Component.java
@@ -33,7 +33,7 @@ import software.amazon.awssdk.services.translate.TranslateClient;
  * For working with Amazon Translate.
  */
 @Component("aws2-translate")
-public class TranslateComponent extends DefaultComponent {
+public class Translate2Component extends DefaultComponent {
 
     @Metadata
     private String accessKey;
@@ -42,23 +42,23 @@ public class TranslateComponent extends DefaultComponent {
     @Metadata
     private String region;
     @Metadata(label = "advanced")
-    private TranslateConfiguration configuration;
+    private Translate2Configuration configuration;
 
-    public TranslateComponent() {
+    public Translate2Component() {
         this(null);
     }
 
-    public TranslateComponent(CamelContext context) {
+    public Translate2Component(CamelContext context) {
         super(context);
 
-        registerExtension(new TranslateComponentVerifierExtension());
+        registerExtension(new Translate2ComponentVerifierExtension());
     }
 
     @Override
     protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
-        TranslateConfiguration configuration = this.configuration != null ? this.configuration.copy() : new TranslateConfiguration();
+        Translate2Configuration configuration = this.configuration != null ? this.configuration.copy() : new Translate2Configuration();
 
-        TranslateEndpoint endpoint = new TranslateEndpoint(uri, this, configuration);
+        Translate2Endpoint endpoint = new Translate2Endpoint(uri, this, configuration);
         endpoint.getConfiguration().setAccessKey(accessKey);
         endpoint.getConfiguration().setSecretKey(secretKey);
         endpoint.getConfiguration().setRegion(region);
@@ -70,14 +70,14 @@ public class TranslateComponent extends DefaultComponent {
         return endpoint;
     }
 
-    public TranslateConfiguration getConfiguration() {
+    public Translate2Configuration getConfiguration() {
         return configuration;
     }
 
     /**
      * The AWS Translate default configuration
      */
-    public void setConfiguration(TranslateConfiguration configuration) {
+    public void setConfiguration(Translate2Configuration configuration) {
         this.configuration = configuration;
     }
 
@@ -114,7 +114,7 @@ public class TranslateComponent extends DefaultComponent {
         this.region = region;
     }
 
-    private void checkAndSetRegistryClient(TranslateConfiguration configuration) {
+    private void checkAndSetRegistryClient(Translate2Configuration configuration) {
         Set<TranslateClient> clients = getCamelContext().getRegistry().findByType(TranslateClient.class);
         if (clients.size() == 1) {
             configuration.setTranslateClient(clients.stream().findFirst().get());
diff --git a/components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/TranslateComponentVerifierExtension.java b/components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2ComponentVerifierExtension.java
similarity index 92%
rename from components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/TranslateComponentVerifierExtension.java
rename to components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2ComponentVerifierExtension.java
index 3e39093..f015962 100644
--- a/components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/TranslateComponentVerifierExtension.java
+++ b/components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2ComponentVerifierExtension.java
@@ -31,13 +31,13 @@ import software.amazon.awssdk.services.translate.TranslateClient;
 import software.amazon.awssdk.services.translate.TranslateClientBuilder;
 import software.amazon.awssdk.services.translate.model.TranslateTextRequest;
 
-public class TranslateComponentVerifierExtension extends DefaultComponentVerifierExtension {
+public class Translate2ComponentVerifierExtension extends DefaultComponentVerifierExtension {
 
-    public TranslateComponentVerifierExtension() {
+    public Translate2ComponentVerifierExtension() {
         this("aws2-translate");
     }
 
-    public TranslateComponentVerifierExtension(String scheme) {
+    public Translate2ComponentVerifierExtension(String scheme) {
         super(scheme);
     }
 
@@ -67,7 +67,7 @@ public class TranslateComponentVerifierExtension extends DefaultComponentVerifie
         ResultBuilder builder = ResultBuilder.withStatusAndScope(Result.Status.OK, Scope.CONNECTIVITY);
 
         try {
-            TranslateConfiguration configuration = setProperties(new TranslateConfiguration(), parameters);
+            Translate2Configuration configuration = setProperties(new Translate2Configuration(), parameters);
             AwsCredentialsProvider credentialsProvider = DefaultCredentialsProvider.create();
             TranslateClientBuilder clientBuilder = TranslateClient.builder();
             TranslateClient client = clientBuilder.credentialsProvider(credentialsProvider).region(Region.of(configuration.getRegion())).build();
diff --git a/components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/TranslateConfiguration.java b/components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2Configuration.java
similarity index 93%
rename from components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/TranslateConfiguration.java
rename to components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2Configuration.java
index 51fce9f..449a947 100644
--- a/components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/TranslateConfiguration.java
+++ b/components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2Configuration.java
@@ -26,7 +26,7 @@ import org.apache.camel.spi.UriParams;
 import org.apache.camel.spi.UriPath;
 
 @UriParams
-public class TranslateConfiguration implements Cloneable {
+public class Translate2Configuration implements Cloneable {
 
     @UriPath(description = "Logical name")
     @Metadata(required = true)
@@ -39,7 +39,7 @@ public class TranslateConfiguration implements Cloneable {
     private String secretKey;
     @UriParam(label = "producer")
     @Metadata(required = true, defaultValue = "translateText")
-    private TranslateOperations operation = TranslateOperations.translateText;
+    private Translate2Operations operation = Translate2Operations.translateText;
     @UriParam(enums = "HTTP,HTTPS", defaultValue = "HTTPS")
     private Protocol proxyProtocol = Protocol.HTTPS;
     @UriParam(label = "producer")
@@ -88,14 +88,14 @@ public class TranslateConfiguration implements Cloneable {
         this.secretKey = secretKey;
     }
 
-    public TranslateOperations getOperation() {
+    public Translate2Operations getOperation() {
         return operation;
     }
 
     /**
      * The operation to perform
      */
-    public void setOperation(TranslateOperations operation) {
+    public void setOperation(Translate2Operations operation) {
         this.operation = operation;
     }
 
@@ -183,9 +183,9 @@ public class TranslateConfiguration implements Cloneable {
     //
     // *************************************************
 
-    public TranslateConfiguration copy() {
+    public Translate2Configuration copy() {
         try {
-            return (TranslateConfiguration)super.clone();
+            return (Translate2Configuration)super.clone();
         } catch (CloneNotSupportedException e) {
             throw new RuntimeCamelException(e);
         }
diff --git a/components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/TranslateConstants.java b/components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2Constants.java
similarity index 96%
rename from components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/TranslateConstants.java
rename to components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2Constants.java
index 598c036..44ec30b 100644
--- a/components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/TranslateConstants.java
+++ b/components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2Constants.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.aws2.translate;
 /**
  * Constants used in Camel AWS Translate module
  */
-public interface TranslateConstants {
+public interface Translate2Constants {
     String SOURCE_LANGUAGE = "CamelAwsTranslateSourceLanguage";
     String TARGET_LANGUAGE = "CamelAwsTranslateTargetLanguage";
     String TERMINOLOGY_NAMES = "CamelAwsTranslateTerminologyNames";
diff --git a/components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/TranslateEndpoint.java b/components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2Endpoint.java
similarity index 93%
rename from components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/TranslateEndpoint.java
rename to components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2Endpoint.java
index 10a5360..c5c1394 100644
--- a/components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/TranslateEndpoint.java
+++ b/components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2Endpoint.java
@@ -39,14 +39,14 @@ import software.amazon.awssdk.services.translate.TranslateClientBuilder;
  * The aws2-translate component is used for managing Amazon Translate
  */
 @UriEndpoint(firstVersion = "3.1.0", scheme = "aws2-translate", title = "AWS Translate", syntax = "aws2-translate:label", producerOnly = true, label = "cloud,management")
-public class TranslateEndpoint extends ScheduledPollEndpoint {
+public class Translate2Endpoint extends ScheduledPollEndpoint {
 
     private TranslateClient translateClient;
 
     @UriParam
-    private TranslateConfiguration configuration;
+    private Translate2Configuration configuration;
 
-    public TranslateEndpoint(String uri, Component component, TranslateConfiguration configuration) {
+    public Translate2Endpoint(String uri, Component component, Translate2Configuration configuration) {
         super(uri, component);
         this.configuration = configuration;
     }
@@ -58,7 +58,7 @@ public class TranslateEndpoint extends ScheduledPollEndpoint {
 
     @Override
     public Producer createProducer() throws Exception {
-        return new TranslateProducer(this);
+        return new Translate2Producer(this);
     }
 
     @Override
@@ -78,7 +78,7 @@ public class TranslateEndpoint extends ScheduledPollEndpoint {
         super.doStop();
     }
 
-    public TranslateConfiguration getConfiguration() {
+    public Translate2Configuration getConfiguration() {
         return configuration;
     }
 
diff --git a/components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/TranslateLanguageEnum.java b/components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2LanguageEnum.java
similarity index 94%
rename from components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/TranslateLanguageEnum.java
rename to components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2LanguageEnum.java
index 7df9ec9..213258c 100644
--- a/components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/TranslateLanguageEnum.java
+++ b/components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2LanguageEnum.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.aws2.translate;
 
-public enum TranslateLanguageEnum {
+public enum Translate2LanguageEnum {
 
     ARABIC("ar"), CHINESE_SIMPLIFIED("zh"), CHINESE_TRADITIONAL("zh-TW"), CZECH("cs"), DANISH("da"), DUTCH("nl"), ENGLISH("en"), FINNISH("fi"), FRENCH("fr"), GERMAN("de"), HEBREW(
         "he"), HINDI("hi"), INDONESIAN("id"), ITALIAN("it"), JAPANESE(
@@ -24,7 +24,7 @@ public enum TranslateLanguageEnum {
 
     private final String language;
 
-    TranslateLanguageEnum(final String language) {
+    Translate2LanguageEnum(final String language) {
         this.language = language;
     }
 
diff --git a/components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/TranslateOperations.java b/components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2Operations.java
similarity index 96%
rename from components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/TranslateOperations.java
rename to components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2Operations.java
index 99a474a..2446503 100644
--- a/components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/TranslateOperations.java
+++ b/components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2Operations.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.aws2.translate;
 
-public enum TranslateOperations {
+public enum Translate2Operations {
 
     translateText
 }
diff --git a/components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/TranslateProducer.java b/components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2Producer.java
similarity index 87%
rename from components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/TranslateProducer.java
rename to components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2Producer.java
index ef758b3..0cea0a5 100644
--- a/components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/TranslateProducer.java
+++ b/components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2Producer.java
@@ -35,11 +35,11 @@ import software.amazon.awssdk.services.translate.model.TranslateTextResponse;
  * A Producer which sends messages to the Amazon Translate Service
  * <a href="http://aws.amazon.com/translate/">AWS Translate</a>
  */
-public class TranslateProducer extends DefaultProducer {
+public class Translate2Producer extends DefaultProducer {
 
     private transient String translateProducerToString;
 
-    public TranslateProducer(Endpoint endpoint) {
+    public Translate2Producer(Endpoint endpoint) {
         super(endpoint);
     }
 
@@ -54,15 +54,15 @@ public class TranslateProducer extends DefaultProducer {
         }
     }
 
-    private TranslateOperations determineOperation(Exchange exchange) {
-        TranslateOperations operation = exchange.getIn().getHeader(TranslateConstants.OPERATION, TranslateOperations.class);
+    private Translate2Operations determineOperation(Exchange exchange) {
+        Translate2Operations operation = exchange.getIn().getHeader(Translate2Constants.OPERATION, Translate2Operations.class);
         if (operation == null) {
             operation = getConfiguration().getOperation();
         }
         return operation;
     }
 
-    protected TranslateConfiguration getConfiguration() {
+    protected Translate2Configuration getConfiguration() {
         return getEndpoint().getConfiguration();
     }
 
@@ -75,16 +75,16 @@ public class TranslateProducer extends DefaultProducer {
     }
 
     @Override
-    public TranslateEndpoint getEndpoint() {
-        return (TranslateEndpoint)super.getEndpoint();
+    public Translate2Endpoint getEndpoint() {
+        return (Translate2Endpoint)super.getEndpoint();
     }
 
     private void translateText(TranslateClient translateClient, Exchange exchange) {
         Builder request = TranslateTextRequest.builder();
         if (!getConfiguration().isAutodetectSourceLanguage()) {
             if (ObjectHelper.isEmpty(getConfiguration().getSourceLanguage()) && ObjectHelper.isEmpty(getConfiguration().getTargetLanguage())) {
-                String source = exchange.getIn().getHeader(TranslateConstants.SOURCE_LANGUAGE, String.class);
-                String target = exchange.getIn().getHeader(TranslateConstants.TARGET_LANGUAGE, String.class);
+                String source = exchange.getIn().getHeader(Translate2Constants.SOURCE_LANGUAGE, String.class);
+                String target = exchange.getIn().getHeader(Translate2Constants.TARGET_LANGUAGE, String.class);
                 if (ObjectHelper.isEmpty(source) || ObjectHelper.isEmpty(target)) {
                     throw new IllegalArgumentException("Source and target language must be specified as headers or endpoint options");
                 }
@@ -97,7 +97,7 @@ public class TranslateProducer extends DefaultProducer {
         } else {
             String source = "auto";
             if (ObjectHelper.isEmpty(getConfiguration().getTargetLanguage())) {
-                String target = exchange.getIn().getHeader(TranslateConstants.TARGET_LANGUAGE, String.class);
+                String target = exchange.getIn().getHeader(Translate2Constants.TARGET_LANGUAGE, String.class);
                 if (ObjectHelper.isEmpty(source) || ObjectHelper.isEmpty(target)) {
                     throw new IllegalArgumentException("Target language must be specified when autodetection of source language is enabled");
                 }
@@ -108,8 +108,8 @@ public class TranslateProducer extends DefaultProducer {
                 request.targetLanguageCode(getConfiguration().getTargetLanguage());
             }
         }
-        if (!ObjectHelper.isEmpty(exchange.getIn().getHeader(TranslateConstants.TERMINOLOGY_NAMES, Collection.class))) {
-            Collection<String> terminologies = exchange.getIn().getHeader(TranslateConstants.TERMINOLOGY_NAMES, Collection.class);
+        if (!ObjectHelper.isEmpty(exchange.getIn().getHeader(Translate2Constants.TERMINOLOGY_NAMES, Collection.class))) {
+            Collection<String> terminologies = exchange.getIn().getHeader(Translate2Constants.TERMINOLOGY_NAMES, Collection.class);
             request.terminologyNames(terminologies);
         }
         request.text(exchange.getMessage().getBody(String.class));
diff --git a/components/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/TranslateProducerSpringTest.java b/components/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerSpringTest.java
similarity index 73%
rename from components/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/TranslateProducerSpringTest.java
rename to components/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerSpringTest.java
index 370425b..996e610 100644
--- a/components/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/TranslateProducerSpringTest.java
+++ b/components/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerSpringTest.java
@@ -19,15 +19,15 @@ package org.apache.camel.component.aws2.translate;
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
-import org.apache.camel.component.aws2.translate.TranslateConstants;
-import org.apache.camel.component.aws2.translate.TranslateLanguageEnum;
-import org.apache.camel.component.aws2.translate.TranslateOperations;
+import org.apache.camel.component.aws2.translate.Translate2Constants;
+import org.apache.camel.component.aws2.translate.Translate2LanguageEnum;
+import org.apache.camel.component.aws2.translate.Translate2Operations;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.spring.CamelSpringTestSupport;
 import org.junit.Test;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
-public class TranslateProducerSpringTest extends CamelSpringTestSupport {
+public class Translate2ProducerSpringTest extends CamelSpringTestSupport {
 
     @EndpointInject("mock:result")
     private MockEndpoint mock;
@@ -39,9 +39,9 @@ public class TranslateProducerSpringTest extends CamelSpringTestSupport {
         Exchange exchange = template.request("direct:translateText", new Processor() {
             @Override
             public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(TranslateConstants.OPERATION, TranslateOperations.translateText);
-                exchange.getIn().setHeader(TranslateConstants.SOURCE_LANGUAGE, TranslateLanguageEnum.ITALIAN);
-                exchange.getIn().setHeader(TranslateConstants.TARGET_LANGUAGE, TranslateLanguageEnum.ENGLISH);
+                exchange.getIn().setHeader(Translate2Constants.OPERATION, Translate2Operations.translateText);
+                exchange.getIn().setHeader(Translate2Constants.SOURCE_LANGUAGE, Translate2LanguageEnum.ITALIAN);
+                exchange.getIn().setHeader(Translate2Constants.TARGET_LANGUAGE, Translate2LanguageEnum.ENGLISH);
                 exchange.getIn().setBody("ciao");
             }
         });
@@ -55,6 +55,6 @@ public class TranslateProducerSpringTest extends CamelSpringTestSupport {
 
     @Override
     protected ClassPathXmlApplicationContext createApplicationContext() {
-        return new ClassPathXmlApplicationContext("org/apache/camel/component/aws2/translate/TranslateComponentSpringTest-context.xml");
+        return new ClassPathXmlApplicationContext("org/apache/camel/component/aws2/translate/Translate2ComponentSpringTest-context.xml");
     }
 }
diff --git a/components/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/TranslateProducerTest.java b/components/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerTest.java
similarity index 87%
rename from components/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/TranslateProducerTest.java
rename to components/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerTest.java
index cc4dcad..785d138 100644
--- a/components/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/TranslateProducerTest.java
+++ b/components/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerTest.java
@@ -21,13 +21,13 @@ import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.aws2.translate.TranslateConstants;
-import org.apache.camel.component.aws2.translate.TranslateLanguageEnum;
+import org.apache.camel.component.aws2.translate.Translate2Constants;
+import org.apache.camel.component.aws2.translate.Translate2LanguageEnum;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
-public class TranslateProducerTest extends CamelTestSupport {
+public class Translate2ProducerTest extends CamelTestSupport {
 
     @BindToRegistry("amazonTranslateClient")
     AmazonAWSTranslateMock clientMock = new AmazonAWSTranslateMock();
@@ -42,8 +42,8 @@ public class TranslateProducerTest extends CamelTestSupport {
         Exchange exchange = template.request("direct:translateText", new Processor() {
             @Override
             public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(TranslateConstants.SOURCE_LANGUAGE, TranslateLanguageEnum.ITALIAN);
-                exchange.getIn().setHeader(TranslateConstants.TARGET_LANGUAGE, TranslateLanguageEnum.ENGLISH);
+                exchange.getIn().setHeader(Translate2Constants.SOURCE_LANGUAGE, Translate2LanguageEnum.ITALIAN);
+                exchange.getIn().setHeader(Translate2Constants.TARGET_LANGUAGE, Translate2LanguageEnum.ENGLISH);
                 exchange.getIn().setBody("ciao");
             }
         });
diff --git a/components/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/integration/TranslateProducerIntegrationTest.java b/components/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/integration/Translate2ProducerIntegrationTest.java
similarity index 78%
rename from components/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/integration/TranslateProducerIntegrationTest.java
rename to components/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/integration/Translate2ProducerIntegrationTest.java
index 8445653..6dc1118 100644
--- a/components/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/integration/TranslateProducerIntegrationTest.java
+++ b/components/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/integration/Translate2ProducerIntegrationTest.java
@@ -20,16 +20,16 @@ import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.aws2.translate.TranslateConstants;
-import org.apache.camel.component.aws2.translate.TranslateLanguageEnum;
-import org.apache.camel.component.aws2.translate.TranslateOperations;
+import org.apache.camel.component.aws2.translate.Translate2Constants;
+import org.apache.camel.component.aws2.translate.Translate2LanguageEnum;
+import org.apache.camel.component.aws2.translate.Translate2Operations;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Ignore;
 import org.junit.Test;
 
 @Ignore("This test must be manually started, you need to specify AWS Credentials")
-public class TranslateProducerIntegrationTest extends CamelTestSupport {
+public class Translate2ProducerIntegrationTest extends CamelTestSupport {
 
     @EndpointInject("mock:result")
     private MockEndpoint mock;
@@ -41,9 +41,9 @@ public class TranslateProducerIntegrationTest extends CamelTestSupport {
         Exchange exchange = template.request("direct:translateText", new Processor() {
             @Override
             public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(TranslateConstants.OPERATION, TranslateOperations.translateText);
-                exchange.getIn().setHeader(TranslateConstants.SOURCE_LANGUAGE, TranslateLanguageEnum.ITALIAN);
-                exchange.getIn().setHeader(TranslateConstants.TARGET_LANGUAGE, TranslateLanguageEnum.GERMAN);
+                exchange.getIn().setHeader(Translate2Constants.OPERATION, Translate2Operations.translateText);
+                exchange.getIn().setHeader(Translate2Constants.SOURCE_LANGUAGE, Translate2LanguageEnum.ITALIAN);
+                exchange.getIn().setHeader(Translate2Constants.TARGET_LANGUAGE, Translate2LanguageEnum.GERMAN);
                 exchange.getIn().setBody("Ciao Signorina");
             }
         });
@@ -61,8 +61,8 @@ public class TranslateProducerIntegrationTest extends CamelTestSupport {
         Exchange exchange = template.request("direct:translateTextAuto", new Processor() {
             @Override
             public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(TranslateConstants.OPERATION, TranslateOperations.translateText);
-                exchange.getIn().setHeader(TranslateConstants.TARGET_LANGUAGE, TranslateLanguageEnum.GERMAN);
+                exchange.getIn().setHeader(Translate2Constants.OPERATION, Translate2Operations.translateText);
+                exchange.getIn().setHeader(Translate2Constants.TARGET_LANGUAGE, Translate2LanguageEnum.GERMAN);
                 exchange.getIn().setBody("Ciao Signorina");
             }
         });
diff --git a/components/camel-aws2-translate/src/test/resources/org/apache/camel/component/aws2/translate/TranslateComponentSpringTest-context.xml b/components/camel-aws2-translate/src/test/resources/org/apache/camel/component/aws2/translate/Translate2ComponentSpringTest-context.xml
similarity index 100%
rename from components/camel-aws2-translate/src/test/resources/org/apache/camel/component/aws2/translate/TranslateComponentSpringTest-context.xml
rename to components/camel-aws2-translate/src/test/resources/org/apache/camel/component/aws2/translate/Translate2ComponentSpringTest-context.xml
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TranslateEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/Translate2EndpointBuilderFactory.java
similarity index 81%
copy from core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TranslateEndpointBuilderFactory.java
copy to core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/Translate2EndpointBuilderFactory.java
index 3a508dc..dcd2513 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TranslateEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/Translate2EndpointBuilderFactory.java
@@ -27,15 +27,17 @@ import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
 @Generated("org.apache.camel.maven.packaging.EndpointDslMojo")
-public interface TranslateEndpointBuilderFactory {
+public interface Translate2EndpointBuilderFactory {
 
 
     /**
      * Builder for endpoint for the AWS Translate component.
      */
-    public interface TranslateEndpointBuilder extends EndpointProducerBuilder {
-        default AdvancedTranslateEndpointBuilder advanced() {
-            return (AdvancedTranslateEndpointBuilder) this;
+    public interface Translate2EndpointBuilder
+            extends
+                EndpointProducerBuilder {
+        default AdvancedTranslate2EndpointBuilder advanced() {
+            return (AdvancedTranslate2EndpointBuilder) this;
         }
         /**
          * Amazon AWS Access Key.
@@ -44,7 +46,7 @@ public interface TranslateEndpointBuilderFactory {
          * 
          * Group: producer
          */
-        default TranslateEndpointBuilder accessKey(String accessKey) {
+        default Translate2EndpointBuilder accessKey(String accessKey) {
             doSetProperty("accessKey", accessKey);
             return this;
         }
@@ -56,7 +58,7 @@ public interface TranslateEndpointBuilderFactory {
          * Default: false
          * Group: producer
          */
-        default TranslateEndpointBuilder autodetectSourceLanguage(
+        default Translate2EndpointBuilder autodetectSourceLanguage(
                 boolean autodetectSourceLanguage) {
             doSetProperty("autodetectSourceLanguage", autodetectSourceLanguage);
             return this;
@@ -69,7 +71,7 @@ public interface TranslateEndpointBuilderFactory {
          * Default: false
          * Group: producer
          */
-        default TranslateEndpointBuilder autodetectSourceLanguage(
+        default Translate2EndpointBuilder autodetectSourceLanguage(
                 String autodetectSourceLanguage) {
             doSetProperty("autodetectSourceLanguage", autodetectSourceLanguage);
             return this;
@@ -90,7 +92,7 @@ public interface TranslateEndpointBuilderFactory {
          * Default: false
          * Group: producer
          */
-        default TranslateEndpointBuilder lazyStartProducer(
+        default Translate2EndpointBuilder lazyStartProducer(
                 boolean lazyStartProducer) {
             doSetProperty("lazyStartProducer", lazyStartProducer);
             return this;
@@ -111,7 +113,7 @@ public interface TranslateEndpointBuilderFactory {
          * Default: false
          * Group: producer
          */
-        default TranslateEndpointBuilder lazyStartProducer(
+        default Translate2EndpointBuilder lazyStartProducer(
                 String lazyStartProducer) {
             doSetProperty("lazyStartProducer", lazyStartProducer);
             return this;
@@ -120,12 +122,13 @@ public interface TranslateEndpointBuilderFactory {
          * The operation to perform.
          * 
          * The option is a:
-         * <code>org.apache.camel.component.aws2.translate.TranslateOperations</code> type.
+         * <code>org.apache.camel.component.aws2.translate.Translate2Operations</code> type.
          * 
          * Required: true
          * Group: producer
          */
-        default TranslateEndpointBuilder operation(TranslateOperations operation) {
+        default Translate2EndpointBuilder operation(
+                Translate2Operations operation) {
             doSetProperty("operation", operation);
             return this;
         }
@@ -133,12 +136,12 @@ public interface TranslateEndpointBuilderFactory {
          * The operation to perform.
          * 
          * The option will be converted to a
-         * <code>org.apache.camel.component.aws2.translate.TranslateOperations</code> type.
+         * <code>org.apache.camel.component.aws2.translate.Translate2Operations</code> type.
          * 
          * Required: true
          * Group: producer
          */
-        default TranslateEndpointBuilder operation(String operation) {
+        default Translate2EndpointBuilder operation(String operation) {
             doSetProperty("operation", operation);
             return this;
         }
@@ -149,7 +152,7 @@ public interface TranslateEndpointBuilderFactory {
          * 
          * Group: producer
          */
-        default TranslateEndpointBuilder proxyHost(String proxyHost) {
+        default Translate2EndpointBuilder proxyHost(String proxyHost) {
             doSetProperty("proxyHost", proxyHost);
             return this;
         }
@@ -160,7 +163,7 @@ public interface TranslateEndpointBuilderFactory {
          * 
          * Group: producer
          */
-        default TranslateEndpointBuilder proxyPort(Integer proxyPort) {
+        default Translate2EndpointBuilder proxyPort(Integer proxyPort) {
             doSetProperty("proxyPort", proxyPort);
             return this;
         }
@@ -172,7 +175,7 @@ public interface TranslateEndpointBuilderFactory {
          * 
          * Group: producer
          */
-        default TranslateEndpointBuilder proxyPort(String proxyPort) {
+        default Translate2EndpointBuilder proxyPort(String proxyPort) {
             doSetProperty("proxyPort", proxyPort);
             return this;
         }
@@ -185,7 +188,7 @@ public interface TranslateEndpointBuilderFactory {
          * Default: HTTPS
          * Group: producer
          */
-        default TranslateEndpointBuilder proxyProtocol(Protocol proxyProtocol) {
+        default Translate2EndpointBuilder proxyProtocol(Protocol proxyProtocol) {
             doSetProperty("proxyProtocol", proxyProtocol);
             return this;
         }
@@ -198,7 +201,7 @@ public interface TranslateEndpointBuilderFactory {
          * Default: HTTPS
          * Group: producer
          */
-        default TranslateEndpointBuilder proxyProtocol(String proxyProtocol) {
+        default Translate2EndpointBuilder proxyProtocol(String proxyProtocol) {
             doSetProperty("proxyProtocol", proxyProtocol);
             return this;
         }
@@ -212,7 +215,7 @@ public interface TranslateEndpointBuilderFactory {
          * 
          * Group: producer
          */
-        default TranslateEndpointBuilder region(String region) {
+        default Translate2EndpointBuilder region(String region) {
             doSetProperty("region", region);
             return this;
         }
@@ -223,7 +226,7 @@ public interface TranslateEndpointBuilderFactory {
          * 
          * Group: producer
          */
-        default TranslateEndpointBuilder secretKey(String secretKey) {
+        default Translate2EndpointBuilder secretKey(String secretKey) {
             doSetProperty("secretKey", secretKey);
             return this;
         }
@@ -234,7 +237,7 @@ public interface TranslateEndpointBuilderFactory {
          * 
          * Group: producer
          */
-        default TranslateEndpointBuilder sourceLanguage(String sourceLanguage) {
+        default Translate2EndpointBuilder sourceLanguage(String sourceLanguage) {
             doSetProperty("sourceLanguage", sourceLanguage);
             return this;
         }
@@ -245,7 +248,7 @@ public interface TranslateEndpointBuilderFactory {
          * 
          * Group: producer
          */
-        default TranslateEndpointBuilder targetLanguage(String targetLanguage) {
+        default Translate2EndpointBuilder targetLanguage(String targetLanguage) {
             doSetProperty("targetLanguage", targetLanguage);
             return this;
         }
@@ -257,7 +260,7 @@ public interface TranslateEndpointBuilderFactory {
          * 
          * Group: producer
          */
-        default TranslateEndpointBuilder translateClient(Object translateClient) {
+        default Translate2EndpointBuilder translateClient(Object translateClient) {
             doSetProperty("translateClient", translateClient);
             return this;
         }
@@ -269,7 +272,7 @@ public interface TranslateEndpointBuilderFactory {
          * 
          * Group: producer
          */
-        default TranslateEndpointBuilder translateClient(String translateClient) {
+        default Translate2EndpointBuilder translateClient(String translateClient) {
             doSetProperty("translateClient", translateClient);
             return this;
         }
@@ -278,11 +281,11 @@ public interface TranslateEndpointBuilderFactory {
     /**
      * Advanced builder for endpoint for the AWS Translate component.
      */
-    public interface AdvancedTranslateEndpointBuilder
+    public interface AdvancedTranslate2EndpointBuilder
             extends
                 EndpointProducerBuilder {
-        default TranslateEndpointBuilder basic() {
-            return (TranslateEndpointBuilder) this;
+        default Translate2EndpointBuilder basic() {
+            return (Translate2EndpointBuilder) this;
         }
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
@@ -293,7 +296,7 @@ public interface TranslateEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedTranslateEndpointBuilder basicPropertyBinding(
+        default AdvancedTranslate2EndpointBuilder basicPropertyBinding(
                 boolean basicPropertyBinding) {
             doSetProperty("basicPropertyBinding", basicPropertyBinding);
             return this;
@@ -307,7 +310,7 @@ public interface TranslateEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedTranslateEndpointBuilder basicPropertyBinding(
+        default AdvancedTranslate2EndpointBuilder basicPropertyBinding(
                 String basicPropertyBinding) {
             doSetProperty("basicPropertyBinding", basicPropertyBinding);
             return this;
@@ -321,7 +324,8 @@ public interface TranslateEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedTranslateEndpointBuilder synchronous(boolean synchronous) {
+        default AdvancedTranslate2EndpointBuilder synchronous(
+                boolean synchronous) {
             doSetProperty("synchronous", synchronous);
             return this;
         }
@@ -334,7 +338,7 @@ public interface TranslateEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedTranslateEndpointBuilder synchronous(String synchronous) {
+        default AdvancedTranslate2EndpointBuilder synchronous(String synchronous) {
             doSetProperty("synchronous", synchronous);
             return this;
         }
@@ -342,9 +346,9 @@ public interface TranslateEndpointBuilderFactory {
 
     /**
      * Proxy enum for
-     * <code>org.apache.camel.component.aws2.translate.TranslateOperations</code> enum.
+     * <code>org.apache.camel.component.aws2.translate.Translate2Operations</code> enum.
      */
-    enum TranslateOperations {
+    enum Translate2Operations {
         translateText;
     }
 
@@ -368,12 +372,12 @@ public interface TranslateEndpointBuilderFactory {
      * Path parameter: label (required)
      * Logical name
      */
-    static TranslateEndpointBuilder awsTranslate(String path) {
-        class TranslateEndpointBuilderImpl extends AbstractEndpointBuilder implements TranslateEndpointBuilder, AdvancedTranslateEndpointBuilder {
-            public TranslateEndpointBuilderImpl(String path) {
+    default Translate2EndpointBuilder aws2Translate(String path) {
+        class Translate2EndpointBuilderImpl extends AbstractEndpointBuilder implements Translate2EndpointBuilder, AdvancedTranslate2EndpointBuilder {
+            public Translate2EndpointBuilderImpl(String path) {
                 super("aws2-translate", path);
             }
         }
-        return new TranslateEndpointBuilderImpl(path);
+        return new Translate2EndpointBuilderImpl(path);
     }
-}
+}
\ No newline at end of file
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TranslateEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TranslateEndpointBuilderFactory.java
index 3a508dc..511a770 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TranslateEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TranslateEndpointBuilderFactory.java
@@ -22,7 +22,7 @@ import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
 
 /**
- * The aws2-translate component is used for managing Amazon Translate
+ * The aws-translate component is used for managing Amazon Translate
  * 
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
@@ -120,7 +120,7 @@ public interface TranslateEndpointBuilderFactory {
          * The operation to perform.
          * 
          * The option is a:
-         * <code>org.apache.camel.component.aws2.translate.TranslateOperations</code> type.
+         * <code>org.apache.camel.component.aws.translate.TranslateOperations</code> type.
          * 
          * Required: true
          * Group: producer
@@ -133,7 +133,7 @@ public interface TranslateEndpointBuilderFactory {
          * The operation to perform.
          * 
          * The option will be converted to a
-         * <code>org.apache.camel.component.aws2.translate.TranslateOperations</code> type.
+         * <code>org.apache.camel.component.aws.translate.TranslateOperations</code> type.
          * 
          * Required: true
          * Group: producer
@@ -179,8 +179,7 @@ public interface TranslateEndpointBuilderFactory {
         /**
          * To define a proxy protocol when instantiating the Translate client.
          * 
-         * The option is a: <code>software.amazon.awssdk.core.Protocol</code>
-         * type.
+         * The option is a: <code>com.amazonaws.Protocol</code> type.
          * 
          * Default: HTTPS
          * Group: producer
@@ -192,8 +191,8 @@ public interface TranslateEndpointBuilderFactory {
         /**
          * To define a proxy protocol when instantiating the Translate client.
          * 
-         * The option will be converted to a
-         * <code>software.amazon.awssdk.core.Protocol</code> type.
+         * The option will be converted to a <code>com.amazonaws.Protocol</code>
+         * type.
          * 
          * Default: HTTPS
          * Group: producer
@@ -253,7 +252,7 @@ public interface TranslateEndpointBuilderFactory {
          * To use a existing configured AWS Translate as client.
          * 
          * The option is a:
-         * <code>software.amazon.awssdk.services.translate.TranslateClient</code> type.
+         * <code>com.amazonaws.services.translate.AmazonTranslate</code> type.
          * 
          * Group: producer
          */
@@ -265,7 +264,7 @@ public interface TranslateEndpointBuilderFactory {
          * To use a existing configured AWS Translate as client.
          * 
          * The option will be converted to a
-         * <code>software.amazon.awssdk.services.translate.TranslateClient</code> type.
+         * <code>com.amazonaws.services.translate.AmazonTranslate</code> type.
          * 
          * Group: producer
          */
@@ -342,28 +341,29 @@ public interface TranslateEndpointBuilderFactory {
 
     /**
      * Proxy enum for
-     * <code>org.apache.camel.component.aws2.translate.TranslateOperations</code> enum.
+     * <code>org.apache.camel.component.aws.translate.TranslateOperations</code>
+     * enum.
      */
     enum TranslateOperations {
         translateText;
     }
 
     /**
-     * Proxy enum for <code>software.amazon.awssdk.core.Protocol</code> enum.
+     * Proxy enum for <code>com.amazonaws.Protocol</code> enum.
      */
     enum Protocol {
         http,
         https;
     }
     /**
-     * AWS Translate (camel-aws2-translate)
-     * The aws2-translate component is used for managing Amazon Translate
+     * AWS Translate (camel-aws-translate)
+     * The aws-translate component is used for managing Amazon Translate
      * 
      * Category: cloud,management
-     * Since: 3.1
-     * Maven coordinates: org.apache.camel:camel-aws2-translate
+     * Since: 3.0
+     * Maven coordinates: org.apache.camel:camel-aws-translate
      * 
-     * Syntax: <code>aws2-translate:label</code>
+     * Syntax: <code>aws-translate:label</code>
      * 
      * Path parameter: label (required)
      * Logical name
@@ -371,7 +371,7 @@ public interface TranslateEndpointBuilderFactory {
     static TranslateEndpointBuilder awsTranslate(String path) {
         class TranslateEndpointBuilderImpl extends AbstractEndpointBuilder implements TranslateEndpointBuilder, AdvancedTranslateEndpointBuilder {
             public TranslateEndpointBuilderImpl(String path) {
-                super("aws2-translate", path);
+                super("aws-translate", path);
             }
         }
         return new TranslateEndpointBuilderImpl(path);
diff --git a/docs/components/modules/ROOT/nav.adoc b/docs/components/modules/ROOT/nav.adoc
index c1493ff..c4ec53b 100644
--- a/docs/components/modules/ROOT/nav.adoc
+++ b/docs/components/modules/ROOT/nav.adoc
@@ -43,6 +43,7 @@
 * xref:aws-swf-component.adoc[AWS Simple Workflow Component]
 * xref:aws-translate-component.adoc[AWS Translate Component]
 * xref:aws-xray.adoc[AWS XRay Component]
+* xref:aws2-translate-component.adoc[AWS Translate Component]
 * xref:azure-blob-component.adoc[Azure Storage Blob Service Component]
 * xref:azure-queue-component.adoc[Azure Storage Queue Service Component]
 * xref:azure.adoc[Camel Components for Windows Azure Services]
diff --git a/components/camel-aws2-translate/src/main/docs/aws2-translate-component.adoc b/docs/components/modules/ROOT/pages/aws2-translate-component.adoc
similarity index 98%
copy from components/camel-aws2-translate/src/main/docs/aws2-translate-component.adoc
copy to docs/components/modules/ROOT/pages/aws2-translate-component.adoc
index dff0724..dba984e 100644
--- a/components/camel-aws2-translate/src/main/docs/aws2-translate-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws2-translate-component.adoc
@@ -1,5 +1,6 @@
 [[aws2-translate-component]]
 = AWS Translate Component
+:page-source: components/camel-aws2-translate/src/main/docs/aws2-translate-component.adoc
 
 *Since Camel 3.1*
 
diff --git a/docs/components/modules/ROOT/pages/index.adoc b/docs/components/modules/ROOT/pages/index.adoc
index f07cf4f..f5ef4bd 100644
--- a/docs/components/modules/ROOT/pages/index.adoc
+++ b/docs/components/modules/ROOT/pages/index.adoc
@@ -6,7 +6,7 @@ The following Apache Camel artifacts are provided:
 == Components
 
 // components: START
-Number of Components: 308 in 245 JAR artifacts (1 deprecated)
+Number of Components: 309 in 247 JAR artifacts (1 deprecated)
 
 [width="100%",cols="4,1,5",options="header"]
 |===
@@ -86,6 +86,8 @@ Number of Components: 308 in 245 JAR artifacts (1 deprecated)
 
 | xref:aws-translate-component.adoc[AWS Translate] (camel-aws-translate) | 3.0 | The aws-translate component is used for managing Amazon Translate
 
+| xref:aws2-translate-component.adoc[AWS Translate] (camel-aws2-translate) | 3.1 | The aws2-translate component is used for managing Amazon Translate
+
 | xref:azure-blob-component.adoc[Azure Storage Blob Service] (camel-azure) | 2.19 | The azure-blob component is used for storing and retrieving blobs from Azure Storage Blob Service.
 
 | xref:azure-queue-component.adoc[Azure Storage Queue Service] (camel-azure) | 2.19 | The azure-queue component is used for storing and retrieving messages from Azure Storage Queue Service.
diff --git a/parent/pom.xml b/parent/pom.xml
index 508a742..f5dd58c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1000,6 +1000,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
+        <artifactId>camel-aws2-translate</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.camel</groupId>
         <artifactId>camel-azure</artifactId>
         <version>${project.version}</version>
       </dependency>