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 2010/12/20 05:55:16 UTC
svn commit: r1050988 - in /camel/trunk/components:
camel-http/src/main/java/org/apache/camel/component/http/
camel-http/src/main/java/org/apache/camel/component/http/helper/
camel-jetty/src/main/java/org/apache/camel/component/jetty/
camel-jetty/src/te...
Author: ningjiang
Date: Mon Dec 20 04:55:16 2010
New Revision: 1050988
URL: http://svn.apache.org/viewvc?rev=1050988&view=rev
Log:
CAMEL-3443 Honor the charset setting of Http Content-Type from the CamelServlet
Added:
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/helper/HttpHelper.java (with props)
Modified:
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/CamelServlet.java
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentTypeTest.java
Modified: camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/CamelServlet.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/CamelServlet.java?rev=1050988&r1=1050987&r2=1050988&view=diff
==============================================================================
--- camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/CamelServlet.java (original)
+++ camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/CamelServlet.java Mon Dec 20 04:55:16 2010
@@ -26,6 +26,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
+import org.apache.camel.component.http.helper.HttpHelper;
import org.apache.camel.impl.DefaultExchange;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -65,6 +66,8 @@ public class CamelServlet extends HttpSe
if (consumer.getEndpoint().isDisableStreamCache()) {
exchange.setProperty(Exchange.DISABLE_HTTP_STREAM_CACHE, Boolean.TRUE);
}
+
+ HttpHelper.setCharsetFromContentType(request.getContentType(), exchange);
exchange.setIn(new HttpMessage(exchange, request, response));
// Have the camel process the HTTP exchange.
Modified: camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java?rev=1050988&r1=1050987&r2=1050988&view=diff
==============================================================================
--- camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java (original)
+++ camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java Mon Dec 20 04:55:16 2010
@@ -29,6 +29,7 @@ import org.apache.camel.Message;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.component.file.GenericFile;
import org.apache.camel.component.http.helper.GZIPHelper;
+import org.apache.camel.component.http.helper.HttpHelper;
import org.apache.camel.component.http.helper.HttpProducerHelper;
import org.apache.camel.converter.IOConverter;
import org.apache.camel.converter.stream.CachedOutputStream;
@@ -224,11 +225,7 @@ public class HttpProducer extends Defaul
if (header != null) {
String contentType = header.getValue();
// find the charset and set it to the Exchange
- int index = contentType.indexOf("charset=");
- if (index > 0) {
- String charset = contentType.substring(index + 8);
- exchange.setProperty(Exchange.CHARSET_NAME, IOConverter.normalizeCharset(charset));
- }
+ HttpHelper.setCharsetFromContentType(contentType, exchange);
}
return doExtractResponseBody(is, exchange);
}
Added: camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/helper/HttpHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/helper/HttpHelper.java?rev=1050988&view=auto
==============================================================================
--- camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/helper/HttpHelper.java (added)
+++ camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/helper/HttpHelper.java Mon Dec 20 04:55:16 2010
@@ -0,0 +1,39 @@
+/**
+ * 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.http.helper;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.converter.IOConverter;
+
+public final class HttpHelper {
+
+ private HttpHelper() {
+ // Helper class
+ }
+
+ public static void setCharsetFromContentType(String contentType, Exchange exchange) {
+ if (contentType != null) {
+ // find the charset and set it to the Exchange
+ int index = contentType.indexOf("charset=");
+ if (index > 0) {
+ String charset = contentType.substring(index + 8);
+ exchange.setProperty(Exchange.CHARSET_NAME, IOConverter.normalizeCharset(charset));
+ }
+ }
+ }
+
+}
Propchange: camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/helper/HttpHelper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/helper/HttpHelper.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java?rev=1050988&r1=1050987&r2=1050988&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java (original)
+++ camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java Mon Dec 20 04:55:16 2010
@@ -27,6 +27,7 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.component.http.CamelServlet;
import org.apache.camel.component.http.HttpConsumer;
import org.apache.camel.component.http.HttpMessage;
+import org.apache.camel.component.http.helper.HttpHelper;
import org.apache.camel.impl.DefaultExchange;
import org.eclipse.jetty.continuation.Continuation;
import org.eclipse.jetty.continuation.ContinuationSupport;
@@ -69,6 +70,7 @@ public class CamelContinuationServlet ex
if (consumer.getEndpoint().isDisableStreamCache()) {
exchange.setProperty(Exchange.DISABLE_HTTP_STREAM_CACHE, Boolean.TRUE);
}
+ HttpHelper.setCharsetFromContentType(request.getContentType(), exchange);
exchange.setIn(new HttpMessage(exchange, request, response));
if (log.isTraceEnabled()) {
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentTypeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentTypeTest.java?rev=1050988&r1=1050987&r2=1050988&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentTypeTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentTypeTest.java Mon Dec 20 04:55:16 2010
@@ -29,13 +29,17 @@ import org.junit.Test;
*/
public class JettyContentTypeTest extends BaseJettyTest {
- protected void sendMessageWithContentType(boolean usingGZip) {
+ protected void sendMessageWithContentType(String charset, boolean usingGZip) {
Endpoint endpoint = context.getEndpoint("http://localhost:{{port}}/myapp/myservice");
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("<order>123</order>");
exchange.getIn().setHeader("User", "Claus");
exchange.getIn().setHeader("SOAPAction", "test");
- exchange.getIn().setHeader("Content-Type", "text/xml");
+ if (charset == null) {
+ exchange.getIn().setHeader("Content-Type", "text/xml");
+ } else {
+ exchange.getIn().setHeader("Content-Type", "text/xml; charset=" + charset);
+ }
if (usingGZip) {
exchange.getIn().setHeader(Exchange.CONTENT_ENCODING, "gzip");
}
@@ -48,12 +52,14 @@ public class JettyContentTypeTest extend
@Test
public void testSameContentType() throws Exception {
- sendMessageWithContentType(false);
+ sendMessageWithContentType(null, false);
+ sendMessageWithContentType("UTF-8", false);
}
@Test
public void testContentTypeWithGZipEncoding() throws Exception {
- sendMessageWithContentType(true);
+ sendMessageWithContentType(null, true);
+ sendMessageWithContentType("UTF-8", true);
}
@Test
@@ -89,6 +95,9 @@ public class JettyContentTypeTest extend
}
if ("Claus".equals(user) && contentType.startsWith("text/xml") && body.equals("<order>123</order>")) {
assertEquals("test", exchange.getIn().getHeader("SOAPAction", String.class));
+ if (contentType.endsWith("UTF-8")) {
+ assertEquals("Get a wrong charset name.", exchange.getProperty(Exchange.CHARSET_NAME, String.class), "UTF-8");
+ }
exchange.getOut().setBody("<order>OK</order>");
exchange.getOut().setHeader("Content-Type", "text/xml");
} else {