From commits-return-109640-archive-asf-public=cust-asf.ponee.io@camel.apache.org Mon Aug 24 13:45:30 2020 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mailroute1-lw-us.apache.org (mailroute1-lw-us.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with ESMTPS id 16F8818067C for ; Mon, 24 Aug 2020 15:45:30 +0200 (CEST) Received: from mail.apache.org (localhost [127.0.0.1]) by mailroute1-lw-us.apache.org (ASF Mail Server at mailroute1-lw-us.apache.org) with SMTP id 3EC7A124240 for ; Mon, 24 Aug 2020 13:45:29 +0000 (UTC) Received: (qmail 26513 invoked by uid 500); 24 Aug 2020 13:45:29 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 26500 invoked by uid 99); 24 Aug 2020 13:45:28 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Aug 2020 13:45:28 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 9EA4D85A68; Mon, 24 Aug 2020 13:45:28 +0000 (UTC) Date: Mon, 24 Aug 2020 13:45:29 +0000 To: "commits@camel.apache.org" Subject: [camel-quarkus] 02/05: Extension for camel-threadpoolfactory-vertx #1430 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: jamesnetherton@apache.org In-Reply-To: <159827672720.11349.1340480783981728355@gitbox.apache.org> References: <159827672720.11349.1340480783981728355@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: camel-quarkus X-Git-Refname: refs/heads/camel-master X-Git-Reftype: branch X-Git-Rev: d5e74b177fc2200dab6548ddf46fc5f5e6871612 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20200824134528.9EA4D85A68@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch camel-master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit d5e74b177fc2200dab6548ddf46fc5f5e6871612 Author: JiriOndrusek AuthorDate: Tue Jul 7 15:34:29 2020 +0200 Extension for camel-threadpoolfactory-vertx #1430 --- docs/modules/ROOT/nav.adoc | 1 + .../extensions/threadpoolfactory-vertx.adoc | 29 ++++++ docs/modules/ROOT/pages/reference/index.adoc | 3 + docs/modules/ROOT/pages/reference/others.adoc | 3 + extensions-core/pom.xml | 1 + .../threadpoolfactory-vertx/deployment/pom.xml | 67 ++++++++++++++ .../ThreadpoolfactoryVertxProcessor.java | 42 +++++++++ .../{ => threadpoolfactory-vertx}/pom.xml | 25 ++---- .../threadpoolfactory-vertx/runtime/pom.xml | 100 +++++++++++++++++++++ .../vertx/ThreadPoolFactoryVertxRecorder.java | 40 +++++++++ .../main/resources/META-INF/quarkus-extension.yaml | 31 +++++++ .../cassandraql/integration-test/pom.xml | 10 +++ integration-tests/main/pom.xml | 4 + .../camel/quarkus/main/CoreMainResource.java | 19 ++++ .../apache/camel/quarkus/main/CoreMainTest.java | 14 +++ poms/bom/pom.xml | 15 ++++ 16 files changed, 388 insertions(+), 16 deletions(-) diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc index 45be92d..4b49538 100644 --- a/docs/modules/ROOT/nav.adoc +++ b/docs/modules/ROOT/nav.adoc @@ -169,6 +169,7 @@ *** xref:reference/extensions/stream.adoc[Stream] *** xref:reference/extensions/tarfile.adoc[Tar File] *** xref:reference/extensions/telegram.adoc[Telegram] +*** xref:reference/extensions/threadpoolfactory-vertx.adoc[ThreadPoolFactory Vert.x] *** xref:reference/extensions/tagsoup.adoc[TidyMarkup] *** xref:reference/extensions/tika.adoc[Tika] *** xref:reference/extensions/timer.adoc[Timer] diff --git a/docs/modules/ROOT/pages/reference/extensions/threadpoolfactory-vertx.adoc b/docs/modules/ROOT/pages/reference/extensions/threadpoolfactory-vertx.adoc new file mode 100644 index 0000000..315f5e5 --- /dev/null +++ b/docs/modules/ROOT/pages/reference/extensions/threadpoolfactory-vertx.adoc @@ -0,0 +1,29 @@ +// Do not edit directly! +// This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page + +[[threadpoolfactory-vertx]] += ThreadPoolFactory Vert.x +:page-aliases: extensions/threadpoolfactory-vertx.adoc + +[.badges] +[.badge-key]##Since Camel Quarkus##[.badge-version]##1.0.0-CR4## [.badge-key]##JVM##[.badge-supported]##supported## [.badge-key]##Native##[.badge-supported]##supported## + +ThreadPoolFactory for camel-core using Vert.x + +== What's inside + +* https://camel.apache.org/components/latest/others/threadpoolfactory-vertx.html[ThreadPoolFactory Vert.x] + +Please refer to the above link for usage and configuration details. + +== Maven coordinates + +[source,xml] +---- + + org.apache.camel.quarkus + camel-quarkus-threadpoolfactory-vertx + +---- + +Check the xref:user-guide/index.adoc[User guide] for more information about writing Camel Quarkus applications. diff --git a/docs/modules/ROOT/pages/reference/index.adoc b/docs/modules/ROOT/pages/reference/index.adoc index 7d679bc..ba9a426 100644 --- a/docs/modules/ROOT/pages/reference/index.adoc +++ b/docs/modules/ROOT/pages/reference/index.adoc @@ -488,6 +488,9 @@ Stable | 0.3.0 | Archive files into tarballs or extract files from tarballs. | xref:reference/extensions/telegram.adoc[Telegram] | camel-quarkus-telegram | [.camel-element-Native]##Native## + Stable | 1.0.0 | Send and receive messages acting as a Telegram Bot Telegram Bot API. +| xref:reference/extensions/threadpoolfactory-vertx.adoc[ThreadPoolFactory Vert.x] | camel-quarkus-threadpoolfactory-vertx | [.camel-element-Native]##Native## + +Stable | 1.0.0-CR4 | ThreadPoolFactory for camel-core using Vert.x + | xref:reference/extensions/tagsoup.adoc[TidyMarkup] | camel-quarkus-tagsoup | [.camel-element-Native]##Native## + Stable | 1.0.0 | Parse (potentially invalid) HTML into valid HTML or DOM. diff --git a/docs/modules/ROOT/pages/reference/others.adoc b/docs/modules/ROOT/pages/reference/others.adoc index 731fd42..57a79bf 100644 --- a/docs/modules/ROOT/pages/reference/others.adoc +++ b/docs/modules/ROOT/pages/reference/others.adoc @@ -58,6 +58,9 @@ Stable | 0.3.0 | Reactive Executor for camel-core using Vert.x | xref:reference/extensions/smallrye-reactive-messaging.adoc[SmallRye Reactive Messaging] | [.camel-element-artifact]##camel-quarkus-smallrye-reactive-messaging## | [.camel-element-Native]##Native## + Stable | 1.0.0 | Camel integration with SmallRye Reactive Messaging +| xref:reference/extensions/threadpoolfactory-vertx.adoc[ThreadPoolFactory Vert.x] | [.camel-element-artifact]##camel-quarkus-threadpoolfactory-vertx## | [.camel-element-Native]##Native## + +Stable | 1.0.0-CR4 | ThreadPoolFactory for camel-core using Vert.x + | xref:reference/extensions/xml-io.adoc[XML IO] | [.camel-element-artifact]##camel-quarkus-xml-io## | [.camel-element-Native]##Native## + Stable | 1.0.0 | An XML stack for parsing XML route definitions. A fast an light weight alternative to camel-quarkus-xml-jaxp diff --git a/extensions-core/pom.xml b/extensions-core/pom.xml index 8d687ce..12a4aa0 100644 --- a/extensions-core/pom.xml +++ b/extensions-core/pom.xml @@ -36,6 +36,7 @@ core-cloud http-common reactive-executor + threadpoolfactory-vertx xml-io xml-jaxb xml-jaxp diff --git a/extensions-core/threadpoolfactory-vertx/deployment/pom.xml b/extensions-core/threadpoolfactory-vertx/deployment/pom.xml new file mode 100644 index 0000000..df8bca0 --- /dev/null +++ b/extensions-core/threadpoolfactory-vertx/deployment/pom.xml @@ -0,0 +1,67 @@ + + + + 4.0.0 + + org.apache.camel.quarkus + camel-quarkus-threadpoolfactory-vertx-parent + 1.1.0-SNAPSHOT + ../pom.xml + + + camel-quarkus-threadpoolfactory-vertx-deployment + Camel Quarkus :: ThreadPoolFactory Vert.x :: Deployment + + + + org.apache.camel.quarkus + camel-quarkus-core-deployment + + + org.apache.camel.quarkus + camel-quarkus-threadpoolfactory-vertx + + + io.quarkus + quarkus-vertx-deployment + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + + io.quarkus + quarkus-extension-processor + ${quarkus.version} + + + + + + + + diff --git a/extensions-core/threadpoolfactory-vertx/deployment/src/main/java/org/apache/camel/quarkus/component/threadpoolfactory/vertx/deployment/ThreadpoolfactoryVertxProcessor.java b/extensions-core/threadpoolfactory-vertx/deployment/src/main/java/org/apache/camel/quarkus/component/threadpoolfactory/vertx/deployment/ThreadpoolfactoryVertxProcessor.java new file mode 100644 index 0000000..669245d --- /dev/null +++ b/extensions-core/threadpoolfactory-vertx/deployment/src/main/java/org/apache/camel/quarkus/component/threadpoolfactory/vertx/deployment/ThreadpoolfactoryVertxProcessor.java @@ -0,0 +1,42 @@ +/* + * 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.threadpoolfactory.vertx.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.quarkus.component.threadpoolfactory.vertx.ThreadPoolFactoryVertxRecorder; +import org.apache.camel.quarkus.core.deployment.spi.RuntimeCamelContextCustomizerBuildItem; + +class ThreadpoolfactoryVertxProcessor { + + private static final String FEATURE = "camel-threadpoolfactory-vertx"; + + @BuildStep + FeatureBuildItem feature() { + return new FeatureBuildItem(FEATURE); + } + + @Record(value = ExecutionTime.RUNTIME_INIT, optional = true) + @BuildStep + public RuntimeCamelContextCustomizerBuildItem threadPoolFactoryCustomizer(ThreadPoolFactoryVertxRecorder recorder, + VertxBuildItem vertx) { + return new RuntimeCamelContextCustomizerBuildItem(recorder.createThreadPoolFactoryCustomizer(vertx.getVertx())); + } +} diff --git a/extensions-core/pom.xml b/extensions-core/threadpoolfactory-vertx/pom.xml similarity index 61% copy from extensions-core/pom.xml copy to extensions-core/threadpoolfactory-vertx/pom.xml index 8d687ce..01581ff 100644 --- a/extensions-core/pom.xml +++ b/extensions-core/threadpoolfactory-vertx/pom.xml @@ -17,30 +17,23 @@ limitations under the License. --> - - + 4.0.0 org.apache.camel.quarkus - camel-quarkus + camel-quarkus-build-parent 1.1.0-SNAPSHOT + ../../poms/build-parent/pom.xml - camel-quarkus-extensions-core + camel-quarkus-threadpoolfactory-vertx-parent + Camel Quarkus :: ThreadPoolFactory Vert.x pom - Camel Quarkus :: Extensions :: Core - - core - core-cloud - http-common - reactive-executor - xml-io - xml-jaxb - xml-jaxp - caffeine-lrucache - main + deployment + runtime - diff --git a/extensions-core/threadpoolfactory-vertx/runtime/pom.xml b/extensions-core/threadpoolfactory-vertx/runtime/pom.xml new file mode 100644 index 0000000..168d891 --- /dev/null +++ b/extensions-core/threadpoolfactory-vertx/runtime/pom.xml @@ -0,0 +1,100 @@ + + + + 4.0.0 + + org.apache.camel.quarkus + camel-quarkus-threadpoolfactory-vertx-parent + 1.1.0-SNAPSHOT + ../pom.xml + + + camel-quarkus-threadpoolfactory-vertx + Camel Quarkus :: ThreadPoolFactory Vert.x :: Runtime + ThreadPoolFactory for camel-core using Vert.x + + + 1.0.0-CR4 + + + + + + org.apache.camel.quarkus + camel-quarkus-bom + ${project.version} + pom + import + + + + + + + org.apache.camel.quarkus + camel-quarkus-core + + + org.apache.camel + camel-threadpoolfactory-vertx + + + + + io.quarkus + quarkus-vertx + + + + + + + org.apache.camel.quarkus + camel-quarkus-maven-plugin + + + update-extension-doc-page + update-extension-doc-page + process-classes + + + + + io.quarkus + quarkus-bootstrap-maven-plugin + + + org.apache.maven.plugins + maven-compiler-plugin + + + + io.quarkus + quarkus-extension-processor + ${quarkus.version} + + + + + + + diff --git a/extensions-core/threadpoolfactory-vertx/runtime/src/main/java/org/apache/camel/quarkus/component/threadpoolfactory/vertx/ThreadPoolFactoryVertxRecorder.java b/extensions-core/threadpoolfactory-vertx/runtime/src/main/java/org/apache/camel/quarkus/component/threadpoolfactory/vertx/ThreadPoolFactoryVertxRecorder.java new file mode 100644 index 0000000..833bd0d --- /dev/null +++ b/extensions-core/threadpoolfactory-vertx/runtime/src/main/java/org/apache/camel/quarkus/component/threadpoolfactory/vertx/ThreadPoolFactoryVertxRecorder.java @@ -0,0 +1,40 @@ +/* + * 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.threadpoolfactory.vertx; + +import io.quarkus.runtime.RuntimeValue; +import io.quarkus.runtime.annotations.Recorder; +import io.vertx.core.Vertx; +import org.apache.camel.CamelContext; +import org.apache.camel.ExtendedCamelContext; +import org.apache.camel.quarkus.core.CamelContextCustomizer; +import org.apache.camel.reactive.vertx.VertXThreadPoolFactory; + +@Recorder +public class ThreadPoolFactoryVertxRecorder { + public RuntimeValue createThreadPoolFactoryCustomizer(RuntimeValue vertx) { + return new RuntimeValue<>(new CamelContextCustomizer() { + @Override + public void customize(CamelContext context) { + VertXThreadPoolFactory threadPoolFactory = new VertXThreadPoolFactory(); + threadPoolFactory.setVertx(vertx.getValue()); + + context.adapt(ExtendedCamelContext.class).getExecutorServiceManager().setThreadPoolFactory(threadPoolFactory); + } + }); + } +} diff --git a/extensions-core/threadpoolfactory-vertx/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions-core/threadpoolfactory-vertx/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 0000000..9b28950 --- /dev/null +++ b/extensions-core/threadpoolfactory-vertx/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,31 @@ +# +# 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 ThreadPoolFactory Vert.x" +description: "ThreadPoolFactory for camel-core using Vert.x" +metadata: + guide: "https://camel.apache.org/camel-quarkus/latest/reference/extensions/threadpoolfactory-vertx.html" + categories: + - "integration" + status: + - "stable" diff --git a/extensions-jvm/cassandraql/integration-test/pom.xml b/extensions-jvm/cassandraql/integration-test/pom.xml index f0649da..e474676 100644 --- a/extensions-jvm/cassandraql/integration-test/pom.xml +++ b/extensions-jvm/cassandraql/integration-test/pom.xml @@ -44,6 +44,16 @@ org.apache.camel.quarkus camel-quarkus-cassandraql + + + org.codehaus.groovy + groovy + + + org.codehaus.groovy + groovy-json + + io.quarkus diff --git a/integration-tests/main/pom.xml b/integration-tests/main/pom.xml index 1be9480..989c6ff 100644 --- a/integration-tests/main/pom.xml +++ b/integration-tests/main/pom.xml @@ -58,6 +58,10 @@ org.apache.camel.quarkus + camel-quarkus-threadpoolfactory-vertx + + + org.apache.camel.quarkus camel-quarkus-direct diff --git a/integration-tests/main/src/main/java/org/apache/camel/quarkus/main/CoreMainResource.java b/integration-tests/main/src/main/java/org/apache/camel/quarkus/main/CoreMainResource.java index 4985754..df1a819 100644 --- a/integration-tests/main/src/main/java/org/apache/camel/quarkus/main/CoreMainResource.java +++ b/integration-tests/main/src/main/java/org/apache/camel/quarkus/main/CoreMainResource.java @@ -41,11 +41,13 @@ import org.apache.camel.model.ModelCamelContext; import org.apache.camel.quarkus.core.FastFactoryFinderResolver; import org.apache.camel.quarkus.it.support.typeconverter.MyPair; import org.apache.camel.reactive.vertx.VertXReactiveExecutor; +import org.apache.camel.reactive.vertx.VertXThreadPoolFactory; import org.apache.camel.spi.BeanRepository; import org.apache.camel.spi.DataFormat; import org.apache.camel.spi.FactoryFinderResolver; import org.apache.camel.spi.Language; import org.apache.camel.spi.ReactiveExecutor; +import org.apache.camel.spi.ThreadPoolFactory; import org.apache.camel.support.DefaultRegistry; import org.apache.camel.support.LRUCacheFactory; import org.apache.camel.support.processor.DefaultExchangeFormatter; @@ -185,6 +187,23 @@ public class CoreMainResource { return builder.build(); } + @Path("/context/thread-pool-factory") + @GET + @Produces(MediaType.TEXT_PLAIN) + public JsonObject threadPoolFactory() { + ThreadPoolFactory threadPoolFactory = main.getCamelContext().adapt(ExtendedCamelContext.class) + .getExecutorServiceManager().getThreadPoolFactory(); + + JsonObjectBuilder builder = Json.createObjectBuilder(); + builder.add("class", threadPoolFactory.getClass().getName()); + + if (threadPoolFactory instanceof VertXThreadPoolFactory) { + builder.add("configured", ((VertXThreadPoolFactory) threadPoolFactory).getVertx() != null); + } + + return builder.build(); + } + @Path("/converter/my-pair") @POST @Produces(MediaType.APPLICATION_JSON) diff --git a/integration-tests/main/src/test/java/org/apache/camel/quarkus/main/CoreMainTest.java b/integration-tests/main/src/test/java/org/apache/camel/quarkus/main/CoreMainTest.java index 448b22e..1e2aeb0 100644 --- a/integration-tests/main/src/test/java/org/apache/camel/quarkus/main/CoreMainTest.java +++ b/integration-tests/main/src/test/java/org/apache/camel/quarkus/main/CoreMainTest.java @@ -32,6 +32,7 @@ import org.apache.camel.quarkus.core.DisabledXMLRoutesDefinitionLoader; import org.apache.camel.quarkus.core.RegistryRoutesLoaders; import org.apache.camel.quarkus.it.support.mainlistener.CustomMainListener; import org.apache.camel.reactive.vertx.VertXReactiveExecutor; +import org.apache.camel.reactive.vertx.VertXThreadPoolFactory; import org.apache.camel.support.DefaultLRUCacheFactory; import org.junit.jupiter.api.Test; @@ -167,6 +168,19 @@ public class CoreMainTest { } @Test + public void testThreadPoolFactory() { + JsonPath executor = RestAssured.when().get("/test/context/thread-pool-factory") + .then() + .statusCode(200) + .extract() + .body() + .jsonPath(); + + assertThat(executor.getString("class")).isEqualTo(VertXThreadPoolFactory.class.getName()); + assertThat(executor.getBoolean("configured")).isTrue(); + } + + @Test public void testCustomTypeConverter() { RestAssured.given() .contentType(ContentType.TEXT).body("a:b") diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index b9fb0cd..70a3e91 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -1191,6 +1191,11 @@ org.apache.camel + camel-threadpoolfactory-vertx + ${camel.version} + + + org.apache.camel camel-tika ${camel.version} @@ -3043,6 +3048,16 @@ org.apache.camel.quarkus + camel-quarkus-threadpoolfactory-vertx + ${camel-quarkus.version} + + + org.apache.camel.quarkus + camel-quarkus-threadpoolfactory-vertx-deployment + ${camel-quarkus.version} + + + org.apache.camel.quarkus camel-quarkus-tika ${camel-quarkus.version}