This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push: new 6d161fc Remove vertx-kafka extension 6d161fc is described below commit 6d161fc74af7b243413284587ccc61eccd3d3852 Author: James Netherton <jamesnether...@gmail.com> AuthorDate: Wed Jan 12 15:35:01 2022 +0000 Remove vertx-kafka extension Fixes #3358 --- catalog/pom.xml | 13 --- .../ROOT/examples/components/vertx-kafka.yml | 13 --- docs/modules/ROOT/nav.adoc | 1 - .../pages/reference/extensions/vertx-kafka.adoc | 39 ------- docs/modules/ROOT/pages/user-guide/messaging.adoc | 4 +- extensions/pom.xml | 1 - extensions/vertx-kafka/deployment/pom.xml | 69 ------------ .../kafka/deployment/VertxKafkaProcessor.java | 43 -------- extensions/vertx-kafka/pom.xml | 37 ------- extensions/vertx-kafka/runtime/pom.xml | 119 --------------------- .../vertx/kafka/CamelVertxKafkaRecorder.java | 32 ------ .../main/resources/META-INF/quarkus-extension.yaml | 32 ------ integration-tests/pom.xml | 1 - integration-tests/vertx-kafka/pom.xml | 117 -------------------- .../vertx/kafka/it/VertxKafkaProducers.java | 72 ------------- .../vertx/kafka/it/VertxKafkaResource.java | 73 ------------- .../component/vertx/kafka/it/VertxKafkaRoutes.java | 30 ------ .../component/vertx/kafka/it/VertxKafkaIT.java | 26 ----- .../component/vertx/kafka/it/VertxKafkaTest.java | 50 --------- .../vertx/kafka/it/VertxKafkaTestResource.java | 59 ---------- poms/bom/pom.xml | 15 --- tooling/scripts/test-categories.yaml | 1 - 22 files changed, 1 insertion(+), 846 deletions(-) diff --git a/catalog/pom.xml b/catalog/pom.xml index 41b80fa..efe9f3e 100644 --- a/catalog/pom.xml +++ b/catalog/pom.xml @@ -4109,19 +4109,6 @@ </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-vertx-kafka</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-vertx-websocket</artifactId> <version>${project.version}</version> <type>pom</type> diff --git a/docs/modules/ROOT/examples/components/vertx-kafka.yml b/docs/modules/ROOT/examples/components/vertx-kafka.yml deleted file mode 100644 index 02550f8..0000000 --- a/docs/modules/ROOT/examples/components/vertx-kafka.yml +++ /dev/null @@ -1,13 +0,0 @@ -# Do not edit directly! -# This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page -cqArtifactId: camel-quarkus-vertx-kafka -cqArtifactIdBase: vertx-kafka -cqNativeSupported: true -cqStatus: Stable -cqDeprecated: true -cqJvmSince: 1.6.0 -cqNativeSince: 1.6.0 -cqCamelPartName: vertx-kafka -cqCamelPartTitle: Vert.x Kafka -cqCamelPartDescription: Sent and receive messages to/from an Apache Kafka broker using vert.x Kafka client -cqExtensionPageTitle: Vert.x Kafka diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc index b767ea5..540dde1 100644 --- a/docs/modules/ROOT/nav.adoc +++ b/docs/modules/ROOT/nav.adoc @@ -309,7 +309,6 @@ *** xref:reference/extensions/velocity.adoc[Velocity] *** xref:reference/extensions/vertx.adoc[Vert.x] *** xref:reference/extensions/vertx-http.adoc[Vert.x HTTP Client] -*** xref:reference/extensions/vertx-kafka.adoc[Vert.x Kafka] *** xref:reference/extensions/vertx-websocket.adoc[Vert.x WebSocket] *** xref:reference/extensions/weather.adoc[Weather] *** xref:reference/extensions/web3j.adoc[Web3j Ethereum Blockchain] diff --git a/docs/modules/ROOT/pages/reference/extensions/vertx-kafka.adoc b/docs/modules/ROOT/pages/reference/extensions/vertx-kafka.adoc deleted file mode 100644 index ad49a8f..0000000 --- a/docs/modules/ROOT/pages/reference/extensions/vertx-kafka.adoc +++ /dev/null @@ -1,39 +0,0 @@ -// Do not edit directly! -// This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page -= Vert.x Kafka -:linkattrs: -:cq-artifact-id: camel-quarkus-vertx-kafka -:cq-native-supported: true -:cq-status: Stable -:cq-status-deprecation: Stable Deprecated -:cq-description: Sent and receive messages to/from an Apache Kafka broker using vert.x Kafka client -:cq-deprecated: true -:cq-jvm-since: 1.6.0 -:cq-native-since: 1.6.0 - -[.badges] -[.badge-key]##JVM since##[.badge-supported]##1.6.0## [.badge-key]##Native since##[.badge-supported]##1.6.0## [.badge-key]##⚠️##[.badge-unsupported]##Deprecated## - -Sent and receive messages to/from an Apache Kafka broker using vert.x Kafka client - -== What's inside - -* xref:{cq-camel-components}::vertx-kafka-component.adoc[Vert.x Kafka component], URI syntax: `vertx-kafka:topic` - -Please refer to the above link for usage and configuration details. - -== Maven coordinates - -https://code.quarkus.io/?extension-search=camel-quarkus-vertx-kafka[Create a new project with this extension on code.quarkus.io, window="_blank"] - -Or add the coordinates to your existing project: - -[source,xml] ----- -<dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-vertx-kafka</artifactId> -</dependency> ----- - -Check the xref:user-guide/index.adoc[User guide] for more information about writing Camel Quarkus applications. diff --git a/docs/modules/ROOT/pages/user-guide/messaging.adoc b/docs/modules/ROOT/pages/user-guide/messaging.adoc index e288ac9..81e10c5 100644 --- a/docs/modules/ROOT/pages/user-guide/messaging.adoc +++ b/docs/modules/ROOT/pages/user-guide/messaging.adoc @@ -20,8 +20,6 @@ Camel Quarkus provides support for various messaging platforms, brokers and prot |Apache Kafka |xref:reference/extensions/kafka.adoc[`camel-quarkus-kafka`] -xref:reference/extensions/vertx-kafka.adoc[`camel-quarkus-vertx-kafka`] - |Apache Pulsar |xref:reference/extensions/pulsar.adoc[`camel-quarkus-pulsar`] @@ -71,4 +69,4 @@ xref:reference/extensions/spring-rabbitmq.adoc[`camel-quarkus-spring-rabbitmq`] |=== -NOTE: For JMS brokers not listed in the table above, use `camel-quarkus-jms` or `camel-quarkus-sjms2`. Then add your preferred JMS client libraries to the project dependencies. Not all third party client libraries are guaranteed to work out of the box in native mode. \ No newline at end of file +NOTE: For JMS brokers not listed in the table above, use `camel-quarkus-jms` or `camel-quarkus-sjms2`. Then add your preferred JMS client libraries to the project dependencies. Not all third party client libraries are guaranteed to work out of the box in native mode. diff --git a/extensions/pom.xml b/extensions/pom.xml index 38ecc44..1d785e7 100644 --- a/extensions/pom.xml +++ b/extensions/pom.xml @@ -236,7 +236,6 @@ <module>velocity</module> <module>vertx</module> <module>vertx-http</module> - <module>vertx-kafka</module> <module>vertx-websocket</module> <module>vm</module> <module>weather</module> diff --git a/extensions/vertx-kafka/deployment/pom.xml b/extensions/vertx-kafka/deployment/pom.xml deleted file mode 100644 index 0389317..0000000 --- a/extensions/vertx-kafka/deployment/pom.xml +++ /dev/null @@ -1,69 +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-vertx-kafka-parent</artifactId> - <version>2.7.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>camel-quarkus-vertx-kafka-deployment</artifactId> - <name>Camel Quarkus :: Vert.x Kafka :: Deployment</name> - - <dependencies> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-vertx-deployment</artifactId> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-kafka-client-deployment</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-core-deployment</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-vertx-kafka</artifactId> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <annotationProcessorPaths> - <path> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-extension-processor</artifactId> - <version>${quarkus.version}</version> - </path> - </annotationProcessorPaths> - </configuration> - </plugin> - </plugins> - </build> - -</project> diff --git a/extensions/vertx-kafka/deployment/src/main/java/org/apache/camel/quarkus/component/vertx/kafka/deployment/VertxKafkaProcessor.java b/extensions/vertx-kafka/deployment/src/main/java/org/apache/camel/quarkus/component/vertx/kafka/deployment/VertxKafkaProcessor.java deleted file mode 100644 index ec326dc..0000000 --- a/extensions/vertx-kafka/deployment/src/main/java/org/apache/camel/quarkus/component/vertx/kafka/deployment/VertxKafkaProcessor.java +++ /dev/null @@ -1,43 +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.vertx.kafka.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.vertx.deployment.VertxBuildItem; -import org.apache.camel.component.vertx.kafka.VertxKafkaComponent; -import org.apache.camel.quarkus.component.vertx.kafka.CamelVertxKafkaRecorder; -import org.apache.camel.quarkus.core.deployment.spi.CamelRuntimeBeanBuildItem; - -class VertxKafkaProcessor { - - private static final String FEATURE = "camel-vertx-kafka"; - - @BuildStep - FeatureBuildItem feature() { - return new FeatureBuildItem(FEATURE); - } - - @Record(ExecutionTime.RUNTIME_INIT) - @BuildStep - CamelRuntimeBeanBuildItem configureVertxKafkaComponent(CamelVertxKafkaRecorder recorder, VertxBuildItem vertx) { - return new CamelRuntimeBeanBuildItem("vertx-kafka", VertxKafkaComponent.class.getName(), - recorder.createVertxKafkaComponent(vertx.getVertx())); - } -} diff --git a/extensions/vertx-kafka/pom.xml b/extensions/vertx-kafka/pom.xml deleted file mode 100644 index dba0e4d..0000000 --- a/extensions/vertx-kafka/pom.xml +++ /dev/null @@ -1,37 +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-extensions</artifactId> - <version>2.7.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>camel-quarkus-vertx-kafka-parent</artifactId> - <name>Camel Quarkus :: Vert.x Kafka</name> - <packaging>pom</packaging> - - <modules> - <module>deployment</module> - <module>runtime</module> - </modules> -</project> diff --git a/extensions/vertx-kafka/runtime/pom.xml b/extensions/vertx-kafka/runtime/pom.xml deleted file mode 100644 index af97784..0000000 --- a/extensions/vertx-kafka/runtime/pom.xml +++ /dev/null @@ -1,119 +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-vertx-kafka-parent</artifactId> - <version>2.7.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>camel-quarkus-vertx-kafka</artifactId> - <name>Camel Quarkus :: Vert.x Kafka :: Runtime</name> - <description>Sent and receive messages to/from an Apache Kafka broker using vert.x Kafka client</description> - - <properties> - <camel.quarkus.jvmSince>1.6.0</camel.quarkus.jvmSince> - <camel.quarkus.nativeSince>1.6.0</camel.quarkus.nativeSince> - </properties> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-bom</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> - - <dependencies> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-vertx</artifactId> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-kafka-client</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-vertx-kafka</artifactId> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-bootstrap-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <annotationProcessorPaths> - <path> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-extension-processor</artifactId> - <version>${quarkus.version}</version> - </path> - </annotationProcessorPaths> - </configuration> - </plugin> - </plugins> - </build> - - - <profiles> - <profile> - <id>full</id> - <activation> - <property> - <name>!quickly</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-maven-plugin</artifactId> - <executions> - <execution> - <id>update-extension-doc-page</id> - <goals> - <goal>update-extension-doc-page</goal> - </goals> - <phase>process-classes</phase> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> -</project> diff --git a/extensions/vertx-kafka/runtime/src/main/java/org/apache/camel/quarkus/component/vertx/kafka/CamelVertxKafkaRecorder.java b/extensions/vertx-kafka/runtime/src/main/java/org/apache/camel/quarkus/component/vertx/kafka/CamelVertxKafkaRecorder.java deleted file mode 100644 index a34f8e8..0000000 --- a/extensions/vertx-kafka/runtime/src/main/java/org/apache/camel/quarkus/component/vertx/kafka/CamelVertxKafkaRecorder.java +++ /dev/null @@ -1,32 +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.vertx.kafka; - -import io.quarkus.runtime.RuntimeValue; -import io.quarkus.runtime.annotations.Recorder; -import io.vertx.core.Vertx; -import org.apache.camel.component.vertx.kafka.VertxKafkaComponent; - -@Recorder -public class CamelVertxKafkaRecorder { - - public RuntimeValue<?> createVertxKafkaComponent(RuntimeValue<Vertx> vertx) { - VertxKafkaComponent component = new VertxKafkaComponent(); - component.setVertx(vertx.getValue()); - return new RuntimeValue<>(component); - } -} diff --git a/extensions/vertx-kafka/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/vertx-kafka/runtime/src/main/resources/META-INF/quarkus-extension.yaml deleted file mode 100644 index 55c81fc..0000000 --- a/extensions/vertx-kafka/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ /dev/null @@ -1,32 +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. -# - -# This is a generated file. Do not edit directly! -# To re-generate, run the following command from the top level directory: -# -# mvn -N cq:update-quarkus-metadata -# ---- -name: "Camel Vert.x Kafka" -description: "Sent and receive messages to/from an Apache Kafka broker using vert.x Kafka client" -metadata: - guide: "https://camel.apache.org/camel-quarkus/latest/reference/extensions/vertx-kafka.html" - categories: - - "integration" - status: - - "stable" - - "deprecated" \ No newline at end of file diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 436955f..45b80c9 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -211,7 +211,6 @@ <module>validator</module> <module>velocity</module> <module>vertx</module> - <module>vertx-kafka</module> <module>vertx-websocket</module> <module>weather</module> <module>xchange</module> diff --git a/integration-tests/vertx-kafka/pom.xml b/integration-tests/vertx-kafka/pom.xml deleted file mode 100644 index a57b0d3..0000000 --- a/integration-tests/vertx-kafka/pom.xml +++ /dev/null @@ -1,117 +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>2.7.0-SNAPSHOT</version> - <relativePath>../../poms/build-parent-it/pom.xml</relativePath> - </parent> - - <artifactId>camel-quarkus-integration-test-vertx-kafka</artifactId> - <name>Camel Quarkus :: Integration Tests :: Vert.x Kafka</name> - <description>Integration tests for Camel Quarkus Vert.x Kafka extension</description> - - <dependencies> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-vertx-kafka</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> - <dependency> - <groupId>org.testcontainers</groupId> - <artifactId>kafka</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - - <profiles> - <!-- TODO: https://github.com/apache/camel-quarkus/issues/3358 - <profile> - <id>native</id> - <activation> - <property> - <name>native</name> - </property> - </activation> - <properties> - <quarkus.package.type>native</quarkus.package.type> - </properties> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>integration-test</goal> - <goal>verify</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - --> - <profile> - <id>virtualDependencies</id> - <activation> - <property> - <name>!noVirtualDependencies</name> - </property> - </activation> - <dependencies> - <!-- The following dependencies guarantee that this module is built after them. You can update them by running `mvn process-resources -Pformat -N` from the source tree root directory --> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-vertx-kafka-deployment</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - </profile> - </profiles> - -</project> diff --git a/integration-tests/vertx-kafka/src/main/java/org/apache/camel/quarkus/component/vertx/kafka/it/VertxKafkaProducers.java b/integration-tests/vertx-kafka/src/main/java/org/apache/camel/quarkus/component/vertx/kafka/it/VertxKafkaProducers.java deleted file mode 100644 index 0b88d87..0000000 --- a/integration-tests/vertx-kafka/src/main/java/org/apache/camel/quarkus/component/vertx/kafka/it/VertxKafkaProducers.java +++ /dev/null @@ -1,72 +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.vertx.kafka.it; - -import java.util.HashMap; -import java.util.Map; - -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; - -import io.vertx.core.Vertx; -import io.vertx.kafka.client.consumer.KafkaConsumer; -import io.vertx.kafka.client.producer.KafkaProducer; -import org.apache.kafka.clients.consumer.ConsumerConfig; -import org.apache.kafka.clients.producer.ProducerConfig; -import org.apache.kafka.clients.producer.internals.DefaultPartitioner; -import org.apache.kafka.common.serialization.StringDeserializer; -import org.apache.kafka.common.serialization.StringSerializer; -import org.eclipse.microprofile.config.ConfigProvider; - -public class VertxKafkaProducers { - - public static final String GROUP_ID = "camel-quarkus-group"; - public static final String TOPIC_INBOUND = "inbound"; - public static final String TOPIC_OUTBOUND = "outbound"; - - @Produces - @Singleton - public KafkaConsumer<String, String> createKafkaConsumer(Vertx vertx) { - Map<String, String> config = new HashMap<>(); - config.put(ConsumerConfig.AUTO_COMMIT_INTERVAL_MS_CONFIG, "1000"); - config.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest"); - config.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, - ConfigProvider.getConfig().getValue("camel.component.vertx-kafka.bootstrap-servers", String.class)); - config.put(ConsumerConfig.ENABLE_AUTO_COMMIT_CONFIG, "true"); - config.put(ConsumerConfig.GROUP_ID_CONFIG, GROUP_ID); - config.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class.getName()); - config.put(ConsumerConfig.SESSION_TIMEOUT_MS_CONFIG, "30000"); - config.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class.getName()); - - KafkaConsumer<String, String> consumer = KafkaConsumer.create(vertx, config); - consumer.subscribe(TOPIC_OUTBOUND); - return consumer; - } - - @Produces - @Singleton - public KafkaProducer<String, String> createKafkaProducer(Vertx vertx) { - Map<String, String> config = new HashMap<>(); - config.put(ProducerConfig.ACKS_CONFIG, "1"); - config.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, - ConfigProvider.getConfig().getValue("camel.component.vertx-kafka.bootstrap-servers", String.class)); - config.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName()); - config.put(ProducerConfig.PARTITIONER_CLASS_CONFIG, DefaultPartitioner.class.getName()); - config.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName()); - return KafkaProducer.create(vertx, config); - } -} diff --git a/integration-tests/vertx-kafka/src/main/java/org/apache/camel/quarkus/component/vertx/kafka/it/VertxKafkaResource.java b/integration-tests/vertx-kafka/src/main/java/org/apache/camel/quarkus/component/vertx/kafka/it/VertxKafkaResource.java deleted file mode 100644 index c643294..0000000 --- a/integration-tests/vertx-kafka/src/main/java/org/apache/camel/quarkus/component/vertx/kafka/it/VertxKafkaResource.java +++ /dev/null @@ -1,73 +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.vertx.kafka.it; - -import java.net.URI; -import java.time.Duration; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.TimeUnit; - -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; - -import io.vertx.kafka.client.consumer.KafkaConsumer; -import io.vertx.kafka.client.consumer.KafkaConsumerRecords; -import io.vertx.kafka.client.producer.KafkaProducer; -import io.vertx.kafka.client.producer.KafkaProducerRecord; -import org.apache.kafka.clients.consumer.ConsumerRecord; - -@Path("/vertx-kafka") -public class VertxKafkaResource { - - @Inject - KafkaConsumer<String, String> kafkaConsumer; - - @Inject - KafkaProducer<String, String> kafkaProducer; - - @Path("/get") - @GET - @Produces(MediaType.TEXT_PLAIN) - public String get() throws Exception { - CompletableFuture<String> result = new CompletableFuture<>(); - kafkaConsumer.poll(Duration.ofSeconds(10), asyncResult -> { - if (asyncResult.succeeded()) { - KafkaConsumerRecords<String, String> consumerRecords = asyncResult.result(); - ConsumerRecord<String, String> record = consumerRecords.records().iterator().next(); - result.complete(record.value()); - } else { - result.completeExceptionally(asyncResult.cause()); - } - }); - return result.get(15, TimeUnit.SECONDS); - } - - @Path("/post") - @POST - @Consumes(MediaType.TEXT_PLAIN) - public Response post(String message) throws Exception { - KafkaProducerRecord<String, String> record = KafkaProducerRecord.create(VertxKafkaProducers.TOPIC_INBOUND, message); - kafkaProducer.send(record); - return Response.created(new URI("https://camel.apache.org/")).build(); - } -} diff --git a/integration-tests/vertx-kafka/src/main/java/org/apache/camel/quarkus/component/vertx/kafka/it/VertxKafkaRoutes.java b/integration-tests/vertx-kafka/src/main/java/org/apache/camel/quarkus/component/vertx/kafka/it/VertxKafkaRoutes.java deleted file mode 100644 index 15f3f38..0000000 --- a/integration-tests/vertx-kafka/src/main/java/org/apache/camel/quarkus/component/vertx/kafka/it/VertxKafkaRoutes.java +++ /dev/null @@ -1,30 +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.vertx.kafka.it; - -import org.apache.camel.builder.RouteBuilder; - -import static org.apache.camel.quarkus.component.vertx.kafka.it.VertxKafkaProducers.GROUP_ID; - -public class VertxKafkaRoutes extends RouteBuilder { - @Override - public void configure() throws Exception { - fromF("vertx-kafka:inbound?groupId=%s", GROUP_ID) - .removeHeaders("CamelVertxKafka.*") - .to("vertx-kafka:outbound?acks=-1"); - } -} diff --git a/integration-tests/vertx-kafka/src/test/java/org/apache/camel/quarkus/component/vertx/kafka/it/VertxKafkaIT.java b/integration-tests/vertx-kafka/src/test/java/org/apache/camel/quarkus/component/vertx/kafka/it/VertxKafkaIT.java deleted file mode 100644 index c98665c..0000000 --- a/integration-tests/vertx-kafka/src/test/java/org/apache/camel/quarkus/component/vertx/kafka/it/VertxKafkaIT.java +++ /dev/null @@ -1,26 +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.vertx.kafka.it; - -import io.quarkus.test.junit.DisabledOnNativeImage; -import io.quarkus.test.junit.NativeImageTest; - -@NativeImageTest -@DisabledOnNativeImage("https://github.com/apache/camel-quarkus/issues/3358") -class VertxKafkaIT extends VertxKafkaTest { - -} diff --git a/integration-tests/vertx-kafka/src/test/java/org/apache/camel/quarkus/component/vertx/kafka/it/VertxKafkaTest.java b/integration-tests/vertx-kafka/src/test/java/org/apache/camel/quarkus/component/vertx/kafka/it/VertxKafkaTest.java deleted file mode 100644 index ebf11f1..0000000 --- a/integration-tests/vertx-kafka/src/test/java/org/apache/camel/quarkus/component/vertx/kafka/it/VertxKafkaTest.java +++ /dev/null @@ -1,50 +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.vertx.kafka.it; - -import io.quarkus.test.common.QuarkusTestResource; -import io.quarkus.test.junit.QuarkusTest; -import io.restassured.RestAssured; -import io.restassured.http.ContentType; -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; - -import static org.hamcrest.CoreMatchers.is; - -@QuarkusTest -@QuarkusTestResource(VertxKafkaTestResource.class) -@Disabled("https://github.com/apache/camel-quarkus/issues/3358") -class VertxKafkaTest { - - @Test - public void testVertxKafka() { - String message = "Hello Camel Quarkus Vert.x Kafka"; - - RestAssured.given() - .contentType(ContentType.TEXT) - .body(message) - .post("/vertx-kafka/post") - .then() - .statusCode(201); - - RestAssured.given() - .get("/vertx-kafka/get") - .then() - .statusCode(200) - .body(is(message)); - } -} diff --git a/integration-tests/vertx-kafka/src/test/java/org/apache/camel/quarkus/component/vertx/kafka/it/VertxKafkaTestResource.java b/integration-tests/vertx-kafka/src/test/java/org/apache/camel/quarkus/component/vertx/kafka/it/VertxKafkaTestResource.java deleted file mode 100644 index 15364a8..0000000 --- a/integration-tests/vertx-kafka/src/test/java/org/apache/camel/quarkus/component/vertx/kafka/it/VertxKafkaTestResource.java +++ /dev/null @@ -1,59 +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.vertx.kafka.it; - -import java.util.Collections; -import java.util.Map; - -import io.quarkus.test.common.QuarkusTestResourceLifecycleManager; -import org.testcontainers.containers.KafkaContainer; -import org.testcontainers.containers.wait.strategy.Wait; -import org.testcontainers.utility.DockerImageName; - -public class VertxKafkaTestResource implements QuarkusTestResourceLifecycleManager { - - private static final String KAFKA_IMAGE_NAME = "confluentinc/cp-kafka:5.4.3"; - private KafkaContainer container; - - @Override - public Map<String, String> start() { - try { - DockerImageName imageName = DockerImageName.parse(KAFKA_IMAGE_NAME); - - container = new KafkaContainer(imageName) - .withEmbeddedZookeeper() - .waitingFor(Wait.forListeningPort()); - - container.start(); - - return Collections.singletonMap("camel.component.vertx-kafka.bootstrap-servers", container.getBootstrapServers()); - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - @Override - public void stop() { - if (container != null) { - try { - container.stop(); - } catch (Exception e) { - // ignored - } - } - } -} diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index ecd81a6..930543b 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -2258,11 +2258,6 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-vertx-kafka</artifactId> - <version>${camel.version}</version> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> <artifactId>camel-vertx-websocket</artifactId> <version>${camel.version}</version> </dependency> @@ -5521,16 +5516,6 @@ </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-vertx-kafka</artifactId> - <version>${camel-quarkus.version}</version> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-vertx-kafka-deployment</artifactId> - <version>${camel-quarkus.version}</version> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-vertx-websocket</artifactId> <version>${camel-quarkus.version}</version> </dependency> diff --git a/tooling/scripts/test-categories.yaml b/tooling/scripts/test-categories.yaml index 8b643d3..46c210c 100644 --- a/tooling/scripts/test-categories.yaml +++ b/tooling/scripts/test-categories.yaml @@ -189,7 +189,6 @@ group-12: - reactive-streams - rest - rest-openapi - - vertx-kafka - vertx-websocket group-13: - box