This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch aws2-ddb in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit a013f61af886ca9d0d1581ae04ee347510c69665 Author: Andrea Cosentino <anco...@gmail.com> AuthorDate: Tue Jun 16 14:44:34 2020 +0200 Add an AWS2-DDB Native extension --- docs/modules/ROOT/pages/extensions/aws2-ddb.adoc | 2 +- .../pages/list-of-camel-quarkus-extensions.adoc | 4 +- .../aws2/ddb/deployment/Aws2DdbProcessor.java | 47 ------------- extensions-jvm/aws2-ddb/integration-test/pom.xml | 81 ---------------------- .../component/aws2/ddb/it/Aws2DdbResource.java | 64 ----------------- .../quarkus/component/aws2/ddb/it/Aws2DdbTest.java | 42 ----------- extensions-jvm/pom.xml | 1 - .../aws2-ddb/deployment/pom.xml | 14 +++- .../aws2/ddb/deployment/Aws2DdbProcessor.java | 67 ++++++++++++++++++ {extensions-jvm => extensions}/aws2-ddb/pom.xml | 1 - .../aws2-ddb/runtime/pom.xml | 16 +++-- .../main/resources/META-INF/quarkus-extension.yaml | 0 extensions/pom.xml | 1 + integration-tests/aws2/pom.xml | 4 ++ poms/bom/pom.xml | 6 ++ 15 files changed, 104 insertions(+), 246 deletions(-) diff --git a/docs/modules/ROOT/pages/extensions/aws2-ddb.adoc b/docs/modules/ROOT/pages/extensions/aws2-ddb.adoc index b64716b..0d5625d 100644 --- a/docs/modules/ROOT/pages/extensions/aws2-ddb.adoc +++ b/docs/modules/ROOT/pages/extensions/aws2-ddb.adoc @@ -5,7 +5,7 @@ = AWS 2 DynamoDB [.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## Store and retrieve data from AWS DynamoDB service or receive messages from AWS DynamoDB Stream using 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 25ff06d..07860cd 100644 --- a/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc +++ b/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc @@ -36,9 +36,9 @@ Number of Camel components: 149 in 114 JAR artifacts (0 deprecated) | xref:extensions/aws2-cw.adoc[AWS 2 CloudWatch] | camel-quarkus-aws2-cw | Native + Stable | 1.0.0-M6 | Sending metrics to AWS CloudWatch using AWS SDK version 2.x. -| xref:extensions/aws2-ddb.adoc[AWS 2 DynamoDB] | camel-quarkus-aws2-ddb | JVM + Preview | 1.0.0-M6 | Store and retrieve data from AWS DynamoDB service using AWS SDK version 2.x. +| xref:extensions/aws2-ddb.adoc[AWS 2 DynamoDB] | camel-quarkus-aws2-ddb | Native + Stable | 1.0.0-M6 | Store and retrieve data from AWS DynamoDB service using AWS SDK version 2.x. -| xref:extensions/aws2-ddb.adoc[AWS 2 DynamoDB Streams] | camel-quarkus-aws2-ddb | JVM + Preview | 1.0.0-M6 | Receive messages from AWS DynamoDB Stream service using AWS SDK version 2.x. +| xref:extensions/aws2-ddb.adoc[AWS 2 DynamoDB Streams] | camel-quarkus-aws2-ddb | Native + Stable | 1.0.0-M6 | Receive messages from AWS DynamoDB Stream service using AWS SDK version 2.x. | xref:extensions/aws2-ec2.adoc[AWS 2 EC2] | camel-quarkus-aws2-ec2 | Native + Stable | 1.0.0-M6 | Manage AWS EC2 instances using AWS SDK version 2.x. diff --git a/extensions-jvm/aws2-ddb/deployment/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/deployment/Aws2DdbProcessor.java b/extensions-jvm/aws2-ddb/deployment/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/deployment/Aws2DdbProcessor.java deleted file mode 100644 index f57dc0d..0000000 --- a/extensions-jvm/aws2-ddb/deployment/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/deployment/Aws2DdbProcessor.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.ddb.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 Aws2DdbProcessor { - private static final Logger LOG = Logger.getLogger(Aws2DdbProcessor.class); - - private static final String FEATURE = "camel-aws2-ddb"; - - @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-ddb/integration-test/pom.xml b/extensions-jvm/aws2-ddb/integration-test/pom.xml deleted file mode 100644 index f92bc37..0000000 --- a/extensions-jvm/aws2-ddb/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-ddb-integration-test</artifactId> - <name>Camel Quarkus :: AWS 2 DynamoDB :: Integration Test</name> - <description>Integration tests for Camel Quarkus AWS 2 DynamoDB 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-ddb-deployment,camel-quarkus-support-policy-deployment</mvnd.builder.rule> - </properties> - - <dependencies> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-aws2-ddb</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-ddb/integration-test/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbResource.java b/extensions-jvm/aws2-ddb/integration-test/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbResource.java deleted file mode 100644 index d6fc5ef..0000000 --- a/extensions-jvm/aws2-ddb/integration-test/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbResource.java +++ /dev/null @@ -1,64 +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.ddb.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-ddb") -@ApplicationScoped -public class Aws2DdbResource { - - private static final Logger LOG = Logger.getLogger(Aws2DdbResource.class); - - private static final String COMPONENT_AWS2_DDB = "aws2-ddb"; - private static final String COMPONENT_AWS2_DDBSTREAM = "aws2-ddbstream"; - @Inject - CamelContext context; - - @Path("/load/component/aws2-ddb") - @GET - @Produces(MediaType.TEXT_PLAIN) - public Response loadComponentAws2Ddb() throws Exception { - /* This is an autogenerated test */ - if (context.getComponent(COMPONENT_AWS2_DDB) != null) { - return Response.ok().build(); - } - LOG.warnf("Could not load [%s] from the Camel context", COMPONENT_AWS2_DDB); - return Response.status(500, COMPONENT_AWS2_DDB + " could not be loaded from the Camel context").build(); - } - - @Path("/load/component/aws2-ddbstream") - @GET - @Produces(MediaType.TEXT_PLAIN) - public Response loadComponentAws2Ddbstream() throws Exception { - /* This is an autogenerated test */ - if (context.getComponent(COMPONENT_AWS2_DDBSTREAM) != null) { - return Response.ok().build(); - } - LOG.warnf("Could not load [%s] from the Camel context", COMPONENT_AWS2_DDBSTREAM); - return Response.status(500, COMPONENT_AWS2_DDBSTREAM + " could not be loaded from the Camel context").build(); - } -} diff --git a/extensions-jvm/aws2-ddb/integration-test/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbTest.java b/extensions-jvm/aws2-ddb/integration-test/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbTest.java deleted file mode 100644 index 3deb4f8..0000000 --- a/extensions-jvm/aws2-ddb/integration-test/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbTest.java +++ /dev/null @@ -1,42 +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.ddb.it; - -import io.quarkus.test.junit.QuarkusTest; -import io.restassured.RestAssured; -import org.junit.jupiter.api.Test; - -@QuarkusTest -class Aws2DdbTest { - - @Test - public void loadComponentAws2Ddb() { - /* A simple autogenerated test */ - RestAssured.get("/aws2-ddb/load/component/aws2-ddb") - .then() - .statusCode(200); - } - - @Test - public void loadComponentAws2Ddbstream() { - /* A simple autogenerated test */ - RestAssured.get("/aws2-ddb/load/component/aws2-ddbstream") - .then() - .statusCode(200); - } - -} diff --git a/extensions-jvm/pom.xml b/extensions-jvm/pom.xml index 98f4a66..cbd5920 100644 --- a/extensions-jvm/pom.xml +++ b/extensions-jvm/pom.xml @@ -35,7 +35,6 @@ <modules> <!-- extensions a..z; do not remove this comment, it is important when sorting via mvn process-resources -Pformat --> <module>avro-rpc</module> - <module>aws2-ddb</module> <module>aws2-eks</module> <module>aws2-iam</module> <module>aws2-kms</module> diff --git a/extensions-jvm/aws2-ddb/deployment/pom.xml b/extensions/aws2-ddb/deployment/pom.xml similarity index 85% rename from extensions-jvm/aws2-ddb/deployment/pom.xml rename to extensions/aws2-ddb/deployment/pom.xml index 0386d66..84208a7 100644 --- a/extensions-jvm/aws2-ddb/deployment/pom.xml +++ b/extensions/aws2-ddb/deployment/pom.xml @@ -47,12 +47,20 @@ <artifactId>camel-quarkus-core-deployment</artifactId> </dependency> <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-amazon-dynamodb-deployment</artifactId> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-aws2-ddb</artifactId> </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-aws2-ddb</artifactId> + <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> diff --git a/extensions/aws2-ddb/deployment/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/deployment/Aws2DdbProcessor.java b/extensions/aws2-ddb/deployment/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/deployment/Aws2DdbProcessor.java new file mode 100644 index 0000000..7427ab6 --- /dev/null +++ b/extensions/aws2-ddb/deployment/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/deployment/Aws2DdbProcessor.java @@ -0,0 +1,67 @@ +/* + * 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.ddb.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 Aws2DdbProcessor { + private static final String FEATURE = "camel-aws2-ddb"; + + 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", + "software/amazon/awssdk/services/dynamodb/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-ddb/pom.xml b/extensions/aws2-ddb/pom.xml similarity index 97% rename from extensions-jvm/aws2-ddb/pom.xml rename to extensions/aws2-ddb/pom.xml index 47a01d0..25116c0 100644 --- a/extensions-jvm/aws2-ddb/pom.xml +++ b/extensions/aws2-ddb/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-ddb/runtime/pom.xml b/extensions/aws2-ddb/runtime/pom.xml similarity index 89% rename from extensions-jvm/aws2-ddb/runtime/pom.xml rename to extensions/aws2-ddb/runtime/pom.xml index 465726a..92be60b 100644 --- a/extensions-jvm/aws2-ddb/runtime/pom.xml +++ b/extensions/aws2-ddb/runtime/pom.xml @@ -52,13 +52,21 @@ <artifactId>camel-quarkus-core</artifactId> </dependency> <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-amazon-dynamodb</artifactId> - </dependency> - <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-aws2-ddb</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-ddb/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/aws2-ddb/runtime/src/main/resources/META-INF/quarkus-extension.yaml similarity index 100% rename from extensions-jvm/aws2-ddb/runtime/src/main/resources/META-INF/quarkus-extension.yaml rename to extensions/aws2-ddb/runtime/src/main/resources/META-INF/quarkus-extension.yaml diff --git a/extensions/pom.xml b/extensions/pom.xml index cc8032e..8b00b0e 100644 --- a/extensions/pom.xml +++ b/extensions/pom.xml @@ -52,6 +52,7 @@ <module>aws-sqs</module> <module>aws-swf</module> <module>aws-translate</module> + <module>aws2-ddb</module> <module>aws2-cw</module> <module>aws2-ec2</module> <module>aws2-ecs</module> diff --git a/integration-tests/aws2/pom.xml b/integration-tests/aws2/pom.xml index b7f14a5..7348c13 100644 --- a/integration-tests/aws2/pom.xml +++ b/integration-tests/aws2/pom.xml @@ -42,6 +42,10 @@ <dependencies> <dependency> <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-aws2-ddb</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-aws2-cw</artifactId> </dependency> <dependency> diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 38a887e..34715f3 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -231,6 +231,12 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-aws2-ddb</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>