CAMEL-6926 Fix issue of camel-http4 doesn't set the content-type with boundary with thanks to Amit
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bb8cdb1f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bb8cdb1f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bb8cdb1f Branch: refs/heads/camel-2.11.x Commit: bb8cdb1fd13ddf47b83fa786fd0b72b221e24141 Parents: 8c3eae2 Author: Willem Jiang <[email protected]> Authored: Wed Nov 6 20:21:55 2013 +0800 Committer: Willem Jiang <[email protected]> Committed: Wed Nov 6 21:52:44 2013 +0800 ---------------------------------------------------------------------- .../camel/component/http4/HttpProducer.java | 7 +- .../http4/HttpProducerContentTypeTest.java | 70 ++++++++++++++++++++ 2 files changed, 76 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/bb8cdb1f/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java index f45ce94..2e460c8 100644 --- a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java +++ b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java @@ -411,9 +411,14 @@ public class HttpProducer extends DefaultProducer { if (data != null) { String contentTypeString = ExchangeHelper.getContentType(exchange); ContentType contentType = null; + + //Check the contentType is valid or not, If not it throws an exception. + //When ContentType.parse parse method parse "multipart/form-data;boundary=---------------------------j2radvtrk", + //it removes "boundary" from Content-Type; I have to use contentType.create method. if (contentTypeString != null) { - contentType = ContentType.parse(contentTypeString); + contentType = ContentType.create(contentTypeString); } + if (contentTypeString != null && HttpConstants.CONTENT_TYPE_JAVA_SERIALIZED_OBJECT.equals(contentTypeString)) { // serialized java object Serializable obj = in.getMandatoryBody(Serializable.class); http://git-wip-us.apache.org/repos/asf/camel/blob/bb8cdb1f/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerContentTypeTest.java ---------------------------------------------------------------------- diff --git a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerContentTypeTest.java b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerContentTypeTest.java new file mode 100644 index 0000000..2c42a84 --- /dev/null +++ b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerContentTypeTest.java @@ -0,0 +1,70 @@ +/** + * 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.http4; + +import java.io.IOException; +import java.util.List; + +import org.apache.camel.Exchange; +import org.apache.camel.Processor; +import org.apache.http.HttpException; +import org.apache.http.HttpRequest; +import org.apache.http.HttpResponse; +import org.apache.http.HttpStatus; +import org.apache.http.entity.StringEntity; +import org.apache.http.localserver.LocalTestServer; +import org.apache.http.protocol.HttpContext; +import org.apache.http.protocol.HttpRequestHandler; +import org.junit.Test; + +public class HttpProducerContentTypeTest extends BaseHttpTest { + + private static final String CONTENT_TYPE = "multipart/form-data;boundary=---------------------------j2radvtrk"; + @Test + public void testContentTypeWithBoundary() throws Exception { + Exchange out = template.request("http4://" + getHostName() + ":" + getPort() + "/content", new Processor() { + + @Override + public void process(Exchange exchange) throws Exception { + exchange.getIn().setHeader(Exchange.CONTENT_TYPE, CONTENT_TYPE); + exchange.getIn().setBody("This is content"); + } + + }); + + assertNotNull(out); + assertFalse("Should not fail", out.isFailed()); + assertEquals(CONTENT_TYPE, out.getOut().getBody(String.class)); + + } + + @Override + protected void registerHandler(LocalTestServer server) { + server.register("/content", new HttpRequestHandler() { + @Override + public void handle(HttpRequest request, HttpResponse response, HttpContext context) throws HttpException, IOException { + String contentType = request.getFirstHeader(Exchange.CONTENT_TYPE).getValue(); + + assertEquals(CONTENT_TYPE, contentType); + + response.setEntity(new StringEntity(contentType, "ASCII")); + response.setStatusCode(HttpStatus.SC_OK); + } + }); + } +} \ No newline at end of file
