Merge pull request #397 from lburgazzoli/cleanup

Cleanup and CamelConfig improvements
apache · Nov 12, 2019 · d89b6ed · d89b6ed
2 parents cbbd832 + e09d801
commit d89b6ed
Show file tree

Hide file tree

Showing 19 changed files with 19 additions and 85 deletions.
diff --git a/examples/rest-json/src/main/resources/application.properties b/examples/rest-json/src/main/resources/application.properties
@@ -20,11 +20,6 @@
 quarkus.log.file.enable = false
 quarkus.ssl.native=true
 
-#
-# Quarkus :: Camel
-#
-quarkus.camel.dump-routes=true
-
 #
 # Camel
 #

diff --git a/...ployment/src/main/java/org/apache/camel/quarkus/core/deployment/NativeImageProcessor.java b/...ployment/src/main/java/org/apache/camel/quarkus/core/deployment/NativeImageProcessor.java
@@ -171,7 +171,7 @@ protected void addReflectiveMethod(MethodInfo mi) {
 
     /*
      * NativeImage configuration steps related to camel main that are activated by default but can be
-     * disabled by setting quarkus.camel.enable-main = false
+     * disabled by setting quarkus.camel.main.enabled = false
      */
     public static class Main {
         @BuildStep(onlyIf = Flags.MainEnabled.class)

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
@@ -16,13 +16,21 @@
  */
 package org.apache.camel.quarkus.core;
 
+import io.quarkus.runtime.annotations.ConfigGroup;
 import io.quarkus.runtime.annotations.ConfigItem;
 import io.quarkus.runtime.annotations.ConfigPhase;
 import io.quarkus.runtime.annotations.ConfigRoot;
 
+@ConfigRoot(name = "camel", phase = ConfigPhase.BUILD_AND_RUN_TIME_FIXED)
 public class CamelConfig {
-    @ConfigRoot(name = "camel", phase = ConfigPhase.BUILD_AND_RUN_TIME_FIXED)
-    public static class BuildTime {
+    /**
+     * Build time configuration options for {@code camel-main}.
+     */
+    @ConfigItem
+    public MainConfig main;
+
+    @ConfigGroup
+    public static class MainConfig {
         /**
          * Enable {@code camel-main}. If {@code true}, routes are automatically
          * loaded and started and the entire lifecycle of the Camel Context is
@@ -31,16 +39,6 @@ public static class BuildTime {
          * tasks.
          */
         @ConfigItem(defaultValue = "true")
-        public boolean enableMain;
-    }
-
-    @ConfigRoot(name = "camel", phase = ConfigPhase.RUN_TIME)
-    public static class Runtime {
-
-        /**
-         * Dump loaded routes when starting
-         */
-        @ConfigItem(defaultValue = "false")
-        public boolean dumpRoutes;
+        public boolean enabled;
     }
 }
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
@@ -27,7 +27,8 @@ private Flags() {
     public static final class MainEnabled implements BooleanSupplier {
         @Override
         public boolean getAsBoolean() {
-            return ConfigProvider.getConfig().getOptionalValue("quarkus.camel.enable-main", Boolean.class).orElse(Boolean.TRUE);
+            return ConfigProvider.getConfig().getOptionalValue("quarkus.camel.main.enabled", Boolean.class)
+                    .orElse(Boolean.TRUE);
         }
     }
 

diff --git a/integration-tests/aws/src/main/resources/application.properties b/integration-tests/aws/src/main/resources/application.properties
@@ -20,10 +20,6 @@
 quarkus.ssl.native=true
 quarkus.log.file.enable = false
 
-#
-# Quarkus :: Camel
-#
-quarkus.camel.dump-routes=true
 #
 # Camel
 #

diff --git a/integration-tests/bean/src/main/resources/application.properties b/integration-tests/bean/src/main/resources/application.properties
@@ -20,10 +20,6 @@
 quarkus.ssl.native=true
 quarkus.log.file.enable = false
 
-#
-# Quarkus :: Camel
-#
-quarkus.camel.dump-routes=true
 #
 # Camel
 #

diff --git a/integration-tests/core-impl/src/main/resources/application.properties b/integration-tests/core-impl/src/main/resources/application.properties
@@ -22,8 +22,8 @@ quarkus.log.file.enable = false
 #
 # Quarkus :: Camel
 #
-quarkus.camel.enable-main=false
-quarkus.camel.dump-routes=true
+quarkus.camel.main.enabled=false
+
 #
 # Camel
 #

diff --git a/...ration-tests/core-main/test/src/main/java/org/apache/camel/quarkus/core/CamelServlet.java b/...ration-tests/core-main/test/src/main/java/org/apache/camel/quarkus/core/CamelServlet.java
@@ -80,20 +80,6 @@ public JsonObject exchangeFormatterConfig() {
         return result;
     }
 
-    @Path("/registry/produces-config-build")
-    @GET
-    @Produces(MediaType.TEXT_PLAIN)
-    public boolean producesBuildTimeConfig() {
-        return lookupSingleInstanceFromRegistry(CamelConfig.BuildTime.class) != null;
-    }
-
-    @Path("/registry/produces-config-runtime")
-    @GET
-    @Produces(MediaType.TEXT_PLAIN)
-    public boolean producesRuntimeConfig() {
-        return lookupSingleInstanceFromRegistry(CamelConfig.Runtime.class) != null;
-    }
-
     private <T> T lookupSingleInstanceFromRegistry(Class<T> type) {
         final Set<T> answer = context.getRegistry().findByType(type);
 

diff --git a/integration-tests/core-main/test/src/main/resources/application.properties b/integration-tests/core-main/test/src/main/resources/application.properties
@@ -19,10 +19,6 @@
 #
 quarkus.log.file.enable = false
 
-#
-# Quarkus :: Camel
-#
-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
@@ -22,8 +22,7 @@ quarkus.log.file.enable = false
 #
 # Quarkus :: Camel
 #
-quarkus.camel.enable-main=false
-quarkus.camel.dump-routes=true
+quarkus.camel.main.enabled=false
 
 #
 # Camel

diff --git a/integration-tests/infinispan/src/main/resources/application.properties b/integration-tests/infinispan/src/main/resources/application.properties
@@ -25,11 +25,6 @@ quarkus.log.file.enable = false
 quarkus.infinispan-client.server-list = localhost:11232
 quarkus.infinispan-client.near-cache-max-entries = 3
 
-#
-# Quarkus :: Camel
-#
-quarkus.camel.dump-routes=true
-
 #
 # Camel
 #

diff --git a/integration-tests/jackson/src/main/resources/application.properties b/integration-tests/jackson/src/main/resources/application.properties
@@ -20,10 +20,6 @@
 quarkus.ssl.native=true
 quarkus.log.file.enable = false
 
-#
-# Quarkus :: Camel
-#
-quarkus.camel.dump-routes=true
 #
 # Camel
 #

diff --git a/integration-tests/jdbc/src/main/resources/application.properties b/integration-tests/jdbc/src/main/resources/application.properties
@@ -19,11 +19,6 @@
 #
 quarkus.log.file.enable = false
 
-#
-# Quarkus :: Camel
-#
-quarkus.camel.dump-routes=true
-
 #
 # Quarkus :: DS
 #

diff --git a/integration-tests/mail/src/main/resources/application.properties b/integration-tests/mail/src/main/resources/application.properties
@@ -20,11 +20,6 @@
 quarkus.ssl.native=true
 quarkus.log.file.enable = false
 
-#
-# Quarkus :: Camel
-#
-quarkus.camel.dump-routes=true
-
 #
 # Camel
 #

diff --git a/integration-tests/netty-http/src/main/resources/application.properties b/integration-tests/netty-http/src/main/resources/application.properties
@@ -19,11 +19,6 @@
 #
 quarkus.log.file.enable = false
 
-#
-# Quarkus :: Camel
-#
-quarkus.camel.dump-routes=true
-
 #
 # Camel
 #

diff --git a/integration-tests/salesforce/src/main/resources/application.properties b/integration-tests/salesforce/src/main/resources/application.properties
@@ -19,7 +19,6 @@
 # Quarkus
 #
 quarkus.ssl.native=true
-quarkus.camel.dump-routes=true
 #
 # Camel
 #

diff --git a/integration-tests/servlet/src/main/resources/application.properties b/integration-tests/servlet/src/main/resources/application.properties
@@ -20,10 +20,6 @@
 quarkus.log.file.enable = false
 quarkus.ssl.native=true
 
-#
-# Quarkus :: Camel
-#
-quarkus.camel.dump-routes=true
 #
 # Quarkus :: Camel :: Servlet
 #

diff --git a/.../snakeyaml/src/test/java/org/apache/camel/quarkus/component/snakeyaml/it/SnakeYAMLIT.java b/.../snakeyaml/src/test/java/org/apache/camel/quarkus/component/snakeyaml/it/SnakeYAMLIT.java
@@ -16,9 +16,9 @@
  */
 package org.apache.camel.quarkus.component.snakeyaml.it;
 
-import io.quarkus.test.junit.SubstrateTest;
+import io.quarkus.test.junit.NativeImageTest;
 
-@SubstrateTest
+@NativeImageTest
 class SnakeYAMLIT extends SnakeYAMLTest {
 
 }
diff --git a/integration-tests/twitter/src/main/resources/application.properties b/integration-tests/twitter/src/main/resources/application.properties
@@ -20,10 +20,6 @@
 quarkus.ssl.native=true
 quarkus.log.file.enable = false
 
-#
-# Quarkus :: Camel
-#
-quarkus.camel.dump-routes=true
 #
 # Camel
 #