You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pp...@apache.org on 2020/10/30 14:32:46 UTC

[camel-quarkus] branch master updated: Configuration option (not) to start the runtime #1969

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

ppalaga 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 88aac10  Configuration option (not) to start the runtime #1969
88aac10 is described below

commit 88aac10fc3f96bf3bb4c9429ac4ca69470a20f34
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Fri Oct 30 13:27:40 2020 +0100

    Configuration option (not) to start the runtime #1969
---
 .../camel/quarkus/core/deployment/CamelBootstrapProcessor.java     | 3 +--
 .../camel/quarkus/core/deployment/CamelContextProcessor.java       | 3 ++-
 .../camel/quarkus/core/deployment/spi/CamelRuntimeBuildItem.java   | 4 ----
 .../main/java/org/apache/camel/quarkus/core/CamelConfigFlags.java  | 7 -------
 4 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelBootstrapProcessor.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelBootstrapProcessor.java
index 6f6cc47..db9e880 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelBootstrapProcessor.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelBootstrapProcessor.java
@@ -26,7 +26,6 @@ import io.quarkus.deployment.builditem.ServiceStartBuildItem;
 import io.quarkus.deployment.builditem.ShutdownContextBuildItem;
 import io.quarkus.runtime.ShutdownContext;
 import org.apache.camel.quarkus.core.CamelBootstrapRecorder;
-import org.apache.camel.quarkus.core.CamelConfigFlags;
 import org.apache.camel.quarkus.core.deployment.spi.CamelBootstrapCompletedBuildItem;
 import org.apache.camel.quarkus.core.deployment.spi.CamelRuntimeBuildItem;
 
@@ -40,7 +39,7 @@ class CamelBootstrapProcessor {
      * @param shutdown             a reference to a {@link ShutdownContext} used tor register the Camel's related shutdown
      *                             tasks.
      */
-    @BuildStep(onlyIf = { CamelConfigFlags.BootstrapEnabled.class })
+    @BuildStep
     @Record(value = ExecutionTime.RUNTIME_INIT)
     @Produce(CamelBootstrapCompletedBuildItem.class)
     void boot(
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelContextProcessor.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelContextProcessor.java
index 6e16b7c..583689b 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelContextProcessor.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelContextProcessor.java
@@ -159,6 +159,7 @@ public class CamelContextProcessor {
         }
 
         return new CamelRuntimeBuildItem(
-                recorder.createRuntime(beanContainer.getValue(), context.getCamelContext()));
+                recorder.createRuntime(beanContainer.getValue(), context.getCamelContext()),
+                config.bootstrap.enabled);
     }
 }
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelRuntimeBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelRuntimeBuildItem.java
index 90e2065..7b9d72e 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelRuntimeBuildItem.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelRuntimeBuildItem.java
@@ -24,10 +24,6 @@ public final class CamelRuntimeBuildItem extends SimpleBuildItem {
     private final RuntimeValue<CamelRuntime> runtime;
     private final boolean autoStartup;
 
-    public CamelRuntimeBuildItem(RuntimeValue<CamelRuntime> runtime) {
-        this(runtime, true);
-    }
-
     public CamelRuntimeBuildItem(RuntimeValue<CamelRuntime> runtime, boolean autoStartup) {
         this.runtime = runtime;
         this.autoStartup = autoStartup;
diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfigFlags.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfigFlags.java
index b0deb7e..ebb0678 100644
--- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfigFlags.java
+++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfigFlags.java
@@ -28,13 +28,6 @@ public final class CamelConfigFlags {
         return ConfigProvider.getConfig().getOptionalValue(key, Boolean.class).orElse(defaultValue);
     }
 
-    public static final class BootstrapEnabled implements BooleanSupplier {
-        @Override
-        public boolean getAsBoolean() {
-            return asBoolean("quarkus.camel.bootstrap.enabled", true);
-        }
-    }
-
     public static final class RoutesDiscoveryEnabled implements BooleanSupplier {
         @Override
         public boolean getAsBoolean() {