Author: davsclaus
Date: Mon Jun 4 10:15:05 2012
New Revision: 1345906
URL: http://svn.apache.org/viewvc?rev=1345906&view=rev
Log:
CAMEL-5329: restlet producer should presever headers like the other http
components.
Added:
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerPropagateHeadersTest.java
(with props)
Modified:
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
Modified:
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java?rev=1345906&r1=1345905&r2=1345906&view=diff
==============================================================================
---
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
(original)
+++
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
Mon Jun 4 10:15:05 2012
@@ -31,6 +31,7 @@ import org.apache.camel.WrappedFile;
import org.apache.camel.component.file.GenericFile;
import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.spi.HeaderFilterStrategyAware;
+import org.apache.camel.util.MessageHelper;
import org.restlet.Request;
import org.restlet.Response;
import org.restlet.data.ChallengeResponse;
@@ -265,6 +266,10 @@ public class DefaultRestletBinding imple
LOG.debug("Populate exchange from Restlet response: {}", text);
exchange.getOut().setBody(text);
}
+
+ // preserve headers from in by copying any non existing headers
+ // to avoid overriding existing headers with old values
+ MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), false);
}
public HeaderFilterStrategy getHeaderFilterStrategy() {
Added:
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerPropagateHeadersTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerPropagateHeadersTest.java?rev=1345906&view=auto
==============================================================================
---
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerPropagateHeadersTest.java
(added)
+++
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerPropagateHeadersTest.java
Mon Jun 4 10:15:05 2012
@@ -0,0 +1,66 @@
+/**
+ * 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.restlet;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.junit.Test;
+
+/**
+ * @version
+ */
+public class RestletProducerPropagateHeadersTest extends RestletTestSupport {
+
+ @Test
+ public void testRestletProducerGet() throws Exception {
+ getMockEndpoint("mock:result").expectedMessageCount(1);
+ getMockEndpoint("mock:result").expectedHeaderReceived("foo", "bar");
+
+ Map<String, Object> headers = new HashMap<String, Object>();
+ headers.put("id", 123);
+ headers.put("foo", "bar");
+
+ String out = template.requestBodyAndHeaders("direct:start", null,
headers, String.class);
+ assertEquals("123;Donald Duck", out);
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start")
+ .to("restlet:http://localhost:" + portNum +
"/users/123/basic")
+ .to("mock:result");
+
+ from("restlet:http://localhost:" + portNum +
"/users/{id}/basic")
+ .process(new Processor() {
+ public void process(Exchange exchange) throws
Exception {
+ String id = exchange.getIn().getHeader("id",
String.class);
+ exchange.getOut().setBody(id + ";Donald Duck");
+ }
+ });
+ }
+ };
+ }
+}
Propchange:
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerPropagateHeadersTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerPropagateHeadersTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date