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 2017/05/16 14:53:32 UTC
[1/6] camel git commit: CAMEL-11287: MDC routeId value is lost after
calling a direct route from a transacted route
Repository: camel
Updated Branches:
refs/heads/camel-2.18.x 94ff981fd -> 32ac90819
refs/heads/camel-2.19.x ccdfa1a02 -> 221e0f25f
refs/heads/master ee33f61eb -> d2d562f47
CAMEL-11287: MDC routeId value is lost after calling a direct route from a transacted route
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6b7193a3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6b7193a3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6b7193a3
Branch: refs/heads/master
Commit: 6b7193a343abcf0b00b4f8eea109d0c834989d74
Parents: ee33f61
Author: Claus Ibsen <da...@apache.org>
Authored: Tue May 16 16:46:36 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue May 16 16:46:36 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/impl/MDCUnitOfWork.java | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/6b7193a3/camel-core/src/main/java/org/apache/camel/impl/MDCUnitOfWork.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/MDCUnitOfWork.java b/camel-core/src/main/java/org/apache/camel/impl/MDCUnitOfWork.java
index 1726b80..f0f834a 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/MDCUnitOfWork.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/MDCUnitOfWork.java
@@ -94,14 +94,25 @@ public class MDCUnitOfWork extends DefaultUnitOfWork {
@Override
public void pushRouteContext(RouteContext routeContext) {
- MDC.put(MDC_ROUTE_ID, routeContext.getRoute().getId());
super.pushRouteContext(routeContext);
+ MDC.put(MDC_ROUTE_ID, routeContext.getRoute().getId());
}
@Override
public RouteContext popRouteContext() {
- MDC.remove(MDC_ROUTE_ID);
- return super.popRouteContext();
+ RouteContext answer = super.popRouteContext();
+
+ // restore old route id back again after we have popped
+ RouteContext previous = getRouteContext();
+ if (previous != null) {
+ // restore old route id back again
+ MDC.put(MDC_ROUTE_ID, previous.getRoute().getId());
+ } else {
+ // not running in route, so clear (should ideally not happen)
+ MDC.remove(MDC_ROUTE_ID);
+ }
+
+ return answer;
}
@Override
[4/6] camel git commit: CAMEL-11287: MDC routeId value is lost after
calling a direct route from a transacted route
Posted by da...@apache.org.
CAMEL-11287: MDC routeId value is lost after calling a direct route from a transacted route
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/221e0f25
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/221e0f25
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/221e0f25
Branch: refs/heads/camel-2.19.x
Commit: 221e0f25fa912ef5192dd4d7f6ea634f8af90b8d
Parents: 445ef3d
Author: Claus Ibsen <da...@apache.org>
Authored: Tue May 16 16:52:05 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue May 16 16:52:51 2017 +0200
----------------------------------------------------------------------
.../spring/NoopPlatformTransactionManager.java | 90 ++++++++++++++++++++
.../camel/spring/SpringMDCTransactedTest.java | 89 +++++++++++++++++++
2 files changed, 179 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/221e0f25/components/camel-spring/src/test/java/org/apache/camel/spring/NoopPlatformTransactionManager.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/NoopPlatformTransactionManager.java b/components/camel-spring/src/test/java/org/apache/camel/spring/NoopPlatformTransactionManager.java
new file mode 100644
index 0000000..2a31108
--- /dev/null
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/NoopPlatformTransactionManager.java
@@ -0,0 +1,90 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.spring;
+
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.TransactionDefinition;
+import org.springframework.transaction.TransactionException;
+import org.springframework.transaction.TransactionStatus;
+
+public class NoopPlatformTransactionManager implements PlatformTransactionManager {
+
+ @Override
+ public TransactionStatus getTransaction(TransactionDefinition definition) throws TransactionException {
+ return new StubTransactionStatus();
+ }
+
+ @Override
+ public void commit(TransactionStatus status) throws TransactionException {
+ // empty
+ }
+
+ @Override
+ public void rollback(TransactionStatus status) throws TransactionException {
+ // empty
+ }
+
+ protected static class StubTransactionStatus implements TransactionStatus {
+
+ @Override
+ public boolean isNewTransaction() {
+ return false;
+ }
+
+ @Override
+ public boolean hasSavepoint() {
+ return false;
+ }
+
+ @Override
+ public void setRollbackOnly() {
+ // empty
+ }
+
+ @Override
+ public boolean isRollbackOnly() {
+ return false;
+ }
+
+ @Override
+ public void flush() {
+ // empty
+ }
+
+ @Override
+ public boolean isCompleted() {
+ return false;
+ }
+
+ @Override
+ public Object createSavepoint() throws TransactionException {
+ return null;
+ }
+
+ @Override
+ public void rollbackToSavepoint(Object savepoint) throws TransactionException {
+ // empty
+ }
+
+ @Override
+ public void releaseSavepoint(Object savepoint) throws TransactionException {
+ // empty
+ }
+
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/221e0f25/components/camel-spring/src/test/java/org/apache/camel/spring/SpringMDCTransactedTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/SpringMDCTransactedTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/SpringMDCTransactedTest.java
new file mode 100644
index 0000000..e5fb062
--- /dev/null
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/SpringMDCTransactedTest.java
@@ -0,0 +1,89 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.spring;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.impl.JndiRegistry;
+import org.junit.Test;
+import org.slf4j.MDC;
+
+public class SpringMDCTransactedTest extends ContextTestSupport {
+
+ protected JndiRegistry createRegistry() throws Exception {
+ JndiRegistry result = super.createRegistry();
+ result.bind("NOOP-TX", new NoopPlatformTransactionManager());
+ return result;
+ }
+
+ @Test
+ public void testMDCTransacted() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedBodiesReceived("Hello World");
+
+ template.sendBody("direct:a", "Hello World");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ // enable MDC
+ context.setUseMDCLogging(true);
+
+ from("direct:a").routeId("route-a")
+ .transacted()
+ .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(exchange.getIn().getMessageId(), MDC.get("camel.messageId"));
+ }
+ })
+ .to("log:foo-before")
+ .to("direct:b")
+ .to("log:foo-after")
+ .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(exchange.getIn().getMessageId(), MDC.get("camel.messageId"));
+ }
+ });
+
+ from("direct:b").routeId("route-b")
+ .process(new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ assertEquals("route-b", MDC.get("camel.routeId"));
+ assertEquals(exchange.getExchangeId(), MDC.get("camel.exchangeId"));
+ assertEquals(exchange.getIn().getMessageId(), MDC.get("camel.messageId"));
+ }
+ })
+ .to("log:bar")
+ .to("mock:result");
+ }
+ };
+ }
+
+
+}
[2/6] camel git commit: CAMEL-11287: MDC routeId value is lost after
calling a direct route from a transacted route
Posted by da...@apache.org.
CAMEL-11287: MDC routeId value is lost after calling a direct route from a transacted route
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d2d562f4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d2d562f4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d2d562f4
Branch: refs/heads/master
Commit: d2d562f477ed019dcd5c2f4f5efd2623ca76c4ef
Parents: 6b7193a
Author: Claus Ibsen <da...@apache.org>
Authored: Tue May 16 16:52:05 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue May 16 16:52:05 2017 +0200
----------------------------------------------------------------------
.../spring/NoopPlatformTransactionManager.java | 90 ++++++++++++++++++++
.../camel/spring/SpringMDCTransactedTest.java | 89 +++++++++++++++++++
2 files changed, 179 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d2d562f4/components/camel-spring/src/test/java/org/apache/camel/spring/NoopPlatformTransactionManager.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/NoopPlatformTransactionManager.java b/components/camel-spring/src/test/java/org/apache/camel/spring/NoopPlatformTransactionManager.java
new file mode 100644
index 0000000..2a31108
--- /dev/null
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/NoopPlatformTransactionManager.java
@@ -0,0 +1,90 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.spring;
+
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.TransactionDefinition;
+import org.springframework.transaction.TransactionException;
+import org.springframework.transaction.TransactionStatus;
+
+public class NoopPlatformTransactionManager implements PlatformTransactionManager {
+
+ @Override
+ public TransactionStatus getTransaction(TransactionDefinition definition) throws TransactionException {
+ return new StubTransactionStatus();
+ }
+
+ @Override
+ public void commit(TransactionStatus status) throws TransactionException {
+ // empty
+ }
+
+ @Override
+ public void rollback(TransactionStatus status) throws TransactionException {
+ // empty
+ }
+
+ protected static class StubTransactionStatus implements TransactionStatus {
+
+ @Override
+ public boolean isNewTransaction() {
+ return false;
+ }
+
+ @Override
+ public boolean hasSavepoint() {
+ return false;
+ }
+
+ @Override
+ public void setRollbackOnly() {
+ // empty
+ }
+
+ @Override
+ public boolean isRollbackOnly() {
+ return false;
+ }
+
+ @Override
+ public void flush() {
+ // empty
+ }
+
+ @Override
+ public boolean isCompleted() {
+ return false;
+ }
+
+ @Override
+ public Object createSavepoint() throws TransactionException {
+ return null;
+ }
+
+ @Override
+ public void rollbackToSavepoint(Object savepoint) throws TransactionException {
+ // empty
+ }
+
+ @Override
+ public void releaseSavepoint(Object savepoint) throws TransactionException {
+ // empty
+ }
+
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/d2d562f4/components/camel-spring/src/test/java/org/apache/camel/spring/SpringMDCTransactedTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/SpringMDCTransactedTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/SpringMDCTransactedTest.java
new file mode 100644
index 0000000..e5fb062
--- /dev/null
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/SpringMDCTransactedTest.java
@@ -0,0 +1,89 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.spring;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.impl.JndiRegistry;
+import org.junit.Test;
+import org.slf4j.MDC;
+
+public class SpringMDCTransactedTest extends ContextTestSupport {
+
+ protected JndiRegistry createRegistry() throws Exception {
+ JndiRegistry result = super.createRegistry();
+ result.bind("NOOP-TX", new NoopPlatformTransactionManager());
+ return result;
+ }
+
+ @Test
+ public void testMDCTransacted() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedBodiesReceived("Hello World");
+
+ template.sendBody("direct:a", "Hello World");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ // enable MDC
+ context.setUseMDCLogging(true);
+
+ from("direct:a").routeId("route-a")
+ .transacted()
+ .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(exchange.getIn().getMessageId(), MDC.get("camel.messageId"));
+ }
+ })
+ .to("log:foo-before")
+ .to("direct:b")
+ .to("log:foo-after")
+ .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(exchange.getIn().getMessageId(), MDC.get("camel.messageId"));
+ }
+ });
+
+ from("direct:b").routeId("route-b")
+ .process(new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ assertEquals("route-b", MDC.get("camel.routeId"));
+ assertEquals(exchange.getExchangeId(), MDC.get("camel.exchangeId"));
+ assertEquals(exchange.getIn().getMessageId(), MDC.get("camel.messageId"));
+ }
+ })
+ .to("log:bar")
+ .to("mock:result");
+ }
+ };
+ }
+
+
+}
[3/6] camel git commit: CAMEL-11287: MDC routeId value is lost after
calling a direct route from a transacted route
Posted by da...@apache.org.
CAMEL-11287: MDC routeId value is lost after calling a direct route from a transacted route
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/445ef3d8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/445ef3d8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/445ef3d8
Branch: refs/heads/camel-2.19.x
Commit: 445ef3d835e4e21a68a84638451b4e8810f8fc81
Parents: ccdfa1a
Author: Claus Ibsen <da...@apache.org>
Authored: Tue May 16 16:46:36 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue May 16 16:52:45 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/impl/MDCUnitOfWork.java | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/445ef3d8/camel-core/src/main/java/org/apache/camel/impl/MDCUnitOfWork.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/MDCUnitOfWork.java b/camel-core/src/main/java/org/apache/camel/impl/MDCUnitOfWork.java
index 1726b80..f0f834a 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/MDCUnitOfWork.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/MDCUnitOfWork.java
@@ -94,14 +94,25 @@ public class MDCUnitOfWork extends DefaultUnitOfWork {
@Override
public void pushRouteContext(RouteContext routeContext) {
- MDC.put(MDC_ROUTE_ID, routeContext.getRoute().getId());
super.pushRouteContext(routeContext);
+ MDC.put(MDC_ROUTE_ID, routeContext.getRoute().getId());
}
@Override
public RouteContext popRouteContext() {
- MDC.remove(MDC_ROUTE_ID);
- return super.popRouteContext();
+ RouteContext answer = super.popRouteContext();
+
+ // restore old route id back again after we have popped
+ RouteContext previous = getRouteContext();
+ if (previous != null) {
+ // restore old route id back again
+ MDC.put(MDC_ROUTE_ID, previous.getRoute().getId());
+ } else {
+ // not running in route, so clear (should ideally not happen)
+ MDC.remove(MDC_ROUTE_ID);
+ }
+
+ return answer;
}
@Override
[5/6] camel git commit: CAMEL-11287: MDC routeId value is lost after
calling a direct route from a transacted route
Posted by da...@apache.org.
CAMEL-11287: MDC routeId value is lost after calling a direct route from a transacted route
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bf40b387
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bf40b387
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bf40b387
Branch: refs/heads/camel-2.18.x
Commit: bf40b3874501cbca0f1cc666fb26428e8289d373
Parents: 94ff981
Author: Claus Ibsen <da...@apache.org>
Authored: Tue May 16 16:46:36 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue May 16 16:53:12 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/impl/MDCUnitOfWork.java | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/bf40b387/camel-core/src/main/java/org/apache/camel/impl/MDCUnitOfWork.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/MDCUnitOfWork.java b/camel-core/src/main/java/org/apache/camel/impl/MDCUnitOfWork.java
index 1726b80..f0f834a 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/MDCUnitOfWork.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/MDCUnitOfWork.java
@@ -94,14 +94,25 @@ public class MDCUnitOfWork extends DefaultUnitOfWork {
@Override
public void pushRouteContext(RouteContext routeContext) {
- MDC.put(MDC_ROUTE_ID, routeContext.getRoute().getId());
super.pushRouteContext(routeContext);
+ MDC.put(MDC_ROUTE_ID, routeContext.getRoute().getId());
}
@Override
public RouteContext popRouteContext() {
- MDC.remove(MDC_ROUTE_ID);
- return super.popRouteContext();
+ RouteContext answer = super.popRouteContext();
+
+ // restore old route id back again after we have popped
+ RouteContext previous = getRouteContext();
+ if (previous != null) {
+ // restore old route id back again
+ MDC.put(MDC_ROUTE_ID, previous.getRoute().getId());
+ } else {
+ // not running in route, so clear (should ideally not happen)
+ MDC.remove(MDC_ROUTE_ID);
+ }
+
+ return answer;
}
@Override
[6/6] camel git commit: CAMEL-11287: MDC routeId value is lost after
calling a direct route from a transacted route
Posted by da...@apache.org.
CAMEL-11287: MDC routeId value is lost after calling a direct route from a transacted route
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/32ac9081
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/32ac9081
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/32ac9081
Branch: refs/heads/camel-2.18.x
Commit: 32ac908197c3ab462c764f1fe5918b0a058dc62d
Parents: bf40b38
Author: Claus Ibsen <da...@apache.org>
Authored: Tue May 16 16:52:05 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue May 16 16:53:22 2017 +0200
----------------------------------------------------------------------
.../spring/NoopPlatformTransactionManager.java | 90 ++++++++++++++++++++
.../camel/spring/SpringMDCTransactedTest.java | 89 +++++++++++++++++++
2 files changed, 179 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/32ac9081/components/camel-spring/src/test/java/org/apache/camel/spring/NoopPlatformTransactionManager.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/NoopPlatformTransactionManager.java b/components/camel-spring/src/test/java/org/apache/camel/spring/NoopPlatformTransactionManager.java
new file mode 100644
index 0000000..2a31108
--- /dev/null
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/NoopPlatformTransactionManager.java
@@ -0,0 +1,90 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.spring;
+
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.TransactionDefinition;
+import org.springframework.transaction.TransactionException;
+import org.springframework.transaction.TransactionStatus;
+
+public class NoopPlatformTransactionManager implements PlatformTransactionManager {
+
+ @Override
+ public TransactionStatus getTransaction(TransactionDefinition definition) throws TransactionException {
+ return new StubTransactionStatus();
+ }
+
+ @Override
+ public void commit(TransactionStatus status) throws TransactionException {
+ // empty
+ }
+
+ @Override
+ public void rollback(TransactionStatus status) throws TransactionException {
+ // empty
+ }
+
+ protected static class StubTransactionStatus implements TransactionStatus {
+
+ @Override
+ public boolean isNewTransaction() {
+ return false;
+ }
+
+ @Override
+ public boolean hasSavepoint() {
+ return false;
+ }
+
+ @Override
+ public void setRollbackOnly() {
+ // empty
+ }
+
+ @Override
+ public boolean isRollbackOnly() {
+ return false;
+ }
+
+ @Override
+ public void flush() {
+ // empty
+ }
+
+ @Override
+ public boolean isCompleted() {
+ return false;
+ }
+
+ @Override
+ public Object createSavepoint() throws TransactionException {
+ return null;
+ }
+
+ @Override
+ public void rollbackToSavepoint(Object savepoint) throws TransactionException {
+ // empty
+ }
+
+ @Override
+ public void releaseSavepoint(Object savepoint) throws TransactionException {
+ // empty
+ }
+
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/32ac9081/components/camel-spring/src/test/java/org/apache/camel/spring/SpringMDCTransactedTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/SpringMDCTransactedTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/SpringMDCTransactedTest.java
new file mode 100644
index 0000000..e5fb062
--- /dev/null
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/SpringMDCTransactedTest.java
@@ -0,0 +1,89 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.spring;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.impl.JndiRegistry;
+import org.junit.Test;
+import org.slf4j.MDC;
+
+public class SpringMDCTransactedTest extends ContextTestSupport {
+
+ protected JndiRegistry createRegistry() throws Exception {
+ JndiRegistry result = super.createRegistry();
+ result.bind("NOOP-TX", new NoopPlatformTransactionManager());
+ return result;
+ }
+
+ @Test
+ public void testMDCTransacted() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedBodiesReceived("Hello World");
+
+ template.sendBody("direct:a", "Hello World");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ // enable MDC
+ context.setUseMDCLogging(true);
+
+ from("direct:a").routeId("route-a")
+ .transacted()
+ .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(exchange.getIn().getMessageId(), MDC.get("camel.messageId"));
+ }
+ })
+ .to("log:foo-before")
+ .to("direct:b")
+ .to("log:foo-after")
+ .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(exchange.getIn().getMessageId(), MDC.get("camel.messageId"));
+ }
+ });
+
+ from("direct:b").routeId("route-b")
+ .process(new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ assertEquals("route-b", MDC.get("camel.routeId"));
+ assertEquals(exchange.getExchangeId(), MDC.get("camel.exchangeId"));
+ assertEquals(exchange.getIn().getMessageId(), MDC.get("camel.messageId"));
+ }
+ })
+ .to("log:bar")
+ .to("mock:result");
+ }
+ };
+ }
+
+
+}