This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch aws2-msk in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 28abfaf1f570c2f8434a8f479bfded907ccf3c24 Author: Andrea Cosentino <anco...@gmail.com> AuthorDate: Fri Jun 19 10:57:59 2020 +0200 Added an AWS2-MSK native extension --- extensions-jvm/aws2-msk/integration-test/pom.xml | 81 ---------------------- .../component/aws2/msk/it/Aws2MskResource.java | 51 -------------- .../quarkus/component/aws2/msk/it/Aws2MskTest.java | 34 --------- extensions-jvm/pom.xml | 1 - .../aws2-msk/deployment/pom.xml | 12 ++++ .../aws2/msk/deployment/Aws2MskProcessor.java | 0 {extensions-jvm => extensions}/aws2-msk/pom.xml | 1 - .../aws2-msk/runtime/pom.xml | 12 ++++ .../main/resources/META-INF/quarkus-extension.yaml | 0 extensions/pom.xml | 1 + poms/bom/pom.xml | 6 ++ 11 files changed, 31 insertions(+), 168 deletions(-) diff --git a/extensions-jvm/aws2-msk/integration-test/pom.xml b/extensions-jvm/aws2-msk/integration-test/pom.xml deleted file mode 100644 index 204010c..0000000 --- a/extensions-jvm/aws2-msk/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-msk-integration-test</artifactId> - <name>Camel Quarkus :: AWS 2 MSK :: Integration Test</name> - <description>Integration tests for Camel Quarkus AWS 2 MSK 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-msk-deployment,camel-quarkus-support-policy-deployment</mvnd.builder.rule> - </properties> - - <dependencies> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-aws2-msk</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-msk/integration-test/src/main/java/org/apache/camel/quarkus/component/aws2/msk/it/Aws2MskResource.java b/extensions-jvm/aws2-msk/integration-test/src/main/java/org/apache/camel/quarkus/component/aws2/msk/it/Aws2MskResource.java deleted file mode 100644 index c5f7600..0000000 --- a/extensions-jvm/aws2-msk/integration-test/src/main/java/org/apache/camel/quarkus/component/aws2/msk/it/Aws2MskResource.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.msk.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-msk") -@ApplicationScoped -public class Aws2MskResource { - - private static final Logger LOG = Logger.getLogger(Aws2MskResource.class); - - private static final String COMPONENT_AWS2_MSK = "aws2-msk"; - @Inject - CamelContext context; - - @Path("/load/component/aws2-msk") - @GET - @Produces(MediaType.TEXT_PLAIN) - public Response loadComponentAws2Msk() throws Exception { - /* This is an autogenerated test */ - if (context.getComponent(COMPONENT_AWS2_MSK) != null) { - return Response.ok().build(); - } - LOG.warnf("Could not load [%s] from the Camel context", COMPONENT_AWS2_MSK); - return Response.status(500, COMPONENT_AWS2_MSK + " could not be loaded from the Camel context").build(); - } -} diff --git a/extensions-jvm/aws2-msk/integration-test/src/test/java/org/apache/camel/quarkus/component/aws2/msk/it/Aws2MskTest.java b/extensions-jvm/aws2-msk/integration-test/src/test/java/org/apache/camel/quarkus/component/aws2/msk/it/Aws2MskTest.java deleted file mode 100644 index 8506a22..0000000 --- a/extensions-jvm/aws2-msk/integration-test/src/test/java/org/apache/camel/quarkus/component/aws2/msk/it/Aws2MskTest.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.msk.it; - -import io.quarkus.test.junit.QuarkusTest; -import io.restassured.RestAssured; -import org.junit.jupiter.api.Test; - -@QuarkusTest -class Aws2MskTest { - - @Test - public void loadComponentAws2Msk() { - /* A simple autogenerated test */ - RestAssured.get("/aws2-msk/load/component/aws2-msk") - .then() - .statusCode(200); - } - -} diff --git a/extensions-jvm/pom.xml b/extensions-jvm/pom.xml index 1c79ed6..28e2563 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-msk</module> <module>aws2-ses</module> <module>cassandraql</module> <module>couchbase</module> diff --git a/extensions-jvm/aws2-msk/deployment/pom.xml b/extensions/aws2-msk/deployment/pom.xml similarity index 84% rename from extensions-jvm/aws2-msk/deployment/pom.xml rename to extensions/aws2-msk/deployment/pom.xml index 4d5688e..6c70e24 100644 --- a/extensions-jvm/aws2-msk/deployment/pom.xml +++ b/extensions/aws2-msk/deployment/pom.xml @@ -50,6 +50,18 @@ <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-aws2-msk</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-jvm/aws2-msk/deployment/src/main/java/org/apache/camel/quarkus/component/aws2/msk/deployment/Aws2MskProcessor.java b/extensions/aws2-msk/deployment/src/main/java/org/apache/camel/quarkus/component/aws2/msk/deployment/Aws2MskProcessor.java similarity index 100% rename from extensions-jvm/aws2-msk/deployment/src/main/java/org/apache/camel/quarkus/component/aws2/msk/deployment/Aws2MskProcessor.java rename to extensions/aws2-msk/deployment/src/main/java/org/apache/camel/quarkus/component/aws2/msk/deployment/Aws2MskProcessor.java diff --git a/extensions-jvm/aws2-msk/pom.xml b/extensions/aws2-msk/pom.xml similarity index 97% rename from extensions-jvm/aws2-msk/pom.xml rename to extensions/aws2-msk/pom.xml index 16dbe14..09d88aa 100644 --- a/extensions-jvm/aws2-msk/pom.xml +++ b/extensions/aws2-msk/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-msk/runtime/pom.xml b/extensions/aws2-msk/runtime/pom.xml similarity index 87% rename from extensions-jvm/aws2-msk/runtime/pom.xml rename to extensions/aws2-msk/runtime/pom.xml index fc1f7d8..095e472 100644 --- a/extensions-jvm/aws2-msk/runtime/pom.xml +++ b/extensions/aws2-msk/runtime/pom.xml @@ -54,6 +54,18 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-aws2-msk</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-msk/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/aws2-msk/runtime/src/main/resources/META-INF/quarkus-extension.yaml similarity index 100% rename from extensions-jvm/aws2-msk/runtime/src/main/resources/META-INF/quarkus-extension.yaml rename to extensions/aws2-msk/runtime/src/main/resources/META-INF/quarkus-extension.yaml diff --git a/extensions/pom.xml b/extensions/pom.xml index 14bef1e..55f3bbd 100644 --- a/extensions/pom.xml +++ b/extensions/pom.xml @@ -60,6 +60,7 @@ <module>aws2-iam</module> <module>aws2-kms</module> <module>aws2-mq</module> + <module>aws2-msk</module> <module>aws2-s3</module> <module>aws2-sns</module> <module>aws2-sqs</module> diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 27148cd..41932d0 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -308,6 +308,12 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-aws2-msk</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>