You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by zr...@apache.org on 2020/02/05 15:45:16 UTC
[camel-spring-boot] branch master updated (7c3db3e -> 7d8d3a8)
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git.
from 7c3db3e Remove unused import
new 9263122 Remove unused imports
new 91d1cb0 Regen
new 7d8d3a8 Changes needed to adapt due to ModelHelper removal
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../spring/boot/SpringBootRoutesCollector.java | 11 ++++--
.../boot/actuate/endpoint/CamelRoutesEndpoint.java | 7 ++--
.../spring/boot/CamelAutoConfigurationTest.java | 1 -
.../camel/spring/boot/routefilter/FooTest.java | 1 -
tooling/camel-spring-boot-dependencies/pom.xml | 39 +++++++++++++++-------
5 files changed, 40 insertions(+), 19 deletions(-)
[camel-spring-boot] 03/03: Changes needed to adapt due to
ModelHelper removal
Posted by zr...@apache.org.
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 <zr...@apache.org>
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);
}
[camel-spring-boot] 02/03: Regen
Posted by zr...@apache.org.
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 91d1cb047964a967c81e7f723f6b48ffe3e25b1d
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Wed Feb 5 16:33:04 2020 +0100
Regen
---
tooling/camel-spring-boot-dependencies/pom.xml | 39 ++++++++++++++++++--------
1 file changed, 27 insertions(+), 12 deletions(-)
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml
index 8660457..4ae8995 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -1833,11 +1833,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>apt</artifactId>
- <version>3.1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-activemq</artifactId>
<version>3.1.0-SNAPSHOT</version>
</dependency>
@@ -2033,6 +2028,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-aws2-iam</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-aws2-kms</artifactId>
<version>3.1.0-SNAPSHOT</version>
</dependency>
@@ -2218,6 +2218,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-componentdsl</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-consul</artifactId>
<version>3.1.0-SNAPSHOT</version>
</dependency>
@@ -2244,6 +2249,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-core-catalog</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-core-engine</artifactId>
<version>3.1.0-SNAPSHOT</version>
</dependency>
@@ -2694,11 +2704,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-jaxp</artifactId>
- <version>3.1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-jbpm</artifactId>
<version>3.1.0-SNAPSHOT</version>
</dependency>
@@ -3640,6 +3645,16 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-xml-jaxb</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-xml-jaxp</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-xmlsecurity</artifactId>
<version>3.1.0-SNAPSHOT</version>
</dependency>
@@ -3936,12 +3951,12 @@
<dependency>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-client</artifactId>
- <version>2.4.2</version>
+ <version>2.5.0</version>
</dependency>
<dependency>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-client-admin</artifactId>
- <version>2.4.2</version>
+ <version>2.5.0</version>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
[camel-spring-boot] 01/03: Remove unused imports
Posted by zr...@apache.org.
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 9263122668ebf414fe0dc6536b4c8cc2cee55053
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Wed Feb 5 16:31:48 2020 +0100
Remove unused imports
---
.../java/org/apache/camel/spring/boot/CamelAutoConfigurationTest.java | 1 -
.../src/test/java/org/apache/camel/spring/boot/routefilter/FooTest.java | 1 -
2 files changed, 2 deletions(-)
diff --git a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationTest.java b/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationTest.java
index 0b10854..1c22bf3 100644
--- a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationTest.java
+++ b/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationTest.java
@@ -28,7 +28,6 @@ import org.apache.camel.spi.BeanRepository;
import org.apache.camel.spi.Registry;
import org.assertj.core.api.Assertions;
import org.junit.Assert;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/routefilter/FooTest.java b/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/routefilter/FooTest.java
index 21545af..66a3ff4 100644
--- a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/routefilter/FooTest.java
+++ b/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/routefilter/FooTest.java
@@ -20,7 +20,6 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.model.ModelCamelContext;
import org.apache.camel.test.spring.junit5.CamelSpringBootTest;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.SpringBootApplication;