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
commit 2a11167addd4503e0ca632cf279f47561ebacfea
Author: Peter Palaga <ppal...@redhat.com>
AuthorDate: Mon Oct 21 17:13:30 2019 +0200
Fix #285 Un-negate the config options names
---
.../camel/quarkus/core/deployment/BuildProcessor.java | 10 +++++-----
.../camel/quarkus/core/deployment/SubstrateProcessor.java | 4 ++--
.../java/org/apache/camel/quarkus/core/CamelConfig.java | 13 +++++++------
.../src/main/java/org/apache/camel/quarkus/core/Flags.java | 4 ++--
.../reactive/executor/deployment/BuildProcessor.java | 2 +-
.../core-impl/src/main/resources/application.properties | 2 +-
.../core/test/src/main/resources/application.properties | 2 +-
7 files changed, 19 insertions(+), 18 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 dd5b83e..a0839b0 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
@@ -184,7 +184,7 @@ class BuildProcessor {
CombinedIndexBuildItem combinedIndex,
CamelMainRecorder recorder,
RecorderContext recorderContext) {
-
+
return
CamelSupport.getRouteBuilderClasses(combinedIndex.getIndex())
.map(recorderContext::<RoutesBuilder>newInstance)
.map(CamelRoutesBuilderBuildItem::new)
@@ -198,14 +198,14 @@ class BuildProcessor {
return new
CamelRoutesCollectorBuildItem(recorder.newDisabledXmlRoutesCollector());
}
- @BuildStep(onlyIfNot = Flags.MainDisabled.class)
+ @BuildStep(onlyIf = Flags.MainEnabled.class)
void beans(BuildProducer<AdditionalBeanBuildItem> beanProducer) {
beanProducer.produce(AdditionalBeanBuildItem.unremovableOf(CamelMainProducers.class));
}
@Overridable
@Record(value = ExecutionTime.RUNTIME_INIT, optional = true)
- @BuildStep(onlyIfNot = Flags.MainDisabled.class)
+ @BuildStep(onlyIf = Flags.MainEnabled.class)
CamelReactiveExecutorBuildItem reactiveExecutor(CamelMainRecorder
recorder) {
return new
CamelReactiveExecutorBuildItem(recorder.createReactiveExecutor());
}
@@ -218,7 +218,7 @@ class BuildProcessor {
* at runtime.
*/
@Record(ExecutionTime.STATIC_INIT)
- @BuildStep(onlyIfNot = Flags.MainDisabled.class)
+ @BuildStep(onlyIf = Flags.MainEnabled.class)
CamelMainBuildItem main(
CamelMainRecorder recorder,
CamelContextBuildItem context,
@@ -259,7 +259,7 @@ class BuildProcessor {
* container thus we need it to be fully initialized
to avoid unexpected behaviors.
*/
@Record(ExecutionTime.RUNTIME_INIT)
- @BuildStep(onlyIfNot = Flags.MainDisabled.class)
+ @BuildStep(onlyIf = Flags.MainEnabled.class)
void start(
CamelMainRecorder recorder,
CamelMainBuildItem main,
diff --git
a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/SubstrateProcessor.java
b/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/SubstrateProcessor.java
index 7cb75bd..e0fb4f6 100644
---
a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/SubstrateProcessor.java
+++
b/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/SubstrateProcessor.java
@@ -172,10 +172,10 @@ class SubstrateProcessor {
/*
* SubstrateVM configuration steps related to camel main that are
activated by default but can be
- * disabled by setting quarkus.camel.disable-main = true
+ * disabled by setting quarkus.camel.enable-main = false
*/
public static class Main {
- @BuildStep(onlyIfNot = Flags.MainDisabled.class)
+ @BuildStep(onlyIf = Flags.MainEnabled.class)
void process(
CombinedIndexBuildItem combinedIndex,
BuildProducer<ReflectiveClassBuildItem> reflectiveClass) {
diff --git
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java
index a853a1b..68130a8 100644
---
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java
+++
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java
@@ -24,13 +24,14 @@ public class CamelConfig {
@ConfigRoot(name = "camel", phase = ConfigPhase.BUILD_AND_RUN_TIME_FIXED)
public static class BuildTime {
/**
- * Disable camel-main.
- * When main is disabled, routes won't be automatically be loaded and
- * started and the entire lifecycle of the Camel Context is under user
- * control.
+ * Enable {@code camel-main}. If {@code true}, routes are automatically
+ * loaded and started and the entire lifecycle of the Camel Context is
+ * under the control of the {@code camel-main} component. Otherwise,
the
+ * application developer is responsible for performing all the
mentioned
+ * tasks.
*/
- @ConfigItem(defaultValue = "false")
- public boolean disableMain;
+ @ConfigItem(defaultValue = "true")
+ public boolean enableMain;
}
@ConfigRoot(name = "camel", phase = ConfigPhase.RUN_TIME)
diff --git
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/Flags.java
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/Flags.java
index 3e30f41..6e08969 100644
---
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/Flags.java
+++
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/Flags.java
@@ -24,10 +24,10 @@ public final class Flags {
private Flags() {
}
- public static final class MainDisabled implements BooleanSupplier {
+ public static final class MainEnabled implements BooleanSupplier {
@Override
public boolean getAsBoolean() {
- return
ConfigProvider.getConfig().getOptionalValue("quarkus.camel.disable-main",
Boolean.class).orElse(Boolean.FALSE);
+ return
ConfigProvider.getConfig().getOptionalValue("quarkus.camel.enable-main",
Boolean.class).orElse(Boolean.TRUE);
}
}
}
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 7ee67f8..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
@@ -26,7 +26,7 @@ import
org.apache.camel.quarkus.reactive.executor.ReactiveExecutorRecorder;
public class BuildProcessor {
@Record(value = ExecutionTime.RUNTIME_INIT, optional = true)
- @BuildStep(onlyIfNot = Flags.MainDisabled.class)
+ @BuildStep(onlyIf = Flags.MainEnabled.class)
CamelReactiveExecutorBuildItem reactiveExecutor(ReactiveExecutorRecorder
recorder, VertxBuildItem vertx) {
return new
CamelReactiveExecutorBuildItem(recorder.createReactiveExecutor(vertx.getVertx()));
}
diff --git
a/integration-tests/core-impl/src/main/resources/application.properties
b/integration-tests/core-impl/src/main/resources/application.properties
index 66b6509..c826edd 100644
--- a/integration-tests/core-impl/src/main/resources/application.properties
+++ b/integration-tests/core-impl/src/main/resources/application.properties
@@ -22,7 +22,7 @@ quarkus.log.file.enable = false
#
# Quarkus :: Camel
#
-quarkus.camel.disable-main=true
+quarkus.camel.enable-main=false
quarkus.camel.dump-routes=true
#
# Camel
diff --git
a/integration-tests/core/test/src/main/resources/application.properties
b/integration-tests/core/test/src/main/resources/application.properties
index c71820c..a54a75a 100644
--- a/integration-tests/core/test/src/main/resources/application.properties
+++ b/integration-tests/core/test/src/main/resources/application.properties
@@ -22,7 +22,7 @@ quarkus.log.file.enable = false
#
# Quarkus :: Camel
#
-quarkus.camel.disable-main=true
+quarkus.camel.enable-main=false
quarkus.camel.dump-routes=true
#
