Author: dvaleri
Date: Thu Oct 6 22:42:46 2011
New Revision: 1179889
URL: http://svn.apache.org/viewvc?rev=1179889&view=rev
Log:
[CAMEL-4521] Apply the Camel message body content as the HTTP request body for
HTTP PUT requests. Patch applied with thanks to Rich Newcomb.
Added:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerPutContentTest.java
(with props)
Modified:
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
Modified:
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java?rev=1179889&r1=1179888&r2=1179889&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
(original)
+++
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
Thu Oct 6 22:42:46 2011
@@ -98,8 +98,8 @@ public class JettyHttpProducer extends D
// set query parameters
doSetQueryParameters(exchange, httpExchange);
- // if we post then set data
- if (HttpMethods.POST.equals(methodToUse)) {
+ // if we post or put then set data
+ if (HttpMethods.POST.equals(methodToUse) ||
HttpMethods.PUT.equals(methodToUse)) {
String contentType = ExchangeHelper.getContentType(exchange);
if (contentType != null) {
Added:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerPutContentTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerPutContentTest.java?rev=1179889&view=auto
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerPutContentTest.java
(added)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerPutContentTest.java
Thu Oct 6 22:42:46 2011
@@ -0,0 +1,81 @@
+/**
+ * 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.jetty.jettyproducer;
+
+import java.io.File;
+import java.io.InputStream;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.jetty.BaseJettyTest;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
+
+/**
+ * @version
+ */
+public class JettyHttpProducerPutContentTest extends BaseJettyTest {
+
+ @Test
+ public void testHttpProducerPutContentTest() throws Exception {
+ // these tests do not run well on Windows
+ if (isPlatform("windows")) {
+ return;
+ }
+
+ // give Jetty time to startup properly
+ Thread.sleep(1000);
+
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMinimumMessageCount(1);
+ mock.message(0).body().isInstanceOf(InputStream.class);
+ mock.message(0).header("Content-Type").isEqualTo("image/jpeg");
+
+ Exchange out =
template.send("jetty://http://localhost:{{port}}/myapp/myservice";, new
Processor() {
+ public void process(Exchange exchange) throws Exception {
+ exchange.getIn().setBody(new File("src/test/data/logo.jpeg"));
+ exchange.getIn().setHeader("Content-Type", "image/jpeg");
+ exchange.getIn().setHeader(Exchange.HTTP_METHOD,
org.apache.camel.component.http.HttpMethods.PUT);
+ }
+ });
+
+ assertMockEndpointsSatisfied();
+
+ assertEquals("OK", out.getOut().getBody(String.class));
+ assertEquals("text/plain", out.getOut().getHeader("Content-Type"));
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ public void configure() throws Exception {
+ from("jetty:http://localhost:{{port}}/myapp/myservice";)
+ .to("mock:result")
+ .process(new Processor() {
+ public void process(Exchange exchange) throws
Exception {
+ String body =
exchange.getIn().getBody(String.class);
+ assertNotNull("Body should not be null", body);
+ assertTrue("CamelHttpMethod is not PUT",
exchange.getIn().getHeader("CamelHttpMethod").equals("PUT"));
+ assertTrue("Content-Type is not image/jpeg",
exchange.getIn().getHeader("Content-Type").equals("image/jpeg"));
+ }
+ })
+ .transform(constant("OK")).setHeader("Content-Type",
constant("text/plain"));
+ }
+ };
+ }
+}
Propchange:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerPutContentTest.java
------------------------------------------------------------------------------
svn:eol-style = native
