[camel] branch main updated: CAMEL-16656: camel-core - ResourceReloader SPI - Allow to reload on changes

[davsclaus]

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.git


The following commit(s) were added to refs/heads/main by this push:
     new 62b2c08  CAMEL-16656: camel-core - ResourceReloader SPI - Allow to 
reload on changes
62b2c08 is described below

commit 62b2c0897c6be597657bceec54c1db4f0ca9610f
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Thu Nov 18 12:36:52 2021 +0100

    CAMEL-16656: camel-core - ResourceReloader SPI - Allow to reload on changes
---
 .../spring/RouteRefCamelContextFactoryBeanTest.java  | 20 +++++---------------
 .../processor/DefaultErrorHandlerOnPrepareTest.xml   |  2 +-
 .../main/java/org/apache/camel/RoutesBuilder.java    |  3 +++
 .../ROOT/pages/camel-3x-upgrade-guide-3_14.adoc      |  3 +++
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git 
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/RouteRefCamelContextFactoryBeanTest.java
 
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/RouteRefCamelContextFactoryBeanTest.java
index 6347523..d8608aa 100644
--- 
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/RouteRefCamelContextFactoryBeanTest.java
+++ 
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/RouteRefCamelContextFactoryBeanTest.java
@@ -16,30 +16,20 @@
  */
 package org.apache.camel.spring;
 
-import org.apache.camel.CamelContext;
-import org.apache.camel.RoutesBuilder;
 import org.apache.camel.builder.RouteBuilder;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 public class RouteRefCamelContextFactoryBeanTest extends 
RoutingUsingCamelContextFactoryTest {
 
-    public static class MyRoutes implements RoutesBuilder {
-        private RouteBuilder myRouteBuilder;
-
-        public MyRoutes() {
-            myRouteBuilder = new RouteBuilder() {
-                @Override
-                public void configure() throws Exception {
-                    from("seda:start").to("mock:result");
-                }
-            };
-        }
+    public static class MyRoutes extends RouteBuilder {
 
         @Override
-        public void addRoutesToCamelContext(CamelContext camelContext) throws 
Exception {
-            camelContext.addRoutes(myRouteBuilder);
+        public void configure() throws Exception {
+            from("seda:start").to("mock:result");
+
         }
+
     }
 
     @Override
diff --git 
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/DefaultErrorHandlerOnPrepareTest.xml
 
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/DefaultErrorHandlerOnPrepareTest.xml
index 0f9ad59..c03e1c2 100644
--- 
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/DefaultErrorHandlerOnPrepareTest.xml
+++ 
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/DefaultErrorHandlerOnPrepareTest.xml
@@ -35,7 +35,7 @@
 
     <errorHandler id="defaultEH" type="DefaultErrorHandler" 
onPrepareFailureRef="myPrepare"/>
 
-    <route>
+    <route id="foo">
       <from uri="direct:start"/>
       <log message="Incoming ${body}"/>
       <throwException ref="forced"/>
diff --git a/core/camel-api/src/main/java/org/apache/camel/RoutesBuilder.java 
b/core/camel-api/src/main/java/org/apache/camel/RoutesBuilder.java
index 9855b47..418b2fd 100644
--- a/core/camel-api/src/main/java/org/apache/camel/RoutesBuilder.java
+++ b/core/camel-api/src/main/java/org/apache/camel/RoutesBuilder.java
@@ -20,6 +20,9 @@ package org.apache.camel;
  * A routes builder is capable of building routes using the builder and model 
classes.
  * <p/>
  * Eventually the routes are added to a {@link org.apache.camel.CamelContext} 
where they run inside.
+ *
+ * This interface is not intended to be used by Camel end users.
+ * Instead, Camel users will use 
<tt>org.apache.camel.builder.RouteBuilder</tt> to build routes in Java DSL.
  */
 public interface RoutesBuilder {
 
diff --git 
a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_14.adoc 
b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_14.adoc
index 7057634..b44e8ab 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_14.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_14.adoc
@@ -6,4 +6,7 @@ from both 3.0 to 3.1 and 3.1 to 3.2.
 
 == Upgrading Camel 3.13 to 3.14
 
+=== API changes
+
+Added method `updateRoutesToCamelContext` to `org.apache.camel.RoutesBuilder` 
interface.