[camel-quarkus] branch master updated: factory-finder: move reactive-executor filter to core processor as the related service is always programmatically configured

[lb...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git


The following commit(s) were added to refs/heads/master by this push:
     new 9c4a4f1  factory-finder: move reactive-executor filter to core processor as the related service is always programmatically configured
9c4a4f1 is described below

commit 9c4a4f1348dc4a72d9d46ba4f552a50255aed3b2
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Thu Jan 23 09:55:44 2020 +0100

    factory-finder: move reactive-executor filter to core processor as the related service is always programmatically configured
---
 .../apache/camel/quarkus/core/deployment/BuildProcessor.java  |  6 ++++++
 .../quarkus/reactive/executor/deployment/BuildProcessor.java  | 11 -----------
 .../test/java/org/apache/camel/quarkus/core/CamelTest.java    |  5 +++++
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java b/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java
index 0797adc..1f27ff7 100644
--- a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java
+++ b/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java
@@ -125,6 +125,12 @@ class BuildProcessor {
         void coreServiceFilter(BuildProducer<CamelServiceFilterBuildItem> filterBuildItems) {
             filterBuildItems.produce(
                     new CamelServiceFilterBuildItem(CamelServiceFilter.forService("properties-component-factory")));
+
+            // The reactive executor is programmatically configured by an extension or
+            // a default implementation is provided by this processor thus we can safely
+            // prevent loading of this service.
+            filterBuildItems.produce(
+                    new CamelServiceFilterBuildItem(CamelServiceFilter.forService("reactive-executor")));
         }
 
         @BuildStep
diff --git a/extensions/reactive-executor/deployment/src/main/java/org/apache/camel/quarkus/reactive/executor/deployment/BuildProcessor.java b/extensions/reactive-executor/deployment/src/main/java/org/apache/camel/quarkus/reactive/executor/deployment/BuildProcessor.java
index ebdaf57..77020e9 100644
--- a/extensions/reactive-executor/deployment/src/main/java/org/apache/camel/quarkus/reactive/executor/deployment/BuildProcessor.java
+++ b/extensions/reactive-executor/deployment/src/main/java/org/apache/camel/quarkus/reactive/executor/deployment/BuildProcessor.java
@@ -22,20 +22,9 @@ import io.quarkus.deployment.annotations.Record;
 import io.quarkus.vertx.deployment.VertxBuildItem;
 import org.apache.camel.quarkus.core.Flags;
 import org.apache.camel.quarkus.core.deployment.CamelReactiveExecutorBuildItem;
-import org.apache.camel.quarkus.core.deployment.CamelServiceFilter;
-import org.apache.camel.quarkus.core.deployment.CamelServiceFilterBuildItem;
 import org.apache.camel.quarkus.reactive.executor.ReactiveExecutorRecorder;
 
 public class BuildProcessor {
-    /*
-     * The reactive executor is programmatically configured by the extension thus
-     * we can safely prevent camel-quarkus-core to instantiate a default instance.
-     */
-    @BuildStep
-    CamelServiceFilterBuildItem serviceFilter() {
-        return new CamelServiceFilterBuildItem(CamelServiceFilter.forService("reactive-executor"));
-    }
-
     @Record(value = ExecutionTime.RUNTIME_INIT, optional = true)
     @BuildStep(onlyIf = Flags.MainEnabled.class)
     CamelReactiveExecutorBuildItem reactiveExecutor(ReactiveExecutorRecorder recorder, VertxBuildItem vertx) {
diff --git a/integration-tests/core-main/src/test/java/org/apache/camel/quarkus/core/CamelTest.java b/integration-tests/core-main/src/test/java/org/apache/camel/quarkus/core/CamelTest.java
index 627bbf5..214c35f 100644
--- a/integration-tests/core-main/src/test/java/org/apache/camel/quarkus/core/CamelTest.java
+++ b/integration-tests/core-main/src/test/java/org/apache/camel/quarkus/core/CamelTest.java
@@ -126,6 +126,11 @@ public class CamelTest {
         // misc
         assertThat(factoryFinderMap)
                 .hasKeySatisfying(startsWith("META-INF/services/org/apache/camel/configurer/"));
+
+        // core
+        assertThat(factoryFinderMap)
+                .hasKeySatisfying(doesNotStartWith("META-INF/services/org/apache/camel/properties-component-factory"))
+                .hasKeySatisfying(doesNotStartWith("META-INF/services/org/apache/camel/reactive-executor"));
     }
 
     @Test