This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 85e12ebe270778592e378441b52e39a0ba30637f
Author: Otavio Rodolfo Piske <angusyo...@gmail.com>
AuthorDate: Wed Nov 23 13:30:27 2022 +0100
CAMEL-15105: rework setting from route/endpoint properties
---
.../org/apache/camel/language/csimple/joor/OriginalSimpleTest.java | 2 +-
.../java/org/apache/camel/component/directvm/DirectVmProcessor.java | 2 +-
.../org/apache/camel/component/disruptor/DisruptorConsumer.java | 2 +-
.../org/apache/camel/component/disruptor/DisruptorProducer.java | 2 +-
.../java/org/apache/camel/component/leveldb/LevelDBCamelCodec.java | 3 +--
.../src/main/java/org/apache/camel/component/seda/SedaConsumer.java | 5 ++---
.../org/apache/camel/processor/aggregate/jdbc/JdbcCamelCodec.java | 3 +--
.../src/main/java/org/apache/camel/component/vm/VmConsumer.java | 6 ++----
.../java/org/apache/camel/impl/engine/CamelInternalProcessor.java | 3 +--
.../src/test/java/org/apache/camel/language/simple/SimpleTest.java | 2 +-
.../test/java/org/apache/camel/processor/UnitOfWorkHelperTest.java | 3 +--
.../src/main/java/org/apache/camel/support/DefaultConsumer.java | 5 +++--
12 files changed, 16 insertions(+), 22 deletions(-)
diff --git
a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleTest.java
b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleTest.java
index 501b370ef61..e3fa5c63658 100644
---
a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleTest.java
+++
b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleTest.java
@@ -227,7 +227,7 @@ public class OriginalSimpleTest extends LanguageTestSupport
{
assertExpression("${header.foo}", "abc");
assertExpression("${headers.foo}", "abc");
assertExpression("${routeId}", exchange.getFromRouteId());
- exchange.adapt(ExtendedExchange.class).setFromRouteId("myRouteId");
+ exchange.getExchangeExtension().setFromRouteId("myRouteId");
assertExpression("${routeId}", "myRouteId");
}
diff --git
a/components/camel-directvm/src/main/java/org/apache/camel/component/directvm/DirectVmProcessor.java
b/components/camel-directvm/src/main/java/org/apache/camel/component/directvm/DirectVmProcessor.java
index b7447485ae8..0d6c21a0a81 100644
---
a/components/camel-directvm/src/main/java/org/apache/camel/component/directvm/DirectVmProcessor.java
+++
b/components/camel-directvm/src/main/java/org/apache/camel/component/directvm/DirectVmProcessor.java
@@ -89,7 +89,7 @@ public final class DirectVmProcessor extends
DelegateAsyncProcessor {
// send a new copied exchange with new camel context (do not handover
completions)
Exchange newExchange =
ExchangeHelper.copyExchangeAndSetCamelContext(exchange,
endpoint.getCamelContext(), false);
// set the from endpoint
- newExchange.adapt(ExtendedExchange.class).setFromEndpoint(endpoint);
+ newExchange.getExchangeExtension().setFromEndpoint(endpoint);
// The StreamCache created by the child routes must not be
// closed by the unit of work of the child route, but by the unit of
// work of the parent route or grand parent route or grand grand
parent route ...(in case of nesting).
diff --git
a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorConsumer.java
b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorConsumer.java
index cee5b483814..224b27e3d1f 100644
---
a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorConsumer.java
+++
b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorConsumer.java
@@ -139,7 +139,7 @@ public class DisruptorConsumer extends ServiceSupport
implements Consumer, Suspe
final Exchange newExchange = ExchangeHelper
.copyExchangeAndSetCamelContext(exchange,
endpoint.getCamelContext(), false);
// set the from endpoint
- newExchange.adapt(ExtendedExchange.class).setFromEndpoint(endpoint);
+ newExchange.getExchangeExtension().setFromEndpoint(endpoint);
return newExchange;
}
diff --git
a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorProducer.java
b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorProducer.java
index a35ba77cf9b..b3533bdd1ee 100644
---
a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorProducer.java
+++
b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorProducer.java
@@ -197,7 +197,7 @@ public class DisruptorProducer extends DefaultAsyncProducer
{
// use a new copy of the exchange to route async
final Exchange copy = ExchangeHelper.createCorrelatedCopy(exchange,
handover);
// set a new from endpoint to be the disruptor
- copy.adapt(ExtendedExchange.class).setFromEndpoint(endpoint);
+ copy.getExchangeExtension().setFromEndpoint(endpoint);
return copy;
}
}
diff --git
a/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/LevelDBCamelCodec.java
b/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/LevelDBCamelCodec.java
index b4df35c95ee..a468c0fd0a5 100644
---
a/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/LevelDBCamelCodec.java
+++
b/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/LevelDBCamelCodec.java
@@ -21,7 +21,6 @@ import java.io.IOException;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
-import org.apache.camel.ExtendedExchange;
import org.apache.camel.component.leveldb.serializer.DefaultLevelDBSerializer;
public final class LevelDBCamelCodec {
@@ -58,7 +57,7 @@ public final class LevelDBCamelCodec {
if (fromEndpointUri != null) {
Endpoint fromEndpoint = camelContext.hasEndpoint(fromEndpointUri);
if (fromEndpoint != null) {
-
answer.adapt(ExtendedExchange.class).setFromEndpoint(fromEndpoint);
+ answer.getExchangeExtension().setFromEndpoint(fromEndpoint);
}
}
return answer;
diff --git
a/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
b/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
index f951f012039..74261b683df 100644
---
a/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
+++
b/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
@@ -221,9 +221,8 @@ public class SedaConsumer extends DefaultConsumer
implements Runnable, ShutdownA
*/
protected Exchange prepareExchange(Exchange exchange) {
// this consumer grabbed the exchange so mark its from this
route/endpoint
- ExtendedExchange ee = exchange.adapt(ExtendedExchange.class);
- ee.setFromEndpoint(getEndpoint());
- ee.setFromRouteId(getRouteId());
+ exchange.getExchangeExtension().setFromEndpoint(getEndpoint());
+ exchange.getExchangeExtension().setFromRouteId(getRouteId());
return exchange;
}
diff --git
a/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/JdbcCamelCodec.java
b/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/JdbcCamelCodec.java
index 7f4b1a12c48..933e20f5629 100644
---
a/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/JdbcCamelCodec.java
+++
b/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/JdbcCamelCodec.java
@@ -28,7 +28,6 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePropertyKey;
-import org.apache.camel.ExtendedExchange;
import org.apache.camel.support.DefaultExchange;
import org.apache.camel.support.DefaultExchangeHolder;
import org.apache.camel.util.ClassLoadingAwareObjectInputStream;
@@ -88,7 +87,7 @@ public class JdbcCamelCodec {
if (fromEndpointUri != null) {
Endpoint fromEndpoint = camelContext.hasEndpoint(fromEndpointUri);
if (fromEndpoint != null) {
-
answer.adapt(ExtendedExchange.class).setFromEndpoint(fromEndpoint);
+ answer.getExchangeExtension().setFromEndpoint(fromEndpoint);
}
}
return answer;
diff --git
a/components/camel-vm/src/main/java/org/apache/camel/component/vm/VmConsumer.java
b/components/camel-vm/src/main/java/org/apache/camel/component/vm/VmConsumer.java
index 66f8228261c..d7468d7ab4b 100644
---
a/components/camel-vm/src/main/java/org/apache/camel/component/vm/VmConsumer.java
+++
b/components/camel-vm/src/main/java/org/apache/camel/component/vm/VmConsumer.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.vm;
import org.apache.camel.CamelContext;
import org.apache.camel.CamelContextAware;
import org.apache.camel.Exchange;
-import org.apache.camel.ExtendedExchange;
import org.apache.camel.Processor;
import org.apache.camel.component.seda.SedaConsumer;
import org.apache.camel.support.ExchangeHelper;
@@ -53,9 +52,8 @@ public class VmConsumer extends SedaConsumer implements
CamelContextAware {
// send a new copied exchange with the camel context from this consumer
Exchange newExchange =
ExchangeHelper.copyExchangeAndSetCamelContext(exchange, getCamelContext());
// this consumer grabbed the exchange so mark its from this
route/endpoint
- ExtendedExchange ee = newExchange.adapt(ExtendedExchange.class);
- ee.setFromEndpoint(getEndpoint());
- ee.setFromRouteId(getRouteId());
+ newExchange.getExchangeExtension().setFromEndpoint(getEndpoint());
+ newExchange.getExchangeExtension().setFromRouteId(getRouteId());
return newExchange;
}
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java
index 05e7b3d1d17..c4d59eff15e 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java
@@ -770,8 +770,7 @@ public class CamelInternalProcessor extends
DelegateAsyncProcessor implements In
if (routeId == null) {
this.routeId = route.getRouteId();
}
- ExtendedExchange ee = (ExtendedExchange) exchange;
- ee.setFromRouteId(routeId);
+ exchange.getExchangeExtension().setFromRouteId(routeId);
}
// only return UnitOfWork if we created a new as then its us that
handle the lifecycle to done the created UoW
diff --git
a/core/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
b/core/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
index 40739fe581b..71761264db8 100644
---
a/core/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
@@ -226,7 +226,7 @@ public class SimpleTest extends LanguageTestSupport {
assertExpression("${header.foo}", "abc");
assertExpression("${headers.foo}", "abc");
assertExpression("${routeId}", exchange.getFromRouteId());
- exchange.adapt(ExtendedExchange.class).setFromRouteId("myRouteId");
+ exchange.getExchangeExtension().setFromRouteId("myRouteId");
assertExpression("${routeId}", "myRouteId");
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/UnitOfWorkHelperTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/UnitOfWorkHelperTest.java
index 855d7b97626..fdceb7a4b19 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/UnitOfWorkHelperTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/UnitOfWorkHelperTest.java
@@ -65,8 +65,7 @@ public class UnitOfWorkHelperTest extends ContextTestSupport {
testMessage.setBody(testFile);
testExchange.setIn(testMessage);
- ExtendedExchange extExchange =
testExchange.adapt(ExtendedExchange.class);
- extExchange.setFromEndpoint(fromEndpoint);
+ testExchange.getExchangeExtension().setFromEndpoint(fromEndpoint);
testExchange.setProperty(FileComponent.FILE_EXCHANGE_FILE, testFile);
return testExchange;
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/DefaultConsumer.java
b/core/camel-support/src/main/java/org/apache/camel/support/DefaultConsumer.java
index d3d97b3fa8a..df40967f49d 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/DefaultConsumer.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/DefaultConsumer.java
@@ -107,7 +107,7 @@ public class DefaultConsumer extends ServiceSupport
implements Consumer, RouteAw
// if the exchange doesn't have from route id set, then set it if it
originated
// from this unit of work
if (route != null && exchange.getFromRouteId() == null) {
-
exchange.adapt(ExtendedExchange.class).setFromRouteId(route.getId());
+ exchange.getExchangeExtension().setFromRouteId(route.getId());
}
// create uow (however for pooled exchanges then the uow is
pre-created)
@@ -135,7 +135,8 @@ public class DefaultConsumer extends ServiceSupport
implements Consumer, RouteAw
public Exchange createExchange(boolean autoRelease) {
Exchange answer = exchangeFactory.create(getEndpoint(), autoRelease);
endpoint.configureExchange(answer);
- answer.adapt(ExtendedExchange.class).setFromRouteId(routeId);
+
+ answer.getExchangeExtension().setFromRouteId(routeId);
return answer;
}
