Repository: camel Updated Branches: refs/heads/master 722e590cb -> 1131374e2
CAMEL-11509 - httpcomponents-core 4.4.6 ContentType.create changed. so use ContentType.parse instead Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1131374e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1131374e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1131374e Branch: refs/heads/master Commit: 1131374e20db6e95c6e69cd7a64d7b54de4a38ae Parents: 722e590 Author: onders86 <ondersez...@gmail.com> Authored: Wed Jul 5 15:33:27 2017 +0300 Committer: onders86 <ondersez...@gmail.com> Committed: Sat Jul 15 02:27:46 2017 +0300 ---------------------------------------------------------------------- .../camel/component/http4/HttpProducer.java | 2 +- ...tpProducerContentTypeWithSemiColomnTest.java | 113 +++++++++++++++++++ 2 files changed, 114 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/1131374e/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 4c6154c..be67e73 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 @@ -505,7 +505,7 @@ public class HttpProducer extends DefaultProducer { //it removes "boundary" from Content-Type; I have to use contentType.create method. if (contentTypeString != null) { // using ContentType.parser for charset - if (contentTypeString.indexOf("charset") > 0) { + if (contentTypeString.indexOf("charset") > 0 || contentTypeString.indexOf(";") > 0) { contentType = ContentType.parse(contentTypeString); } else { contentType = ContentType.create(contentTypeString); http://git-wip-us.apache.org/repos/asf/camel/blob/1131374e/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerContentTypeWithSemiColomnTest.java ---------------------------------------------------------------------- diff --git a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerContentTypeWithSemiColomnTest.java b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerContentTypeWithSemiColomnTest.java new file mode 100644 index 0000000..695dfc3 --- /dev/null +++ b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerContentTypeWithSemiColomnTest.java @@ -0,0 +1,113 @@ +/** + * 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 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.impl.bootstrap.HttpServer; +import org.apache.http.impl.bootstrap.ServerBootstrap; +import org.apache.http.protocol.HttpContext; +import org.apache.http.protocol.HttpRequestHandler; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +public class HttpProducerContentTypeWithSemiColomnTest extends BaseHttpTest { + + private static final String CONTENT_TYPE = "multipart/form-data;boundary=---------------------------j2radvtrk"; + + private HttpServer localServer; + + @Before + @Override + public void setUp() throws Exception { + localServer = ServerBootstrap.bootstrap(). + setHttpProcessor(getBasicHttpProcessor()). + setConnectionReuseStrategy(getConnectionReuseStrategy()). + setResponseFactory(getHttpResponseFactory()). + setExpectationVerifier(getHttpExpectationVerifier()). + setSslContext(getSSLContext()). + registerHandler("/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.replace(";", "; "), contentType); + + response.setEntity(new StringEntity(contentType, "ASCII")); + response.setStatusCode(HttpStatus.SC_OK); + } + }).create(); + localServer.start(); + + super.setUp(); + } + + @After + @Override + public void tearDown() throws Exception { + super.tearDown(); + + if (localServer != null) { + localServer.stop(); + } + } + + @Test + public void testContentTypeWithBoundary() throws Exception { + Exchange out = template.request("http4://" + localServer.getInetAddress().getHostName() + ":" + localServer.getLocalPort() + "/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.replace(";", "; "), out.getOut().getBody(String.class)); + + } + + @Test + public void testContentTypeWithBoundaryWithIgnoreResponseBody() throws Exception { + Exchange out = template.request("http4://" + localServer.getInetAddress().getHostName() + ":" + localServer.getLocalPort() + "/content?ignoreResponseBody=true", 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()); + assertNull(out.getOut().getBody()); + + } +} \ No newline at end of file
