This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch aws2-translate in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit a417015b7bdf3fbc528c1fddf2ee6df0545009a8 Author: Andrea Cosentino <[email protected]> AuthorDate: Mon Jun 8 11:46:04 2020 +0200 Added AWS2-Translate native extension --- .../ROOT/pages/extensions/aws2-translate.adoc | 2 +- .../pages/list-of-camel-quarkus-extensions.adoc | 2 +- .../deployment/Aws2TranslateProcessor.java | 47 ------------- .../aws2-translate/integration-test/pom.xml | 81 ---------------------- .../aws2/translate/it/Aws2TranslateResource.java | 51 -------------- .../aws2/translate/it/Aws2TranslateTest.java | 34 --------- extensions-jvm/pom.xml | 1 - .../aws2-translate/deployment/pom.xml | 12 ++++ .../deployment/Aws2TranslateProcessor.java | 65 +++++++++++++++++ .../aws2-translate/pom.xml | 1 - .../aws2-translate/runtime/pom.xml | 12 ++++ .../main/resources/META-INF/quarkus-extension.yaml | 0 extensions/pom.xml | 1 + integration-tests/aws2/pom.xml | 4 ++ .../camel/quarkus/component/aws2/CamelRoute.java | 9 +++ poms/bom/pom.xml | 6 ++ 16 files changed, 111 insertions(+), 217 deletions(-) diff --git a/docs/modules/ROOT/pages/extensions/aws2-translate.adoc b/docs/modules/ROOT/pages/extensions/aws2-translate.adoc index 4989bdf..9dbe76c 100644 --- a/docs/modules/ROOT/pages/extensions/aws2-translate.adoc +++ b/docs/modules/ROOT/pages/extensions/aws2-translate.adoc @@ -5,7 +5,7 @@ = AWS 2 Translate [.badges] -[.badge-key]##Since Camel Quarkus##[.badge-version]##1.0.0-M6## [.badge-key]##JVM##[.badge-supported]##supported## [.badge-key]##Native##[.badge-unsupported]##unsupported## +[.badge-key]##Since Camel Quarkus##[.badge-version]##1.0.0-M6## [.badge-key]##JVM##[.badge-supported]##supported## [.badge-key]##Native##[.badge-supported]##supported## Translate texts using AWS Translate and AWS SDK version 2.x. diff --git a/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc b/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc index 0aa5133..6c8e5f6 100644 --- a/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc +++ b/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc @@ -62,7 +62,7 @@ Number of Camel components: 148 in 113 JAR artifacts (0 deprecated) | xref:extensions/aws2-sqs.adoc[AWS 2 Simple Queue Service] | camel-quarkus-aws2-sqs | Native + Stable | 1.0.0-M6 | Sending and receive messages to/from AWS SQS service using AWS SDK version 2.x. -| xref:extensions/aws2-translate.adoc[AWS 2 Translate] | camel-quarkus-aws2-translate | JVM + Preview | 1.0.0-M6 | Translate texts using AWS Translate and AWS SDK version 2.x. +| xref:extensions/aws2-translate.adoc[AWS 2 Translate] | camel-quarkus-aws2-translate | Native + Stable | 1.0.0-M6 | Translate texts using AWS Translate and AWS SDK version 2.x. | xref:extensions/aws-ec2.adoc[AWS EC2] | camel-quarkus-aws-ec2 | Native + Stable | 1.0.0-M3 | Manage AWS EC2 instances. diff --git a/extensions-jvm/aws2-translate/deployment/src/main/java/org/apache/camel/quarkus/component/aws2/translate/deployment/Aws2TranslateProcessor.java b/extensions-jvm/aws2-translate/deployment/src/main/java/org/apache/camel/quarkus/component/aws2/translate/deployment/Aws2TranslateProcessor.java deleted file mode 100644 index 72f2f2f..0000000 --- a/extensions-jvm/aws2-translate/deployment/src/main/java/org/apache/camel/quarkus/component/aws2/translate/deployment/Aws2TranslateProcessor.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.quarkus.component.aws2.translate.deployment; - -import io.quarkus.deployment.annotations.BuildStep; -import io.quarkus.deployment.annotations.ExecutionTime; -import io.quarkus.deployment.annotations.Record; -import io.quarkus.deployment.builditem.FeatureBuildItem; -import io.quarkus.deployment.pkg.steps.NativeBuild; -import org.apache.camel.quarkus.core.JvmOnlyRecorder; -import org.jboss.logging.Logger; - -class Aws2TranslateProcessor { - private static final Logger LOG = Logger.getLogger(Aws2TranslateProcessor.class); - - private static final String FEATURE = "camel-aws2-translate"; - - @BuildStep - FeatureBuildItem feature() { - return new FeatureBuildItem(FEATURE); - } - - /** - * Remove this once this extension starts supporting the native mode. - */ - @BuildStep(onlyIf = NativeBuild.class) - @Record(value = ExecutionTime.RUNTIME_INIT) - void warnJvmInNative(JvmOnlyRecorder recorder) { - JvmOnlyRecorder.warnJvmInNative(LOG, FEATURE); // warn at build time - recorder.warnJvmInNative(FEATURE); // warn at runtime - } - -} diff --git a/extensions-jvm/aws2-translate/integration-test/pom.xml b/extensions-jvm/aws2-translate/integration-test/pom.xml deleted file mode 100644 index 73b578d..0000000 --- a/extensions-jvm/aws2-translate/integration-test/pom.xml +++ /dev/null @@ -1,81 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-build-parent-it</artifactId> - <version>1.1.0-SNAPSHOT</version> - <relativePath>../../../poms/build-parent-it/pom.xml</relativePath> - </parent> - - <artifactId>camel-quarkus-aws2-translate-integration-test</artifactId> - <name>Camel Quarkus :: AWS 2 Translate :: Integration Test</name> - <description>Integration tests for Camel Quarkus AWS 2 Translate extension</description> - - <properties> - <!-- mvnd, a.k.a. Maven Daemon: https://github.com/gnodet/mvnd --> - <!-- The following rule tells mvnd to build the listed deployment modules before this module. --> - <!-- This is important because mvnd builds modules in parallel by default. The deployment modules are not --> - <!-- explicit dependencies of this module in the Maven sense, although they are required by the Quarkus Maven plugin. --> - <!-- Please update rule whenever you change the dependencies of this module by running --> - <!-- mvn process-resources -Pformat from the root directory --> - <mvnd.builder.rule>camel-quarkus-aws2-translate-deployment,camel-quarkus-support-policy-deployment</mvnd.builder.rule> - </properties> - - <dependencies> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-aws2-translate</artifactId> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-resteasy</artifactId> - </dependency> - - <!-- test dependencies --> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-junit5</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>io.rest-assured</groupId> - <artifactId>rest-assured</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-maven-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>build</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> diff --git a/extensions-jvm/aws2-translate/integration-test/src/main/java/org/apache/camel/quarkus/component/aws2/translate/it/Aws2TranslateResource.java b/extensions-jvm/aws2-translate/integration-test/src/main/java/org/apache/camel/quarkus/component/aws2/translate/it/Aws2TranslateResource.java deleted file mode 100644 index 1962e96..0000000 --- a/extensions-jvm/aws2-translate/integration-test/src/main/java/org/apache/camel/quarkus/component/aws2/translate/it/Aws2TranslateResource.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.quarkus.component.aws2.translate.it; - -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; - -import org.apache.camel.CamelContext; -import org.jboss.logging.Logger; - -@Path("/aws2-translate") -@ApplicationScoped -public class Aws2TranslateResource { - - private static final Logger LOG = Logger.getLogger(Aws2TranslateResource.class); - - private static final String COMPONENT_AWS2_TRANSLATE = "aws2-translate"; - @Inject - CamelContext context; - - @Path("/load/component/aws2-translate") - @GET - @Produces(MediaType.TEXT_PLAIN) - public Response loadComponentAws2Translate() throws Exception { - /* This is an autogenerated test */ - if (context.getComponent(COMPONENT_AWS2_TRANSLATE) != null) { - return Response.ok().build(); - } - LOG.warnf("Could not load [%s] from the Camel context", COMPONENT_AWS2_TRANSLATE); - return Response.status(500, COMPONENT_AWS2_TRANSLATE + " could not be loaded from the Camel context").build(); - } -} diff --git a/extensions-jvm/aws2-translate/integration-test/src/test/java/org/apache/camel/quarkus/component/aws2/translate/it/Aws2TranslateTest.java b/extensions-jvm/aws2-translate/integration-test/src/test/java/org/apache/camel/quarkus/component/aws2/translate/it/Aws2TranslateTest.java deleted file mode 100644 index bc4c044..0000000 --- a/extensions-jvm/aws2-translate/integration-test/src/test/java/org/apache/camel/quarkus/component/aws2/translate/it/Aws2TranslateTest.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.quarkus.component.aws2.translate.it; - -import io.quarkus.test.junit.QuarkusTest; -import io.restassured.RestAssured; -import org.junit.jupiter.api.Test; - -@QuarkusTest -class Aws2TranslateTest { - - @Test - public void loadComponentAws2Translate() { - /* A simple autogenerated test */ - RestAssured.get("/aws2-translate/load/component/aws2-translate") - .then() - .statusCode(200); - } - -} diff --git a/extensions-jvm/pom.xml b/extensions-jvm/pom.xml index 24e13ea..a144e6a 100644 --- a/extensions-jvm/pom.xml +++ b/extensions-jvm/pom.xml @@ -43,7 +43,6 @@ <module>aws2-mq</module> <module>aws2-msk</module> <module>aws2-ses</module> - <module>aws2-translate</module> <module>cassandraql</module> <module>couchbase</module> <module>debezium-mongodb</module> diff --git a/extensions-jvm/aws2-translate/deployment/pom.xml b/extensions/aws2-translate/deployment/pom.xml similarity index 84% rename from extensions-jvm/aws2-translate/deployment/pom.xml rename to extensions/aws2-translate/deployment/pom.xml index 598afdd..6f0ead2 100644 --- a/extensions-jvm/aws2-translate/deployment/pom.xml +++ b/extensions/aws2-translate/deployment/pom.xml @@ -50,6 +50,18 @@ <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-aws2-translate</artifactId> </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-support-xml-deployment</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-support-commons-logging-deployment</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-support-aws2-deployment</artifactId> + </dependency> </dependencies> <build> diff --git a/extensions/aws2-translate/deployment/src/main/java/org/apache/camel/quarkus/component/aws2/translate/deployment/Aws2TranslateProcessor.java b/extensions/aws2-translate/deployment/src/main/java/org/apache/camel/quarkus/component/aws2/translate/deployment/Aws2TranslateProcessor.java new file mode 100644 index 0000000..baca30c --- /dev/null +++ b/extensions/aws2-translate/deployment/src/main/java/org/apache/camel/quarkus/component/aws2/translate/deployment/Aws2TranslateProcessor.java @@ -0,0 +1,65 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.quarkus.component.aws2.translate.deployment; + +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.CombinedIndexBuildItem; +import io.quarkus.deployment.builditem.FeatureBuildItem; +import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem; +import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; +import org.jboss.jandex.DotName; +import software.amazon.awssdk.core.interceptor.ExecutionInterceptor; + +class Aws2TranslateProcessor { + private static final String FEATURE = "camel-aws2-translate"; + + public static final String AWS_SDK_APPLICATION_ARCHIVE_MARKERS = "software/amazon/awssdk"; + + private static final List<String> INTERCEPTOR_PATHS = Arrays.asList( + "software/amazon/awssdk/global/handlers/execution.interceptors"); + + private static final DotName EXECUTION_INTERCEPTOR_NAME = DotName.createSimple(ExecutionInterceptor.class.getName()); + + @BuildStep + FeatureBuildItem feature() { + return new FeatureBuildItem(FEATURE); + } + + @BuildStep(applicationArchiveMarkers = { AWS_SDK_APPLICATION_ARCHIVE_MARKERS }) + void process(CombinedIndexBuildItem combinedIndexBuildItem, + BuildProducer<ReflectiveClassBuildItem> reflectiveClasses, + BuildProducer<NativeImageResourceBuildItem> resource) { + + INTERCEPTOR_PATHS.forEach(path -> resource.produce(new NativeImageResourceBuildItem(path))); + + List<String> knownInterceptorImpls = combinedIndexBuildItem.getIndex() + .getAllKnownImplementors(EXECUTION_INTERCEPTOR_NAME) + .stream() + .map(c -> c.name().toString()).collect(Collectors.toList()); + + reflectiveClasses.produce(new ReflectiveClassBuildItem(false, false, + knownInterceptorImpls.toArray(new String[knownInterceptorImpls.size()]))); + + reflectiveClasses.produce(new ReflectiveClassBuildItem(true, false, + String.class.getCanonicalName())); + } +} diff --git a/extensions-jvm/aws2-translate/pom.xml b/extensions/aws2-translate/pom.xml similarity index 97% rename from extensions-jvm/aws2-translate/pom.xml rename to extensions/aws2-translate/pom.xml index ae2cd65..cd6d911 100644 --- a/extensions-jvm/aws2-translate/pom.xml +++ b/extensions/aws2-translate/pom.xml @@ -33,6 +33,5 @@ <modules> <module>deployment</module> <module>runtime</module> - <module>integration-test</module> </modules> </project> diff --git a/extensions-jvm/aws2-translate/runtime/pom.xml b/extensions/aws2-translate/runtime/pom.xml similarity index 87% rename from extensions-jvm/aws2-translate/runtime/pom.xml rename to extensions/aws2-translate/runtime/pom.xml index 18cfbd1..9e7b230 100644 --- a/extensions-jvm/aws2-translate/runtime/pom.xml +++ b/extensions/aws2-translate/runtime/pom.xml @@ -54,6 +54,18 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-aws2-translate</artifactId> </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-support-aws2</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-support-xml</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-support-commons-logging</artifactId> + </dependency> </dependencies> <build> diff --git a/extensions-jvm/aws2-translate/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/aws2-translate/runtime/src/main/resources/META-INF/quarkus-extension.yaml similarity index 100% rename from extensions-jvm/aws2-translate/runtime/src/main/resources/META-INF/quarkus-extension.yaml rename to extensions/aws2-translate/runtime/src/main/resources/META-INF/quarkus-extension.yaml diff --git a/extensions/pom.xml b/extensions/pom.xml index e21a60f..5157622 100644 --- a/extensions/pom.xml +++ b/extensions/pom.xml @@ -57,6 +57,7 @@ <module>aws2-s3</module> <module>aws2-sns</module> <module>aws2-sqs</module> + <module>aws2-translate</module> <module>azure</module> <module>base64</module> <module>bean</module> diff --git a/integration-tests/aws2/pom.xml b/integration-tests/aws2/pom.xml index 8ed228b..89dfd99 100644 --- a/integration-tests/aws2/pom.xml +++ b/integration-tests/aws2/pom.xml @@ -62,6 +62,10 @@ </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-aws2-translate</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-log</artifactId> </dependency> <dependency> diff --git a/integration-tests/aws2/src/main/java/org/apache/camel/quarkus/component/aws2/CamelRoute.java b/integration-tests/aws2/src/main/java/org/apache/camel/quarkus/component/aws2/CamelRoute.java index 8db5fe8..6e44158 100644 --- a/integration-tests/aws2/src/main/java/org/apache/camel/quarkus/component/aws2/CamelRoute.java +++ b/integration-tests/aws2/src/main/java/org/apache/camel/quarkus/component/aws2/CamelRoute.java @@ -18,6 +18,8 @@ package org.apache.camel.quarkus.component.aws2; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.aws2.cw.Cw2Constants; +import org.apache.camel.component.aws2.translate.Translate2Constants; +import org.apache.camel.component.aws2.translate.Translate2LanguageEnum; public class CamelRoute extends RouteBuilder { @@ -51,6 +53,13 @@ public class CamelRoute extends RouteBuilder { .setHeader(Cw2Constants.METRIC_UNIT, constant("Count")) .to("aws2-cw://test") .to("log:sf?showAll=true"); + + from("timer:quarkus-translate?repeatCount=1") + .setHeader(Translate2Constants.SOURCE_LANGUAGE, constant(Translate2LanguageEnum.ITALIAN)) + .setHeader(Translate2Constants.TARGET_LANGUAGE, constant(Translate2LanguageEnum.GERMAN)) + .setBody(constant("Ciao")) + .to("aws2-translate://cluster?operation=translateText") + .log("Translation: ${body}"); } } diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 91200e9..93cbe8b 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -315,6 +315,12 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-aws2-translate</artifactId> <version>${camel.version}</version> + <exclusions> + <exclusion> + <groupId>software.amazon.awssdk</groupId> + <artifactId>netty-nio-client</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.camel</groupId>
