CAMEL-7457 fixed the test error and added an unit test for CxfRsHeaderFilterStrategy
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/74707f74 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/74707f74 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/74707f74 Branch: refs/heads/camel-2.12.x Commit: 74707f74b116ffe6b16beb15b5772daa048a9889 Parents: ce3f8ee Author: Willem Jiang <willem.ji...@gmail.com> Authored: Mon May 26 12:23:47 2014 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Mon May 26 15:38:39 2014 +0800 ---------------------------------------------------------------------- .../cxf/jaxrs/CxfRsHeaderFilterStrategy.java | 2 +- .../jaxrs/CxfRsHeaderFilterStrategyTest.java | 42 ++++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/74707f74/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsHeaderFilterStrategy.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsHeaderFilterStrategy.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsHeaderFilterStrategy.java index fc69c60..4972d99 100644 --- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsHeaderFilterStrategy.java +++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsHeaderFilterStrategy.java @@ -40,7 +40,7 @@ public class CxfRsHeaderFilterStrategy extends DefaultHeaderFilterStrategy { getOutFilter().add(Exchange.HTTP_PATH); getOutFilter().add(Exchange.DESTINATION_OVERRIDE_URL); // filter headers begin with "Camel" or "org.apache.camel" - setOutFilterPattern("((Camel|org\\.apache\\.camel)[\\.|a-z|A-z|0-9]|(?i)Content-Type)*"); + setOutFilterPattern("((Camel|org\\.apache\\.camel)[\\.|a-z|A-z|0-9]*)|(?i)Content-Type"); } http://git-wip-us.apache.org/repos/asf/camel/blob/74707f74/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsHeaderFilterStrategyTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsHeaderFilterStrategyTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsHeaderFilterStrategyTest.java new file mode 100644 index 0000000..eab6c41 --- /dev/null +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsHeaderFilterStrategyTest.java @@ -0,0 +1,42 @@ +/** + * 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.component.cxf.jaxrs; + +import org.apache.camel.Exchange; +import org.apache.camel.component.cxf.common.message.CxfConstants; +import org.apache.camel.spi.HeaderFilterStrategy; +import org.junit.Assert; +import org.junit.Test; + +public class CxfRsHeaderFilterStrategyTest extends Assert { + @Test + public void testFilterContentType() throws Exception { + HeaderFilterStrategy filter = new CxfRsHeaderFilterStrategy(); + assertTrue("Get a wrong filtered result", filter.applyFilterToCamelHeaders("content-type","just a test", null)); + assertTrue("Get a wrong filtered result", filter.applyFilterToCamelHeaders("Content-Type","just a test", null)); + } + + @Test + public void testFilterCamelHeaders() throws Exception { + HeaderFilterStrategy filter = new CxfRsHeaderFilterStrategy(); + assertTrue("Get a wrong filtered result", filter.applyFilterToCamelHeaders(Exchange.CHARSET_NAME,"just a test", null)); + assertTrue("Get a wrong filtered result", filter.applyFilterToCamelHeaders(CxfConstants.CAMEL_CXF_RS_RESPONSE_CLASS, "just a test", null)); + assertTrue("Get a wrong filtered result", filter.applyFilterToCamelHeaders("org.apache.camel.such.Header","just a test", null)); + assertFalse("Get a wrong filtered result", filter.applyFilterToCamelHeaders("camel.result", "just a test", null)); + } + +}
