You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2019/08/05 13:14:01 UTC
[camel] branch master updated: CAMEL-7444: Fixed TODO for MDC test
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 42b8149 CAMEL-7444: Fixed TODO for MDC test
42b8149 is described below
commit 42b814955d38070074908245a6af00efd3138f17
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Aug 5 15:13:43 2019 +0200
CAMEL-7444: Fixed TODO for MDC test
---
.../java/org/apache/camel/impl/engine/MDCUnitOfWork.java | 9 ---------
.../test/java/org/apache/camel/processor/MDCAsyncTest.java | 5 +++--
.../test/java/org/apache/camel/processor/MDCWireTapTest.java | 12 ++++--------
.../support/AsyncCallbackToCompletableFutureAdapter.java | 2 +-
4 files changed, 8 insertions(+), 20 deletions(-)
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/MDCUnitOfWork.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/MDCUnitOfWork.java
index 2e89120..360fb99 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/MDCUnitOfWork.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/MDCUnitOfWork.java
@@ -136,15 +136,6 @@ public class MDCUnitOfWork extends DefaultUnitOfWork {
if (stepId == null) {
MDC.remove(MDC_STEP_ID);
}
-
- /*
- if (!doneSync) {
- // must clear MDC on current thread as the exchange is being processed asynchronously
- // by another thread
- clear();
- }
- super.afterProcess(processor, exchange, callback, doneSync);
- */
}
/**
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/MDCAsyncTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/MDCAsyncTest.java
index c0d9bc9..edbc4d5 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/MDCAsyncTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/MDCAsyncTest.java
@@ -114,9 +114,10 @@ public class MDCAsyncTest extends ContextTestSupport {
@Override
public void process(Exchange exchange) throws Exception {
if (threadId != null) {
- assertNotEquals(threadId, Long.valueOf(Thread.currentThread().getId()));
+ Long currId = Thread.currentThread().getId();
+ assertNotEquals(threadId, currId);
} else {
- threadId = Long.valueOf(Thread.currentThread().getId());
+ threadId = Thread.currentThread().getId();
}
if (routeId != null) {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/MDCWireTapTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/MDCWireTapTest.java
index 6c9d4db..b00ac6a 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/MDCWireTapTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/MDCWireTapTest.java
@@ -23,9 +23,6 @@ import org.apache.camel.builder.RouteBuilder;
import org.junit.Test;
import org.slf4j.MDC;
-/**
- * //TODO: check mdc
- */
public class MDCWireTapTest extends ContextTestSupport {
@Test
@@ -51,18 +48,16 @@ public class MDCWireTapTest extends ContextTestSupport {
public void process(Exchange exchange) throws Exception {
assertEquals("route-a", MDC.get("camel.routeId"));
assertEquals(exchange.getExchangeId(), MDC.get("camel.exchangeId"));
-
- //MDC.put("custom.id", "1");
+ MDC.put("custom.id", "1");
}
})
.to("log:before-wiretap")
.wireTap("direct:b")
- .delay(2000)
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
assertEquals("route-a", MDC.get("camel.routeId"));
assertEquals(exchange.getExchangeId(), MDC.get("camel.exchangeId"));
- //assertEquals("1", MDC.get("custom.id"));
+ assertEquals("1", MDC.get("custom.id"));
}
})
.to("log:a-done")
@@ -73,7 +68,8 @@ public class MDCWireTapTest extends ContextTestSupport {
public void process(Exchange exchange) throws Exception {
assertEquals("route-b", MDC.get("camel.routeId"));
assertEquals(exchange.getExchangeId(), MDC.get("camel.exchangeId"));
- //assertEquals("1", MDC.get("custom.id"));
+ // custom MDC is not propagated
+ assertNull(MDC.get("custom.id"));
}
})
.to("log:b-done")
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/AsyncCallbackToCompletableFutureAdapter.java b/core/camel-support/src/main/java/org/apache/camel/support/AsyncCallbackToCompletableFutureAdapter.java
index 35d35f5..740d5e2 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/AsyncCallbackToCompletableFutureAdapter.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/AsyncCallbackToCompletableFutureAdapter.java
@@ -21,7 +21,7 @@ import java.util.concurrent.CompletableFuture;
import org.apache.camel.AsyncCallback;
/**
- * AsyncCallback that provides a CompletableFuture completed when async action is done
+ * AsyncCallback that provides a {@link CompletableFuture} completed when async action is done
*/
public class AsyncCallbackToCompletableFutureAdapter<T> implements AsyncCallback {
private final CompletableFuture<T> future;