This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch opt-exchangekey in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/opt-exchangekey by this push: new e9e101c CAMEL-16326: camel-core - Optimize usage of exchanage properties for state in routing engine. e9e101c is described below commit e9e101cd528469964724eeae5bb66eeefb8bed63 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Thu Mar 11 19:17:25 2021 +0100 CAMEL-16326: camel-core - Optimize usage of exchanage properties for state in routing engine. --- .../java/org/apache/camel/component/aws/xray/ErrorHandlingTest.java | 4 ++-- .../src/test/java/org/apache/camel/component/aws/xray/ErrorTest.java | 4 ++-- .../main/java/org/apache/camel/component/mybatis/MyBatisConsumer.java | 2 -- .../camel/component/quickfixj/converter/QuickfixjConverters.java | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/ErrorHandlingTest.java b/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/ErrorHandlingTest.java index 858698a..df50470 100644 --- a/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/ErrorHandlingTest.java +++ b/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/ErrorHandlingTest.java @@ -139,7 +139,7 @@ public class ErrorHandlingTest extends CamelAwsXRayTestSupport { @Override public void process(Exchange exchange) throws Exception { - Exception ex = (Exception) exchange.getProperties().get(Exchange.EXCEPTION_CAUGHT); + Exception ex = exchange.getProperty(Exchange.EXCEPTION_CAUGHT, Exception.class); LOG.debug("Processing caught exception {}", ex.getLocalizedMessage()); exchange.getIn().getHeaders().put("HandledError", ex.getLocalizedMessage()); } @@ -155,7 +155,7 @@ public class ErrorHandlingTest extends CamelAwsXRayTestSupport { @Override public void process(Exchange exchange) throws Exception { - Exception ex = (Exception) exchange.getProperties().get(Exchange.EXCEPTION_CAUGHT); + Exception ex = exchange.getProperty(Exchange.EXCEPTION_CAUGHT, Exception.class); LOG.debug(">> Attempting redelivery of handled exception {} with message: {}", ex.getClass().getSimpleName(), ex.getLocalizedMessage()); } diff --git a/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/ErrorTest.java b/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/ErrorTest.java index da4dbfb..02e1a1b 100644 --- a/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/ErrorTest.java +++ b/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/ErrorTest.java @@ -120,7 +120,7 @@ public class ErrorTest extends CamelAwsXRayTestSupport { @Override public void process(Exchange exchange) throws Exception { - Exception ex = (Exception) exchange.getProperties().get(Exchange.EXCEPTION_CAUGHT); + Exception ex = exchange.getProperty(Exchange.EXCEPTION_CAUGHT, Exception.class); LOG.debug("Processing caught exception {}", ex.getLocalizedMessage()); exchange.getIn().getHeaders().put("HandledError", ex.getLocalizedMessage()); } @@ -136,7 +136,7 @@ public class ErrorTest extends CamelAwsXRayTestSupport { @Override public void process(Exchange exchange) throws Exception { - Exception ex = (Exception) exchange.getProperties().get(Exchange.EXCEPTION_CAUGHT); + Exception ex = exchange.getProperty(Exchange.EXCEPTION_CAUGHT, Exception.class); LOG.debug(">> Attempting redelivery of handled exception {} with message: {}", ex.getClass().getSimpleName(), ex.getLocalizedMessage()); } diff --git a/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConsumer.java b/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConsumer.java index da162db..237c1752 100644 --- a/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConsumer.java +++ b/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConsumer.java @@ -129,8 +129,6 @@ public class MyBatisConsumer extends ScheduledBatchPollingConsumer { // update pending number of exchanges pendingExchanges = total - index - 1; - // process the current exchange - LOG.debug("Processing exchange: {} with properties: {}", exchange, exchange.getProperties()); Exception cause = null; try { getProcessor().process(exchange); diff --git a/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/converter/QuickfixjConverters.java b/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/converter/QuickfixjConverters.java index 65304ee..35017c8 100644 --- a/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/converter/QuickfixjConverters.java +++ b/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/converter/QuickfixjConverters.java @@ -100,7 +100,7 @@ public final class QuickfixjConverters { } private static DataDictionary getDataDictionary(Exchange exchange) throws ConfigError { - Object dictionaryValue = exchange.getProperties().get(QuickfixjEndpoint.DATA_DICTIONARY_KEY); + Object dictionaryValue = exchange.getProperty(QuickfixjEndpoint.DATA_DICTIONARY_KEY); DataDictionary dataDictionary = null; if (dictionaryValue instanceof DataDictionary) {