CAMEL-20524: leverage camel.main.* propertiies in camel-k starter (#1116

)
apache · Mar 20, 2024 · 5af63a4 · 5af63a4
1 parent 74b8ef1
commit 5af63a4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/...r/camel-k-starter/src/test/java/org/apache/camel/spring/boot/k/ApplicationRoutesTest.java b/...r/camel-k-starter/src/test/java/org/apache/camel/spring/boot/k/ApplicationRoutesTest.java
@@ -40,9 +40,7 @@
                 ApplicationRoutesTest.class
         },
         properties = {
-                // TODO: ideally it would be nice if the camel.main.routes-include-pattern would be honoured.
-                //       The camel.springboot namespace should ideally be for Spring Boot specific options.
-                "camel.springboot.routes-include-pattern=classpath:camel-k/sources/test-route-001.yaml",
+                "camel.main.routes-include-pattern=classpath:camel-k/sources/test-route-001.yaml",
                 // camel-k
                 "camel.k.routes.overrides[0].input.from=direct:r1",
                 "camel.k.routes.overrides[0].input.with=direct:r1override",

diff --git a/...camel-k-starter/src/test/java/org/apache/camel/spring/boot/k/ApplicationShutdownTest.java b/...camel-k-starter/src/test/java/org/apache/camel/spring/boot/k/ApplicationShutdownTest.java
@@ -16,6 +16,8 @@
  */
 package org.apache.camel.spring.boot.k;
 
+import java.util.concurrent.TimeUnit;
+
 import org.apache.camel.CamelContext;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.test.spring.junit5.CamelSpringBootTest;
@@ -32,8 +34,6 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.annotation.DirtiesContext;
 
-import java.util.concurrent.TimeUnit;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
 @DirtiesContext
@@ -47,9 +47,7 @@
                 ApplicationShutdownTest.TestConfiguration.class,
         },
         properties = {
-                // TODO: ideally it would be nice if the camel.main.routes-include-pattern would be honoured.
-                //       The camel.springboot namespace should ideally be for Spring Boot specific options.
-                "camel.springboot.routes-include-pattern=classpath:camel-k/sources/test-route-002.yaml",
+                "camel.main.routes-include-pattern=classpath:camel-k/sources/test-route-002.yaml",
                 // camel-k
                 "camel.k.shutdown.maxMessages=1",
                 "camel.k.shutdown.strategy=CAMEL",