CAMEL-20785: move replaceFromEndpoints and make reusable

apache · May 22, 2024 · 475fd39 · 475fd39
1 parent 2cd43d1
commit 475fd39
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 15 deletions.
diff --git a/...l-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java b/...l-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
@@ -34,8 +34,6 @@
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.RoutesBuilder;
 import org.apache.camel.Service;
-import org.apache.camel.builder.AdviceWith;
-import org.apache.camel.builder.AdviceWithRouteBuilder;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.impl.DefaultCamelContext;
@@ -459,7 +457,7 @@ protected void doSetUp() throws Exception {
 
             tryStartCamelContext();
         } else {
-            replaceFromEndpoints();
+            CamelContextTestHelper.replaceFromEndpoints(context, fromEndpoints);
             LOG.debug("Using route builder from the created context: {}", context);
         }
         LOG.debug("Routing Rules are: {}", context.getRoutes());
@@ -483,7 +481,7 @@ private void setupRoutes() throws Exception {
 
         CamelContextTestHelper.setupRoutes(context, builders);
 
-        replaceFromEndpoints();
+        CamelContextTestHelper.replaceFromEndpoints(context, fromEndpoints);
     }
 
     private void tryStartCamelContext() throws Exception {
@@ -513,17 +511,6 @@ private void configurePropertiesComponent() {
         CamelContextTestHelper.configurePropertiesComponent(context, extra, new JunitPropertiesSource(globalStore), ignore);
     }
 
-    private void replaceFromEndpoints() throws Exception {
-        for (final Map.Entry<String, String> entry : fromEndpoints.entrySet()) {
-            AdviceWith.adviceWith(context.getRouteDefinition(entry.getKey()), context, new AdviceWithRouteBuilder() {
-                @Override
-                public void configure() {
-                    replaceFromWith(entry.getValue());
-                }
-            });
-        }
-    }
-
     private boolean isRouteCoverageEnabled() {
         return Boolean.parseBoolean(System.getProperty(ROUTE_COVERAGE_ENABLED, "false")) || isDumpRouteCoverage();
     }

diff --git a/...l-test-junit5/src/main/java/org/apache/camel/test/junit5/util/CamelContextTestHelper.java b/...l-test-junit5/src/main/java/org/apache/camel/test/junit5/util/CamelContextTestHelper.java
@@ -17,6 +17,7 @@
 
 package org.apache.camel.test.junit5.util;
 
+import java.util.Map;
 import java.util.Properties;
 
 import org.apache.camel.CamelContext;
@@ -25,11 +26,14 @@
 import org.apache.camel.RoutesBuilder;
 import org.apache.camel.Service;
 import org.apache.camel.ServiceStatus;
+import org.apache.camel.builder.AdviceWith;
+import org.apache.camel.builder.AdviceWithRouteBuilder;
 import org.apache.camel.component.mock.InterceptSendToMockEndpointStrategy;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.impl.debugger.DefaultDebugger;
 import org.apache.camel.model.Model;
+import org.apache.camel.model.ModelCamelContext;
 import org.apache.camel.spi.Breakpoint;
 import org.apache.camel.spi.PropertiesComponent;
 import org.apache.camel.spi.PropertiesSource;
@@ -200,4 +204,21 @@ public static void startCamelContextOrService(CamelContext context, Service came
             CamelContextTestHelper.startCamelContext(context);
         }
     }
+
+    /**
+     * Replaces the 'from' endpoints of the given context with the ones from the provided map
+     * @param context the context to have the 'from' endpoints replaced
+     * @param fromEndpoints the map with the new endpoint Uris
+     * @throws Exception
+     */
+    public static void replaceFromEndpoints(ModelCamelContext context, Map<String, String> fromEndpoints) throws Exception {
+        for (final Map.Entry<String, String> entry : fromEndpoints.entrySet()) {
+            AdviceWith.adviceWith(context.getRouteDefinition(entry.getKey()), context, new AdviceWithRouteBuilder() {
+                @Override
+                public void configure() {
+                    replaceFromWith(entry.getValue());
+                }
+            });
+        }
+    }
 }