(camel) 01/11: CAMEL-20785: decouple setting up routes

[orpiske]

This is an automated email from the ASF dual-hosted git repository.

orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 374b817bfa2a5759d06e4010ec1530bb115a815f
Author: Otavio Rodolfo Piske <angusyo...@gmail.com>
AuthorDate: Wed May 22 12:12:07 2024 +0200

    CAMEL-20785: decouple setting up routes
---
 .../apache/camel/test/junit5/CamelTestSupport.java   | 18 +++---------------
 .../test/junit5/util/CamelContextTestHelper.java     | 20 ++++++++++++++++++++
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git 
a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
 
b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
index e624b3a0b27..0beb8cbc639 100644
--- 
a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
+++ 
b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
@@ -488,21 +488,9 @@ public abstract class CamelTestSupport
 
     private void setupRoutes() throws Exception {
         RoutesBuilder[] builders = createRouteBuilders();
-        // add configuration before routes
-        for (RoutesBuilder builder : builders) {
-            if (builder instanceof RouteConfigurationsBuilder) {
-                LOG.debug("Using created route configuration: {}", builder);
-                context.addRoutesConfigurations((RouteConfigurationsBuilder) 
builder);
-            }
-        }
-        for (RoutesBuilder builder : builders) {
-            LOG.debug("Using created route builder to add routes: {}", 
builder);
-            context.addRoutes(builder);
-        }
-        for (RoutesBuilder builder : builders) {
-            LOG.debug("Using created route builder to add templated routes: 
{}", builder);
-            context.addTemplatedRoutes(builder);
-        }
+
+        CamelContextTestHelper.setupRoutes(context, builders);
+
         replaceFromEndpoints();
     }
 
diff --git 
a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/util/CamelContextTestHelper.java
 
b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/util/CamelContextTestHelper.java
index 09fb59e7341..cd91227bb4f 100644
--- 
a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/util/CamelContextTestHelper.java
+++ 
b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/util/CamelContextTestHelper.java
@@ -18,6 +18,8 @@
 package org.apache.camel.test.junit5.util;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.RouteConfigurationsBuilder;
+import org.apache.camel.RoutesBuilder;
 import org.apache.camel.ServiceStatus;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.impl.debugger.DefaultDebugger;
@@ -56,4 +58,22 @@ public final class CamelContextTestHelper {
         defaultDebugger.addBreakpoint(breakpoint);
         // when stopping CamelContext it will automatically remove the 
breakpoint
     }
+
+    public static void setupRoutes(CamelContext context, RoutesBuilder[] 
builders) throws Exception {
+        // add configuration before routes
+        for (RoutesBuilder builder : builders) {
+            if (builder instanceof RouteConfigurationsBuilder) {
+                LOG.debug("Using created route configuration: {}", builder);
+                context.addRoutesConfigurations((RouteConfigurationsBuilder) 
builder);
+            }
+        }
+        for (RoutesBuilder builder : builders) {
+            LOG.debug("Using created route builder to add routes: {}", 
builder);
+            context.addRoutes(builder);
+        }
+        for (RoutesBuilder builder : builders) {
+            LOG.debug("Using created route builder to add templated routes: 
{}", builder);
+            context.addTemplatedRoutes(builder);
+        }
+    }
 }