This is an automated email from the ASF dual-hosted git repository. zregvart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 7d8d3a82b796e3f4a50cac17ea458329a8867603 Author: Zoran Regvart <[email protected]> AuthorDate: Wed Feb 5 16:33:21 2020 +0100 Changes needed to adapt due to ModelHelper removal This uses `ExtendedCamelContext` instead of `ModelHelper` to load XML or Route DSL and to dump the XML routes when requested. --- .../apache/camel/spring/boot/SpringBootRoutesCollector.java | 11 ++++++++--- .../spring/boot/actuate/endpoint/CamelRoutesEndpoint.java | 7 +++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringBootRoutesCollector.java b/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringBootRoutesCollector.java index 7c4f04d..3d69d1e 100644 --- a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringBootRoutesCollector.java +++ b/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringBootRoutesCollector.java @@ -22,12 +22,13 @@ import java.util.ArrayList; import java.util.List; import org.apache.camel.CamelContext; +import org.apache.camel.ExtendedCamelContext; import org.apache.camel.RoutesBuilder; import org.apache.camel.RuntimeCamelException; import org.apache.camel.main.DefaultRoutesCollector; -import org.apache.camel.model.ModelHelper; import org.apache.camel.model.RoutesDefinition; import org.apache.camel.model.rest.RestsDefinition; +import org.apache.camel.spi.XMLRoutesDefinitionLoader; import org.apache.camel.util.AntPathMatcher; import org.apache.camel.util.ObjectHelper; import org.springframework.context.ApplicationContext; @@ -121,7 +122,9 @@ public class SpringBootRoutesCollector extends DefaultRoutesCollector { Resource[] xmlRoutes = applicationContext.getResources(part); for (Resource xmlRoute : xmlRoutes) { log.debug("Found XML route: {}", xmlRoute); - RoutesDefinition routes = ModelHelper.loadRoutesDefinition(camelContext, xmlRoute.getInputStream()); + ExtendedCamelContext extendedCamelContext = camelContext.adapt(ExtendedCamelContext.class); + XMLRoutesDefinitionLoader xmlLoader = extendedCamelContext.getXMLRoutesDefinitionLoader(); + RoutesDefinition routes = (RoutesDefinition) xmlLoader.loadRoutesDefinition(camelContext, xmlRoute.getInputStream()); answer.add(routes); } } catch (FileNotFoundException e) { @@ -144,7 +147,9 @@ public class SpringBootRoutesCollector extends DefaultRoutesCollector { try { final Resource[] xmlRests = applicationContext.getResources(part); for (final Resource xmlRest : xmlRests) { - RestsDefinition rests = ModelHelper.loadRestsDefinition(camelContext, xmlRest.getInputStream()); + ExtendedCamelContext extendedCamelContext = camelContext.adapt(ExtendedCamelContext.class); + XMLRoutesDefinitionLoader xmlLoader = extendedCamelContext.getXMLRoutesDefinitionLoader(); + RestsDefinition rests = (RestsDefinition) xmlLoader.loadRestsDefinition(camelContext, xmlRest.getInputStream()); answer.add(rests); } } catch (FileNotFoundException e) { diff --git a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java b/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java index c0c7c31..5d659e7 100644 --- a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java +++ b/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java @@ -29,6 +29,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import org.apache.camel.CamelContext; +import org.apache.camel.ExtendedCamelContext; import org.apache.camel.Route; import org.apache.camel.RuntimeCamelException; import org.apache.camel.StatefulService; @@ -36,8 +37,8 @@ import org.apache.camel.api.management.ManagedCamelContext; import org.apache.camel.api.management.mbean.ManagedRouteMBean; import org.apache.camel.api.management.mbean.RouteError; import org.apache.camel.model.Model; -import org.apache.camel.model.ModelHelper; import org.apache.camel.model.RouteDefinition; +import org.apache.camel.spi.ModelToXMLDumper; import org.springframework.boot.actuate.endpoint.annotation.Endpoint; import org.springframework.boot.actuate.endpoint.annotation.ReadOperation; import org.springframework.boot.actuate.endpoint.annotation.Selector; @@ -117,7 +118,9 @@ public class CamelRoutesEndpoint { RouteDefinition route = camelContext.getExtension(Model.class).getRouteDefinition(id); if (route != null) { try { - return ModelHelper.dumpModelAsXml(camelContext, route); + ExtendedCamelContext extendedCamelContext = camelContext.adapt(ExtendedCamelContext.class); + ModelToXMLDumper dumper = extendedCamelContext.getModelToXMLDumper(); + return dumper.dumpModelAsXml(camelContext, route); } catch (Exception e) { throw RuntimeCamelException.wrapRuntimeCamelException(e); }
