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 17e30384fc83f906b0b942f79644b7151d8f6fc7 Author: Andrea Cosentino <[email protected]> AuthorDate: Sat Dec 21 12:17:44 2019 +0100 CAMEL-14314 - Fixed CS --- .../aws/translate/TranslateConfiguration.java | 30 +++++++++---------- .../component/aws/translate/TranslateProducer.java | 34 +++++++++++----------- .../aws/translate/TranslateProducerTest.java | 5 ++-- 3 files changed, 35 insertions(+), 34 deletions(-) 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 d36a97e..7bf1356 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 @@ -155,34 +155,34 @@ public class TranslateConfiguration implements Cloneable { public void setAutodetectSourceLanguage(boolean autodetectSourceLanguage) { this.autodetectSourceLanguage = autodetectSourceLanguage; } - + public String getSourceLanguage() { - return sourceLanguage; - } + return sourceLanguage; + } /** * Source language to use */ - public void setSourceLanguage(String sourceLanguage) { - this.sourceLanguage = sourceLanguage; - } - - public String getTargetLanguage() { - return targetLanguage; - } - + public void setSourceLanguage(String sourceLanguage) { + this.sourceLanguage = sourceLanguage; + } + + public String getTargetLanguage() { + return targetLanguage; + } + /** * Target language to use */ - public void setTargetLanguage(String targetLanguage) { - this.targetLanguage = targetLanguage; - } + public void setTargetLanguage(String targetLanguage) { + this.targetLanguage = targetLanguage; + } // ************************************************* // // ************************************************* - public TranslateConfiguration copy() { + public TranslateConfiguration copy() { try { return (TranslateConfiguration)super.clone(); } catch (CloneNotSupportedException e) { 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 44b1a75..6b2cc56 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 @@ -80,29 +80,29 @@ public class TranslateProducer extends DefaultProducer { private void translateText(AmazonTranslate translateClient, Exchange exchange) { TranslateTextRequest request = new TranslateTextRequest(); 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); - if (ObjectHelper.isEmpty(source) || ObjectHelper.isEmpty(target)) { - throw new IllegalArgumentException("Source and target language must be specified as headers or endpoint options"); - } - request.setSourceLanguageCode(source); - request.setTargetLanguageCode(target); - } else { + 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); + if (ObjectHelper.isEmpty(source) || ObjectHelper.isEmpty(target)) { + throw new IllegalArgumentException("Source and target language must be specified as headers or endpoint options"); + } + request.setSourceLanguageCode(source); + request.setTargetLanguageCode(target); + } else { request.setSourceLanguageCode(getConfiguration().getSourceLanguage()); request.setTargetLanguageCode(getConfiguration().getTargetLanguage()); - } + } } else { String source = "auto"; if (ObjectHelper.isEmpty(getConfiguration().getTargetLanguage())) { - String target = exchange.getIn().getHeader(TranslateConstants.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"); - } - request.setSourceLanguageCode(source); - request.setTargetLanguageCode(target); + String target = exchange.getIn().getHeader(TranslateConstants.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"); + } + request.setSourceLanguageCode(source); + request.setTargetLanguageCode(target); } else { - request.setSourceLanguageCode(source); + request.setSourceLanguageCode(source); request.setTargetLanguageCode(getConfiguration().getTargetLanguage()); } } 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 cf41efc..5a2ba1d 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 @@ -52,7 +52,7 @@ public class TranslateProducerTest extends CamelTestSupport { assertEquals("Hello", resultGet); } - + @Test public void translateTextTestOptions() throws Exception { @@ -77,7 +77,8 @@ public class TranslateProducerTest extends CamelTestSupport { @Override public void configure() throws Exception { from("direct:translateText").to("aws-translate://test?translateClient=#amazonTranslateClient&operation=translateText").to("mock:result"); - from("direct:translateTextOptions").to("aws-translate://test?translateClient=#amazonTranslateClient&operation=translateText&sourceLanguage=it&targetLanguage=en").to("mock:result"); + from("direct:translateTextOptions").to("aws-translate://test?translateClient=#amazonTranslateClient&operation=translateText&sourceLanguage=it&targetLanguage=en") + .to("mock:result"); } }; }
