You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2023/02/14 12:53:52 UTC
[camel] 07/23: CAMEL-15105: rework setting history properties the camel-core code
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 dbbf0060ad910daea6af1e244f4a59e150dc2a9c
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Wed Nov 23 13:30:04 2022 +0100
CAMEL-15105: rework setting history properties the camel-core code
---
.../apache/camel/impl/engine/CamelInternalProcessor.java | 16 +++++++---------
.../camel/impl/engine/DefaultInflightRepository.java | 3 +--
.../impl/DefaultAsyncProcessorAwaitManagerTest.java | 3 +--
.../java/org/apache/camel/support/MessageHelper.java | 4 ++--
4 files changed, 11 insertions(+), 15 deletions(-)
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 29f97a3840c..7f9630868bf 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
@@ -914,19 +914,17 @@ public class CamelInternalProcessor extends DelegateAsyncProcessor implements In
@Override
public String before(Exchange exchange) throws Exception {
- ExtendedExchange ee = (ExtendedExchange) exchange;
- ee.setHistoryNodeId(id);
- ee.setHistoryNodeLabel(label);
- ee.setHistoryNodeSource(source);
+ exchange.getExchangeExtension().setHistoryNodeId(id);
+ exchange.getExchangeExtension().setHistoryNodeLabel(label);
+ exchange.getExchangeExtension().setHistoryNodeSource(source);
return null;
}
@Override
public void after(Exchange exchange, Object data) throws Exception {
- ExtendedExchange ee = (ExtendedExchange) exchange;
- ee.setHistoryNodeId(null);
- ee.setHistoryNodeLabel(null);
- ee.setHistoryNodeSource(null);
+ exchange.getExchangeExtension().setHistoryNodeId(null);
+ exchange.getExchangeExtension().setHistoryNodeLabel(null);
+ exchange.getExchangeExtension().setHistoryNodeSource(null);
}
@Override
@@ -974,7 +972,7 @@ public class CamelInternalProcessor extends DelegateAsyncProcessor implements In
}
boolean failed = cause != null && ObjectHelper.getException(StreamCacheException.class, cause) != null;
if (!failed) {
- boolean disabled = exchange.adapt(ExtendedExchange.class).isStreamCacheDisabled();
+ boolean disabled = exchange.getExchangeExtension().isStreamCacheDisabled();
if (disabled) {
return null;
}
diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultInflightRepository.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultInflightRepository.java
index 9710eb178cb..6e18bde5398 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultInflightRepository.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultInflightRepository.java
@@ -28,7 +28,6 @@ import java.util.stream.Stream;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePropertyKey;
-import org.apache.camel.ExtendedExchange;
import org.apache.camel.MessageHistory;
import org.apache.camel.spi.InflightRepository;
import org.apache.camel.support.ExchangeHelper;
@@ -256,7 +255,7 @@ public class DefaultInflightRepository extends ServiceSupport implements Infligh
@Override
@SuppressWarnings("unchecked")
public String getNodeId() {
- return exchange.adapt(ExtendedExchange.class).getHistoryNodeId();
+ return exchange.getExchangeExtension().getHistoryNodeId();
}
@Override
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultAsyncProcessorAwaitManagerTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultAsyncProcessorAwaitManagerTest.java
index e2c83526643..5fe24931806 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultAsyncProcessorAwaitManagerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultAsyncProcessorAwaitManagerTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.impl;
import java.util.concurrent.CountDownLatch;
-import org.apache.camel.ExtendedExchange;
import org.apache.camel.impl.engine.DefaultAsyncProcessorAwaitManager;
import org.apache.camel.spi.AsyncProcessorAwaitManager;
import org.apache.camel.support.DefaultExchange;
@@ -76,7 +75,7 @@ public class DefaultAsyncProcessorAwaitManagerTest {
@Test
public void testMessageHistoryWithNotNullElements() throws Exception {
startAsyncProcess();
- exchange.adapt(ExtendedExchange.class).setHistoryNodeId("nodeId");
+ exchange.getExchangeExtension().setHistoryNodeId("nodeId");
AsyncProcessorAwaitManager.AwaitThread awaitThread = defaultAsyncProcessorAwaitManager.browse().iterator().next();
assertThat(awaitThread.getNodeId(), is("nodeId"));
waitForEndOfAsyncProcess();
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/MessageHelper.java b/core/camel-support/src/main/java/org/apache/camel/support/MessageHelper.java
index e00ce9444db..095e21b995f 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/MessageHelper.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/MessageHelper.java
@@ -728,7 +728,7 @@ public final class MessageHelper {
if (list == null || list.isEmpty()) {
// message history is not enabled but we can show the last processed
// instead
- id = exchange.adapt(ExtendedExchange.class).getHistoryNodeId();
+ id = exchange.getExchangeExtension().getHistoryNodeId();
if (id != null) {
loc = exchange.adapt(ExtendedExchange.class).getHistoryNodeSource();
if (loc == null) {
@@ -738,7 +738,7 @@ public final class MessageHelper {
if (rid != null) {
routeId = rid;
}
- label = exchange.adapt(ExtendedExchange.class).getHistoryNodeLabel();
+ label = exchange.getExchangeExtension().getHistoryNodeLabel();
// we need to avoid leak the sensible information here
// the sanitizeUri takes a very long time for very long string
// and the format cuts this to