This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch cloud2 in repository https://gitbox.apache.org/repos/asf/camel.git
commit 3b8ef32b5c91a55b52a9683dbf88d3bd11dd0395 Author: Claus Ibsen <[email protected]> AuthorDate: Fri Apr 5 22:14:36 2019 +0200 CAMEL-13380: camel-core - Move cloud out into camel-cloud component. Woprk in progress --- core/camel-cloud/pom.xml | 5 +++++ .../org/apache/camel/impl/cloud/DefaultServiceCallProcessor.java | 2 +- .../main/java/org/apache/camel/impl/DefaultProcessorFactory.java | 6 +++--- .../main/java/org/apache/camel/processor/SendDynamicProcessor.java | 5 ----- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/core/camel-cloud/pom.xml b/core/camel-cloud/pom.xml index 0c88956..4309ee4 100644 --- a/core/camel-cloud/pom.xml +++ b/core/camel-cloud/pom.xml @@ -79,6 +79,11 @@ <artifactId>assertj-core</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>java-hamcrest</artifactId> + <scope>test</scope> + </dependency> <!-- logging --> <dependency> diff --git a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallProcessor.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallProcessor.java index 5ff978b..5603f19 100644 --- a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallProcessor.java +++ b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallProcessor.java @@ -128,7 +128,7 @@ public class DefaultServiceCallProcessor extends AsyncProcessorSupport { Map<String, Object> args = new HashMap<>(); args.put("uri", uri); args.put("expression", expression); - args.put("pattern", exchangePattern); + args.put("exchangePattern", exchangePattern); Processor send = camelContext.getProcessorFactory().createProcessor(camelContext, "SendDynamicProcessor", args); processor = AsyncProcessorConverterHelper.convert(send); diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/DefaultProcessorFactory.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultProcessorFactory.java index c26b895..725e8a0 100644 --- a/core/camel-core/src/main/java/org/apache/camel/impl/DefaultProcessorFactory.java +++ b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultProcessorFactory.java @@ -89,11 +89,11 @@ public class DefaultProcessorFactory implements ProcessorFactory { if ("SendDynamicProcessor".equals(definitionName)) { String uri = (String) args.get("uri"); Expression expression = (Expression) args.get("expression"); - ExchangePattern pattern = (ExchangePattern) args.get("exchangePattern"); + ExchangePattern exchangePattern = (ExchangePattern) args.get("exchangePattern"); answer = new SendDynamicProcessor(uri, expression); answer.setCamelContext(camelContext); - if (pattern != null) { - answer.setPattern(pattern); + if (exchangePattern != null) { + answer.setPattern(exchangePattern); } } diff --git a/core/camel-core/src/main/java/org/apache/camel/processor/SendDynamicProcessor.java b/core/camel-core/src/main/java/org/apache/camel/processor/SendDynamicProcessor.java index 3ac4a0a..2857dfd 100644 --- a/core/camel-core/src/main/java/org/apache/camel/processor/SendDynamicProcessor.java +++ b/core/camel-core/src/main/java/org/apache/camel/processor/SendDynamicProcessor.java @@ -55,11 +55,6 @@ public class SendDynamicProcessor extends AsyncProcessorSupport implements IdAwa protected int cacheSize; protected boolean allowOptimisedComponents = true; - public SendDynamicProcessor(Expression expression) { - this.uri = null; - this.expression = expression; - } - public SendDynamicProcessor(String uri, Expression expression) { this.uri = uri; this.expression = expression;
