Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from Mar 20, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 1 addition & 3 deletions ...r/camel-k-starter/src/test/java/org/apache/camel/spring/boot/k/ApplicationRoutesTest.java
View file
Open in desktop
Expand Up @@ -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",
Expand Down
8 changes: 3 additions & 5 deletions ...camel-k-starter/src/test/java/org/apache/camel/spring/boot/k/ApplicationShutdownTest.java
View file
Open in desktop
Expand Up @@ -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;
Expand All @@ -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
Expand All @@ -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",
Expand Down