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 2019/09/12 06:14:46 UTC
[camel] branch master updated: Fixed CS for Camel-AWS Translate
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
The following commit(s) were added to refs/heads/master by this push:
new 49ef644 Fixed CS for Camel-AWS Translate
49ef644 is described below
commit 49ef644fa5c7352c7757a41e9893d2d107002543
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Sep 12 08:12:06 2019 +0200
Fixed CS for Camel-AWS Translate
---
.../component/aws/translate/TranslateComponent.java | 18 +++++++++---------
.../aws/translate/TranslateConfiguration.java | 12 +++++++-----
.../component/aws/translate/TranslateConstants.java | 6 +++---
.../component/aws/translate/TranslateEndpoint.java | 6 +++---
.../component/aws/translate/TranslateProducer.java | 8 ++++----
.../aws/translate/AmazonAWSTranslateMock.java | 4 ++--
.../aws/translate/TranslateProducerSpringTest.java | 10 +++++-----
.../component/aws/translate/TranslateProducerTest.java | 16 +++++++---------
.../integration/TranslateProducerIntegrationTest.java | 14 ++++++--------
9 files changed, 46 insertions(+), 48 deletions(-)
diff --git a/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateComponent.java b/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateComponent.java
index ae120c3..a54bd0a 100644
--- a/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateComponent.java
+++ b/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateComponent.java
@@ -19,6 +19,8 @@ package org.apache.camel.component.aws.translate;
import java.util.Map;
import java.util.Set;
+import com.amazonaws.services.translate.AmazonTranslate;
+
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.spi.Metadata;
@@ -26,8 +28,6 @@ import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.DefaultComponent;
import org.apache.camel.util.ObjectHelper;
-import com.amazonaws.services.translate.AmazonTranslate;
-
/**
* For working with Amazon Translate.
*/
@@ -40,16 +40,16 @@ public class TranslateComponent extends DefaultComponent {
private String secretKey;
@Metadata
private String region;
- @Metadata(label = "advanced")
+ @Metadata(label = "advanced")
private TranslateConfiguration configuration;
-
+
public TranslateComponent() {
this(null);
}
-
+
public TranslateComponent(CamelContext context) {
super(context);
-
+
this.configuration = new TranslateConfiguration();
registerExtension(new TranslateComponentVerifierExtension());
}
@@ -72,11 +72,11 @@ public class TranslateComponent extends DefaultComponent {
if (configuration.getTranslateClient() == null && (configuration.getAccessKey() == null || configuration.getSecretKey() == null)) {
throw new IllegalArgumentException("Amazon translate client or accessKey and secretKey must be specified");
}
-
+
TranslateEndpoint endpoint = new TranslateEndpoint(uri, this, configuration);
return endpoint;
}
-
+
public TranslateConfiguration getConfiguration() {
return configuration;
}
@@ -109,7 +109,7 @@ public class TranslateComponent extends DefaultComponent {
public void setSecretKey(String secretKey) {
configuration.setSecretKey(secretKey);
}
-
+
public String getRegion() {
return configuration.getRegion();
}
diff --git a/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateConfiguration.java b/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateConfiguration.java
index ea502bf..2c2833f 100644
--- a/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateConfiguration.java
+++ b/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateConfiguration.java
@@ -16,14 +16,14 @@
*/
package org.apache.camel.component.aws.translate;
+import com.amazonaws.services.translate.AmazonTranslate;
+
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
import org.apache.camel.spi.UriPath;
-import com.amazonaws.services.translate.AmazonTranslate;
-
@UriParams
public class TranslateConfiguration implements Cloneable {
@@ -117,13 +117,15 @@ public class TranslateConfiguration implements Cloneable {
}
/**
- * The region in which Translate client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1)
- * You'll need to use the name Regions.EU_WEST_1.name()
+ * The region in which Translate client needs to work. When using this
+ * parameter, the configuration will expect the capitalized name of the
+ * region (for example AP_EAST_1) You'll need to use the name
+ * Regions.EU_WEST_1.name()
*/
public void setRegion(String region) {
this.region = region;
}
-
+
// *************************************************
//
// *************************************************
diff --git a/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateConstants.java b/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateConstants.java
index 509a361..cff7148 100644
--- a/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateConstants.java
+++ b/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateConstants.java
@@ -20,7 +20,7 @@ package org.apache.camel.component.aws.translate;
* Constants used in Camel AWS Translate module
*/
public interface TranslateConstants {
- String SOURCE_LANGUAGE = "CamelAwsTranslateSourceLanguage";
- String TARGET_LANGUAGE = "CamelAwsTranslateTargetLanguage";
- String OPERATION = "CamelAwsTranslateOperation";
+ String SOURCE_LANGUAGE = "CamelAwsTranslateSourceLanguage";
+ String TARGET_LANGUAGE = "CamelAwsTranslateTargetLanguage";
+ String OPERATION = "CamelAwsTranslateOperation";
}
diff --git a/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateEndpoint.java b/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateEndpoint.java
index 8f3f458..abbb90b 100644
--- a/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateEndpoint.java
+++ b/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateEndpoint.java
@@ -66,12 +66,12 @@ public class TranslateEndpoint extends ScheduledPollEndpoint {
translateClient = configuration.getTranslateClient() != null ? configuration.getTranslateClient() : createTranslateClient();
}
-
+
@Override
public void doStop() throws Exception {
if (ObjectHelper.isEmpty(configuration.getTranslateClient())) {
if (translateClient != null) {
- translateClient.shutdown();
+ translateClient.shutdown();
}
}
super.doStop();
@@ -86,7 +86,7 @@ public class TranslateEndpoint extends ScheduledPollEndpoint {
}
AmazonTranslate createTranslateClient() {
- AmazonTranslate client = null;
+ AmazonTranslate client = null;
ClientConfiguration clientConfiguration = null;
AmazonTranslateClientBuilder clientBuilder = null;
boolean isClientConfigFound = false;
diff --git a/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateProducer.java b/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateProducer.java
index 3b6f819..76f16e1 100644
--- a/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateProducer.java
+++ b/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateProducer.java
@@ -44,7 +44,7 @@ public class TranslateProducer extends DefaultProducer {
public void process(Exchange exchange) throws Exception {
switch (determineOperation(exchange)) {
case translateText:
- translateText(getEndpoint().getTranslateClient(), exchange);
+ translateText(getEndpoint().getTranslateClient(), exchange);
break;
default:
throw new IllegalArgumentException("Unsupported operation");
@@ -81,7 +81,7 @@ public class TranslateProducer extends DefaultProducer {
String source = exchange.getIn().getHeader(TranslateConstants.SOURCE_LANGUAGE, String.class);
String target = exchange.getIn().getHeader(TranslateConstants.TARGET_LANGUAGE, String.class);
if (ObjectHelper.isEmpty(source) || ObjectHelper.isEmpty(target)) {
- throw new IllegalArgumentException("Source and target language must be specified");
+ throw new IllegalArgumentException("Source and target language must be specified");
}
request.setSourceLanguageCode(source);
request.setTargetLanguageCode(target);
@@ -96,7 +96,7 @@ public class TranslateProducer extends DefaultProducer {
Message message = getMessageForResponse(exchange);
message.setBody(result.getTranslatedText());
}
-
+
public static Message getMessageForResponse(final Exchange exchange) {
if (exchange.getPattern().isOutCapable()) {
Message out = exchange.getOut();
@@ -105,4 +105,4 @@ public class TranslateProducer extends DefaultProducer {
}
return exchange.getIn();
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-translate/src/test/java/org/apache/camel/component/aws/translate/AmazonAWSTranslateMock.java b/components/camel-aws-translate/src/test/java/org/apache/camel/component/aws/translate/AmazonAWSTranslateMock.java
index 6d0f0e3..50bd5a7 100644
--- a/components/camel-aws-translate/src/test/java/org/apache/camel/component/aws/translate/AmazonAWSTranslateMock.java
+++ b/components/camel-aws-translate/src/test/java/org/apache/camel/component/aws/translate/AmazonAWSTranslateMock.java
@@ -21,11 +21,11 @@ import com.amazonaws.services.translate.model.TranslateTextRequest;
import com.amazonaws.services.translate.model.TranslateTextResult;
public class AmazonAWSTranslateMock extends AbstractAmazonTranslate {
-
+
@Override
public TranslateTextResult translateText(TranslateTextRequest request) {
TranslateTextResult result = new TranslateTextResult();
result.setTranslatedText("Hello");
return result;
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-translate/src/test/java/org/apache/camel/component/aws/translate/TranslateProducerSpringTest.java b/components/camel-aws-translate/src/test/java/org/apache/camel/component/aws/translate/TranslateProducerSpringTest.java
index 816ab99..05fb745 100644
--- a/components/camel-aws-translate/src/test/java/org/apache/camel/component/aws/translate/TranslateProducerSpringTest.java
+++ b/components/camel-aws-translate/src/test/java/org/apache/camel/component/aws/translate/TranslateProducerSpringTest.java
@@ -25,10 +25,10 @@ import org.junit.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class TranslateProducerSpringTest extends CamelSpringTestSupport {
-
+
@EndpointInject("mock:result")
private MockEndpoint mock;
-
+
@Test
public void translateTextTest() throws Exception {
@@ -44,14 +44,14 @@ public class TranslateProducerSpringTest extends CamelSpringTestSupport {
});
assertMockEndpointsSatisfied();
-
+
String resultGet = exchange.getIn().getBody(String.class);
assertEquals("Hello", resultGet);
}
-
+
@Override
protected ClassPathXmlApplicationContext createApplicationContext() {
return new ClassPathXmlApplicationContext("org/apache/camel/component/aws/translate/TranslateComponentSpringTest-context.xml");
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-translate/src/test/java/org/apache/camel/component/aws/translate/TranslateProducerTest.java b/components/camel-aws-translate/src/test/java/org/apache/camel/component/aws/translate/TranslateProducerTest.java
index 73e2119..8187c6d 100644
--- a/components/camel-aws-translate/src/test/java/org/apache/camel/component/aws/translate/TranslateProducerTest.java
+++ b/components/camel-aws-translate/src/test/java/org/apache/camel/component/aws/translate/TranslateProducerTest.java
@@ -26,13 +26,13 @@ import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
public class TranslateProducerTest extends CamelTestSupport {
-
+
@BindToRegistry("amazonTranslateClient")
AmazonAWSTranslateMock clientMock = new AmazonAWSTranslateMock();
-
+
@EndpointInject("mock:result")
private MockEndpoint mock;
-
+
@Test
public void translateTextTest() throws Exception {
@@ -48,21 +48,19 @@ public class TranslateProducerTest extends CamelTestSupport {
});
assertMockEndpointsSatisfied();
-
+
String resultGet = exchange.getIn().getBody(String.class);
assertEquals("Hello", resultGet);
}
-
+
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("direct:translateText")
- .to("aws-translate://test?translateClient=#amazonTranslateClient&operation=translateText")
- .to("mock:result");
+ from("direct:translateText").to("aws-translate://test?translateClient=#amazonTranslateClient&operation=translateText").to("mock:result");
}
};
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-translate/src/test/java/org/apache/camel/component/aws/translate/integration/TranslateProducerIntegrationTest.java b/components/camel-aws-translate/src/test/java/org/apache/camel/component/aws/translate/integration/TranslateProducerIntegrationTest.java
index 74953f0..fc8b2ea 100644
--- a/components/camel-aws-translate/src/test/java/org/apache/camel/component/aws/translate/integration/TranslateProducerIntegrationTest.java
+++ b/components/camel-aws-translate/src/test/java/org/apache/camel/component/aws/translate/integration/TranslateProducerIntegrationTest.java
@@ -29,10 +29,10 @@ import org.junit.Test;
@Ignore("This test must be manually started, you need to specify AWS Credentials")
public class TranslateProducerIntegrationTest extends CamelTestSupport {
-
+
@EndpointInject("mock:result")
private MockEndpoint mock;
-
+
@Test
public void translateTextTest() throws Exception {
@@ -48,8 +48,8 @@ public class TranslateProducerIntegrationTest extends CamelTestSupport {
});
assertMockEndpointsSatisfied();
-
- String resultGet = (String) exchange.getIn().getBody();
+
+ String resultGet = (String)exchange.getIn().getBody();
assertEquals("Hallo, Miss.", resultGet);
}
@@ -58,10 +58,8 @@ public class TranslateProducerIntegrationTest extends CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("direct:translateText")
- .to("aws-translate://test?accessKey=RAW(xxxx)&secretKey=RAW(xxxx)®ion=EU_WEST_1&operation=translateText")
- .to("mock:result");
+ from("direct:translateText").to("aws-translate://test?accessKey=RAW(xxxx)&secretKey=RAW(xxxx)®ion=EU_WEST_1&operation=translateText").to("mock:result");
}
};
}
-}
\ No newline at end of file
+}