This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/master by this push:
new 2ac74fc CAMEL-15036: Make it easier to switch to use supervising
route controller.
2ac74fc is described below
commit 2ac74fc017c513913bc27e527ac36ac0c3eee7c1
Author: Claus Ibsen <[email protected]>
AuthorDate: Mon May 11 12:47:52 2020 +0200
CAMEL-15036: Make it easier to switch to use supervising route controller.
---
.../camel/spring/boot/SupervisingRouteControllerRestartTest.java | 7 +++----
.../apache/camel/spring/boot/SupervisingRouteControllerTest.java | 3 +--
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git
a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerRestartTest.java
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerRestartTest.java
index 46e3c90..0737e22 100644
---
a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerRestartTest.java
+++
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerRestartTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.spring.boot;
import java.util.concurrent.TimeUnit;
import org.apache.camel.CamelContext;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.ServiceStatus;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.spi.SupervisingRouteController;
@@ -62,10 +61,10 @@ public class SupervisingRouteControllerRestartTest {
Assert.assertNotNull(context.getRouteController());
Assert.assertTrue(context.getRouteController() instanceof
SupervisingRouteController);
- SupervisingRouteController controller =
context.adapt(ExtendedCamelContext.class).getSupervisingRouteController();
+ SupervisingRouteController controller =
context.getRouteController().adapt(SupervisingRouteController.class);
// Wait for the controller to start the routes
- await().atMost(3, TimeUnit.SECONDS).untilAsserted(() -> {
+ await().atMost(5, TimeUnit.SECONDS).untilAsserted(() -> {
Assert.assertEquals(ServiceStatus.Started,
context.getRouteController().getRouteStatus("foo"));
Assert.assertEquals(ServiceStatus.Started,
context.getRouteController().getRouteStatus("bar"));
Assert.assertEquals(ServiceStatus.Started,
context.getRouteController().getRouteStatus("dummy"));
@@ -83,7 +82,7 @@ public class SupervisingRouteControllerRestartTest {
}
// Wait for wile to give time to the controller to start the route
- await().atMost(2, TimeUnit.SECONDS).untilAsserted(() -> {
+ await().atMost(5, TimeUnit.SECONDS).untilAsserted(() -> {
// now its suspended by the policy
Assert.assertEquals(ServiceStatus.Started,
context.getRouteController().getRouteStatus("dummy"));
Assert.assertNotNull(context.getRoute("dummy").getRouteController());
diff --git
a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerTest.java
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerTest.java
index f358772..38594ed 100644
---
a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerTest.java
+++
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.spring.boot;
import java.util.concurrent.TimeUnit;
import org.apache.camel.CamelContext;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.ServiceStatus;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.spi.SupervisingRouteController;
@@ -62,7 +61,7 @@ public class SupervisingRouteControllerTest {
Assert.assertNotNull(context.getRouteController());
Assert.assertTrue(context.getRouteController() instanceof
SupervisingRouteController);
- SupervisingRouteController controller =
context.adapt(ExtendedCamelContext.class).getSupervisingRouteController();
+ SupervisingRouteController controller =
context.getRouteController().adapt(SupervisingRouteController.class);
// Wait for the controller to start the routes
await().atMost(5, TimeUnit.SECONDS).untilAsserted(() -> {