You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@camel.apache.org by ni...@apache.org on 2009/05/06 06:56:15 UTC

svn commit: r772054 - in /camel/trunk/components/camel-cxf/src: main/java/org/apache/camel/component/cxf/CxfHeaderFilterStrategy.java test/java/org/apache/camel/component/cxf/CxfRawMessageRouterTest.java

Author: ningjiang
Date: Wed May  6 04:56:14 2009
New Revision: 772054

URL: http://svn.apache.org/viewvc?rev=772054&view=rev
Log:
CAMEL-1586 added the unit test of checking the content-type header on the wire

Modified:
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfHeaderFilterStrategy.java
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfRawMessageRouterTest.java

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfHeaderFilterStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfHeaderFilterStrategy.java?rev=772054&r1=772053&r2=772054&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfHeaderFilterStrategy.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfHeaderFilterStrategy.java Wed May  6 04:56:14 2009
@@ -63,6 +63,11 @@
         getOutFilter().add(Message.PROTOCOL_HEADERS);
         getInFilter().add(Message.PROTOCOL_HEADERS);
         
+        // Since the DefaultCxfBinding deal with the content-type separately.
+        // We need to filter this header
+        getOutFilter().add("content-type");
+        getInFilter().add("content-type");
+        
         // initialize message header filter map with default SOAP filter
         messageHeaderFiltersMap = new HashMap<String, MessageHeaderFilter>();
         addToMessageHeaderFilterMap(new SoapMessageHeaderFilter());

Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfRawMessageRouterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfRawMessageRouterTest.java?rev=772054&r1=772053&r2=772054&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfRawMessageRouterTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfRawMessageRouterTest.java Wed May  6 04:56:14 2009
@@ -18,6 +18,9 @@
 
 import java.util.Map;
 
+import org.apache.camel.Exchange;
+import org.apache.camel.ExchangePattern;
+import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 
@@ -38,12 +41,30 @@
         result.expectedMessageCount(1);
         HelloService client = getCXFClient();
         client.echo("hello world");
-        assertMockEndpointsSatisfied();
+        assertMockEndpointsSatisfied();        
         Map context = (Map)result.assertExchangeReceived(0).getIn().getHeaders().get("ResponseContext");
         Map protocalHeaders = (Map) context.get("org.apache.cxf.message.Message.PROTOCOL_HEADERS");
         assertEquals("Should get the content type", protocalHeaders.get("content-type").toString(), "[text/xml; charset=utf-8]");
-        assertEquals("Should get the response code ", context.get("org.apache.cxf.message.Message.RESPONSE_CODE"), 200);
-        // get the content type directly from the message header
-        assertEquals("Should get the content type", result.assertExchangeReceived(0).getIn().getHeaders().get("content-type"), "text/xml; charset=utf-8");        
+        assertEquals("Should get the response code ", context.get("org.apache.cxf.message.Message.RESPONSE_CODE"), 200);        
+        assertEquals("Should get the content type", result.assertExchangeReceived(0).getIn().getHeaders().get("content.type"), "text/xml; charset=utf-8");        
+    }
+    
+    public void testTheContentTypeOnTheWire() throws Exception {
+        Exchange exchange = template.send(ROUTER_ADDRESS,  new Processor() {
+
+            public void process(Exchange exchange) throws Exception {
+                exchange.getIn().setBody("<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">" 
+                                         + "<soap:Body><ns1:echo xmlns:ns1=\"http://cxf.component.camel.apache.org/\">"
+                                         + "<arg0 xmlns=\"http://cxf.component.camel.apache.org/\">hello world</arg0>"
+                                         + "</ns1:echo></soap:Body></soap:Envelope>");
+            }
+
+        });
+        
+        assertNotNull("We should get the content type here", exchange.getOut().getHeader("Content-Type"));
+        assertEquals("Get wrong content type", "text/xml; charset=utf-8", exchange.getOut().getHeader("Content-Type"));
+        String response = exchange.getOut().getBody(String.class);        
+        assertNotNull("Response should not be null", response);
+        assertTrue("We should get right return result", response.indexOf("echo hello world") > 0);
     }
 }

Re: svn commit: r772054 - in /camel/trunk/components/camel-cxf/src: main/java/org/apache/camel/component/cxf/CxfHeaderFilterStrategy.java test/java/org/apache/camel/component/cxf/CxfRawMessageRouterTest.java

