You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2024/03/20 16:31:02 UTC
(camel-spring-boot) branch main updated: CAMEL-20524: leverage camel.main.* propertiies in camel-k starter (#1116)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 5af63a44a87 CAMEL-20524: leverage camel.main.* propertiies in camel-k starter (#1116)
5af63a44a87 is described below
commit 5af63a44a8729b97b666a362f2407deafe4b4a49
Author: Luca Burgazzoli <lb...@users.noreply.github.com>
AuthorDate: Wed Mar 20 17:30:58 2024 +0100
CAMEL-20524: leverage camel.main.* propertiies in camel-k starter (#1116)
---
.../org/apache/camel/spring/boot/k/ApplicationRoutesTest.java | 4 +---
.../org/apache/camel/spring/boot/k/ApplicationShutdownTest.java | 8 +++-----
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/core-starter/camel-k-starter/src/test/java/org/apache/camel/spring/boot/k/ApplicationRoutesTest.java b/core-starter/camel-k-starter/src/test/java/org/apache/camel/spring/boot/k/ApplicationRoutesTest.java
index 83ad0f3414b..4b4b62651a1 100644
--- a/core-starter/camel-k-starter/src/test/java/org/apache/camel/spring/boot/k/ApplicationRoutesTest.java
+++ b/core-starter/camel-k-starter/src/test/java/org/apache/camel/spring/boot/k/ApplicationRoutesTest.java
@@ -40,9 +40,7 @@ import static org.assertj.core.api.Assertions.assertThat;
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/core-starter/camel-k-starter/src/test/java/org/apache/camel/spring/boot/k/ApplicationShutdownTest.java b/core-starter/camel-k-starter/src/test/java/org/apache/camel/spring/boot/k/ApplicationShutdownTest.java
index a9d634175fc..eeeb8e97888 100644
--- a/core-starter/camel-k-starter/src/test/java/org/apache/camel/spring/boot/k/ApplicationShutdownTest.java
+++ b/core-starter/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.boot.test.system.OutputCaptureExtension;
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 @@ import static org.assertj.core.api.Assertions.assertThat;
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",