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:35 UTC
[4/6] camel git commit: CAMEL-11287: MDC routeId value is lost after
calling a direct route from a transacted route
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");
+ }
+ };
+ }
+
+
+}