Updated Branches: refs/heads/camel-2.11.x dbaa2bc07 -> 2ec54fa0c refs/heads/camel-2.12.x 277c9d393 -> 54b65c1d3
CAMEL-7129: Remove the CamelXsltResourceUri header from xslt component Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/54b65c1d Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/54b65c1d Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/54b65c1d Branch: refs/heads/camel-2.12.x Commit: 54b65c1d30848835f26bd138c0ba407bc1e560da Parents: 277c9d3 Author: Willem Jiang <willem.ji...@gmail.com> Authored: Mon Jan 13 11:02:48 2014 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Mon Jan 13 11:36:44 2014 +0800 ---------------------------------------------------------------------- .../apache/camel/component/xslt/XsltConstants.java | 3 +++ .../apache/camel/component/xslt/XsltEndpoint.java | 15 ++++----------- .../xslt/XsltFromHeaderOverrideEndpointUriTest.java | 5 ++--- 3 files changed, 9 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/54b65c1d/camel-core/src/main/java/org/apache/camel/component/xslt/XsltConstants.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/xslt/XsltConstants.java b/camel-core/src/main/java/org/apache/camel/component/xslt/XsltConstants.java index f5b12bc..1c76b41 100644 --- a/camel-core/src/main/java/org/apache/camel/component/xslt/XsltConstants.java +++ b/camel-core/src/main/java/org/apache/camel/component/xslt/XsltConstants.java @@ -21,6 +21,9 @@ package org.apache.camel.component.xslt; */ public final class XsltConstants { + @Deprecated + // XsltComponent don't support this message any more + // Please create the XsltEndpoint directly from the URI public static final String XSLT_RESOURCE_URI = "CamelXsltResourceUri"; private XsltConstants() { http://git-wip-us.apache.org/repos/asf/camel/blob/54b65c1d/camel-core/src/main/java/org/apache/camel/component/xslt/XsltEndpoint.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/xslt/XsltEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/xslt/XsltEndpoint.java index aa91b1a..297812d 100644 --- a/camel-core/src/main/java/org/apache/camel/component/xslt/XsltEndpoint.java +++ b/camel-core/src/main/java/org/apache/camel/component/xslt/XsltEndpoint.java @@ -76,19 +76,12 @@ public class XsltEndpoint extends ProcessorEndpoint { @Override protected void onExchange(Exchange exchange) throws Exception { - String newResourceUri = exchange.getIn().getHeader(XsltConstants.XSLT_RESOURCE_URI, String.class); - if (newResourceUri != null) { - exchange.getIn().removeHeader(XsltConstants.XSLT_RESOURCE_URI); - LOG.trace("{} set to {} creating new endpoint to handle exchange", XsltConstants.XSLT_RESOURCE_URI, newResourceUri); - XsltEndpoint newEndpoint = findOrCreateEndpoint(getEndpointUri(), newResourceUri); - newEndpoint.onExchange(exchange); - } else { - if (!cacheStylesheet || cacheCleared) { - loadResource(resourceUri); - } - super.onExchange(exchange); + if (!cacheStylesheet || cacheCleared) { + loadResource(resourceUri); } + super.onExchange(exchange); + } /** http://git-wip-us.apache.org/repos/asf/camel/blob/54b65c1d/camel-core/src/test/java/org/apache/camel/component/xslt/XsltFromHeaderOverrideEndpointUriTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/xslt/XsltFromHeaderOverrideEndpointUriTest.java b/camel-core/src/test/java/org/apache/camel/component/xslt/XsltFromHeaderOverrideEndpointUriTest.java index 84668b3..0eb6c26 100644 --- a/camel-core/src/test/java/org/apache/camel/component/xslt/XsltFromHeaderOverrideEndpointUriTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/xslt/XsltFromHeaderOverrideEndpointUriTest.java @@ -23,10 +23,9 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.impl.JndiRegistry; +import org.junit.Ignore; -/** - * - */ +@Ignore("CamelXsltComponent don't support XSLT_RESOURCE_URI header anymore") public class XsltFromHeaderOverrideEndpointUriTest extends ContextTestSupport { public void testSendMessageAndHaveItTransformed() throws Exception {