Posted by Willem Jiang <wi...@gmail.com>.

Hi,

It's much clearer after the discussion, I will head to clean up the
CamelTransportContants.CONTENT_TYPE later today.

Thanks,

Willem

Claus Ibsen wrote:
> On Thu, May 7, 2009 at 6:29 AM, William Tam <em...@gmail.com> wrote:
>> On Wed, May 6, 2009 at 11:55 PM, Claus Ibsen <cl...@gmail.com> wrote:
>>> On Thu, May 7, 2009 at 5:02 AM, William Tam <em...@gmail.com> wrote:
>>>> On Wed, May 6, 2009 at 9:57 PM, Willem Jiang <wi...@gmail.com> wrote:
>>>>> Hi William,
>>>>>
>>>>> Since the JMS can't accept the header which's name has the '-'
>>>>> character, we introduce the CamelTransportContants.CONTENT_TYPE for it.
>>>> I thought JMS could not handle dots in header names (that's why we
>>>> went from org.apache.camel convention to CamelHeaderName "case"
>>>> convention).  My memory may be wrong.
>>> Hi
>>>
>>> In Camel 2.0 we have added to the JMS component so it will be able to
>>> transfer Content-Type with the hyphen, as its a common header.
>>> If you use Camel on both sides then it will automatic revert it back
>>> to normal again. It replaces - with a _HYPHEN_ constant. So its
>>> transfered as Content_HYPHEN_Type.
>> In 2.0, does that mean it is OK to have hyphen in header?  If so, we
>> could clean up CamelTransportContants.CONTENT_TYPE?
> Yes the default JmsKeyFormatStrategy in Camel 2.0 is for the JMS component:
> 
> public class DefaultJmsKeyFormatStrategy implements JmsKeyFormatStrategy {
> 
>     public String encodeKey(String key) {
>         String answer = key.replace(".", "_");
>         answer = answer.replaceAll("-", "_HYPHEN_");
>         return answer;
>     }
> 
>     public String decodeKey(String key) {
>         String answer = key.replaceAll("_HYPHEN_", "-");
>         answer = answer.replace("_", ".");
>         return answer;
>     }
> 
> }
> 
> 
> 
>>>>> After checking the on wire message between the client and CXF consumer,
>>>>> I found there are two lines of "content-type" in the http header.
>>>>> One is "content-type", the other is "Content-Type".
>>>> The comment in code is kinda off.
>>>>
>>>>> So I added the filter of "content-type", and keep using "content.type"
>>>>> in the Camel message.
>>>>>
>>>>> Willem
>>>>>
>>>>>
>>>>> William Tam wrote:
>>>>>> Hi Willem,
>>>>>>
>>>>>> I don't think adding "content-type" to the filters is necessary.
>>>>>> 1. The header is "Content-Type" not "content-type",  so the change
>>>>>> does not really affect anything.
>>>>>> 2. Putting that aside.  If we add filters for "Content-Type", it stops
>>>>>> the propagating from Camel header to/from CXF header, which we don't
>>>>>> want.
>>>>>>
>>>>>> We probably should clean up the use of
>>>>>> CamelTransportContants.CONTENT_TYPE (value = content.type) and just
>>>>>> use Message.CONTENT_TYPE (value  = Content-Type).
>>>>>>
>>>>>> In DefaultCxfBinding.java, I don't see why we need to invent a header
>>>>>> constant (CamelTransportContants.CONTENT_TYPE) only used by camel-cxf
>>>>>> and have to map it back and forth.
>>>>>>
>>>>>>
>>>>>> That is, we can eliminate CamelTransportContants.CONTENT_TYPE and use
>>>>>> Message.CONTENT_TYPE consistently in:
>>>>>>
>>>>>>         // propagate content type
>>>>>>         String key = Message.CONTENT_TYPE;
>>>>>>         Object value = cxfMessage.get(key);
>>>>>>         if (value != null &&
>>>>>> !headerFilterStrategy.applyFilterToExternalHeaders(key, value,
>>>>>> exchange)) {
>>>>>>             camelHeaders.put(CamelTransportConstants.CONTENT_TYPE, value);
>>>>>>             if (LOG.isTraceEnabled()) {
>>>>>>                 LOG.trace("Populate header from CXF header=" + key + "
>>>>>> value=" + value);
>>>>>>             }
>>>>>>         }
>>>>>>
>>>>>> ...
>>>>>>             // put content type in exchange
>>>>>>             if (CamelTransportConstants.CONTENT_TYPE.equals(entry.getKey())) {
>>>>>>                 cxfExchange.put(Message.CONTENT_TYPE, entry.getValue());
>>>>>>                 continue;
>>>>>>             }
>>>>>>
>>>>>> Thoughts?
>>>>>>
>>>>>> ==============================================================================
>>>>>>> --- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfHeaderFilterStrategy.java (original)
>>>>>>> +++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfHeaderFilterStrategy.java Wed May  6 04:56:14 2009
>>>>>>> @@ -63,6 +63,11 @@
>>>>>>>         getOutFilter().add(Message.PROTOCOL_HEADERS);
>>>>>>>         getInFilter().add(Message.PROTOCOL_HEADERS);
>>>>>>>
>>>>>>> +        // Since the DefaultCxfBinding deal with the content-type separately.
>>>>>>> +        // We need to filter this header
>>>>>>> +        getOutFilter().add("content-type");
>>>>>>> +        getInFilter().add("content-type");
>>>>>>> +
>>>>>>>         // initialize message header filter map with default SOAP filter
>>>>>>>         messageHeaderFiltersMap = new HashMap<String, MessageHeaderFilter>();
>>>>>>>         addToMessageHeaderFilterMap(new SoapMessageHeaderFilter());
>>>>>>>
>>>>>
>>>
>>>
>>> --
>>> Claus Ibsen
>>> Apache Camel Committer
>>>
>>> Open Source Integration: http://fusesource.com
>>> Blog: http://davsclaus.blogspot.com/
>>> Twitter: http://twitter.com/davsclaus
>>> Apache Camel Reference Card:
>>> http://refcardz.dzone.com/refcardz/enterprise-integration
>>> Interview with me:
>>> http://architects.dzone.com/articles/interview-claus-ibsen-about?mz=7893-progress
>>>
> 
> 
>

Re: svn commit: r772054 - in /camel/trunk/components/camel-cxf/src: main/java/org/apache/camel/component/cxf/CxfHeaderFilterStrategy.java test/java/org/apache/camel/component/cxf/CxfRawMessageRouterTest.java

Posted by Claus Ibsen <cl...@gmail.com>.

On Thu, May 7, 2009 at 6:29 AM, William Tam <em...@gmail.com> wrote:
> On Wed, May 6, 2009 at 11:55 PM, Claus Ibsen <cl...@gmail.com> wrote:
>> On Thu, May 7, 2009 at 5:02 AM, William Tam <em...@gmail.com> wrote:
>>> On Wed, May 6, 2009 at 9:57 PM, Willem Jiang <wi...@gmail.com> wrote:
>>>> Hi William,
>>>>
>>>> Since the JMS can't accept the header which's name has the '-'
>>>> character, we introduce the CamelTransportContants.CONTENT_TYPE for it.
>>>
>>> I thought JMS could not handle dots in header names (that's why we
>>> went from org.apache.camel convention to CamelHeaderName "case"
>>> convention).  My memory may be wrong.
>> Hi
>>
>> In Camel 2.0 we have added to the JMS component so it will be able to
>> transfer Content-Type with the hyphen, as its a common header.
>> If you use Camel on both sides then it will automatic revert it back
>> to normal again. It replaces - with a _HYPHEN_ constant. So its
>> transfered as Content_HYPHEN_Type.
>
> In 2.0, does that mean it is OK to have hyphen in header?  If so, we
> could clean up CamelTransportContants.CONTENT_TYPE?
Yes the default JmsKeyFormatStrategy in Camel 2.0 is for the JMS component:

public class DefaultJmsKeyFormatStrategy implements JmsKeyFormatStrategy {

    public String encodeKey(String key) {
        String answer = key.replace(".", "_");
        answer = answer.replaceAll("-", "_HYPHEN_");
        return answer;
    }

    public String decodeKey(String key) {
        String answer = key.replaceAll("_HYPHEN_", "-");
        answer = answer.replace("_", ".");
        return answer;
    }

}



>
>>
>>>
>>>>
>>>> After checking the on wire message between the client and CXF consumer,
>>>> I found there are two lines of "content-type" in the http header.
>>>> One is "content-type", the other is "Content-Type".
>>>
>>> The comment in code is kinda off.
>>>
>>>>
>>>> So I added the filter of "content-type", and keep using "content.type"
>>>> in the Camel message.
>>>>
>>>> Willem
>>>>
>>>>
>>>> William Tam wrote:
>>>>> Hi Willem,
>>>>>
>>>>> I don't think adding "content-type" to the filters is necessary.
>>>>> 1. The header is "Content-Type" not "content-type",  so the change
>>>>> does not really affect anything.
>>>>> 2. Putting that aside.  If we add filters for "Content-Type", it stops
>>>>> the propagating from Camel header to/from CXF header, which we don't
>>>>> want.
>>>>>
>>>>> We probably should clean up the use of
>>>>> CamelTransportContants.CONTENT_TYPE (value = content.type) and just
>>>>> use Message.CONTENT_TYPE (value  = Content-Type).
>>>>>
>>>>> In DefaultCxfBinding.java, I don't see why we need to invent a header
>>>>> constant (CamelTransportContants.CONTENT_TYPE) only used by camel-cxf
>>>>> and have to map it back and forth.
>>>>>
>>>>>
>>>>> That is, we can eliminate CamelTransportContants.CONTENT_TYPE and use
>>>>> Message.CONTENT_TYPE consistently in:
>>>>>
>>>>>         // propagate content type
>>>>>         String key = Message.CONTENT_TYPE;
>>>>>         Object value = cxfMessage.get(key);
>>>>>         if (value != null &&
>>>>> !headerFilterStrategy.applyFilterToExternalHeaders(key, value,
>>>>> exchange)) {
>>>>>             camelHeaders.put(CamelTransportConstants.CONTENT_TYPE, value);
>>>>>             if (LOG.isTraceEnabled()) {
>>>>>                 LOG.trace("Populate header from CXF header=" + key + "
>>>>> value=" + value);
>>>>>             }
>>>>>         }
>>>>>
>>>>> ...
>>>>>             // put content type in exchange
>>>>>             if (CamelTransportConstants.CONTENT_TYPE.equals(entry.getKey())) {
>>>>>                 cxfExchange.put(Message.CONTENT_TYPE, entry.getValue());
>>>>>                 continue;
>>>>>             }
>>>>>
>>>>> Thoughts?
>>>>>
>>>>> ==============================================================================
>>>>>> --- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfHeaderFilterStrategy.java (original)
>>>>>> +++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfHeaderFilterStrategy.java Wed May  6 04:56:14 2009
>>>>>> @@ -63,6 +63,11 @@
>>>>>>         getOutFilter().add(Message.PROTOCOL_HEADERS);
>>>>>>         getInFilter().add(Message.PROTOCOL_HEADERS);
>>>>>>
>>>>>> +        // Since the DefaultCxfBinding deal with the content-type separately.
>>>>>> +        // We need to filter this header
>>>>>> +        getOutFilter().add("content-type");
>>>>>> +        getInFilter().add("content-type");
>>>>>> +
>>>>>>         // initialize message header filter map with default SOAP filter
>>>>>>         messageHeaderFiltersMap = new HashMap<String, MessageHeaderFilter>();
>>>>>>         addToMessageHeaderFilterMap(new SoapMessageHeaderFilter());
>>>>>>
>>>>>
>>>>
>>>>
>>>
>>
>>
>>
>> --
>> Claus Ibsen
>> Apache Camel Committer
>>
>> Open Source Integration: http://fusesource.com
>> Blog: http://davsclaus.blogspot.com/
>> Twitter: http://twitter.com/davsclaus
>> Apache Camel Reference Card:
>> http://refcardz.dzone.com/refcardz/enterprise-integration
>> Interview with me:
>> http://architects.dzone.com/articles/interview-claus-ibsen-about?mz=7893-progress
>>
>



-- 
Claus Ibsen
Apache Camel Committer

Open Source Integration: http://fusesource.com
Blog: http://davsclaus.blogspot.com/
Twitter: http://twitter.com/davsclaus
Apache Camel Reference Card:
http://refcardz.dzone.com/refcardz/enterprise-integration
Interview with me:
http://architects.dzone.com/articles/interview-claus-ibsen-about?mz=7893-progress