camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject git commit: CAMEL-7073: Overwrite org.restlet.http.headers in response instead of adding to it.
Date Tue, 17 Dec 2013 02:44:10 GMT
Updated Branches:
  refs/heads/master 2e7a7c8ad -> 58f4845e0


CAMEL-7073: Overwrite org.restlet.http.headers in response instead of adding to it.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/58f4845e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/58f4845e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/58f4845e

Branch: refs/heads/master
Commit: 58f4845e04303eba65718b9f37a2ee2449e7069e
Parents: 2e7a7c8
Author: David Keen <dkkeen@gmail.com>
Authored: Mon Dec 16 15:43:49 2013 +0000
Committer: David Keen <dkkeen@gmail.com>
Committed: Mon Dec 16 15:43:49 2013 +0000

----------------------------------------------------------------------
 .../restlet/DefaultRestletBinding.java          |  3 +-
 .../component/restlet/RestletPostFormTest.java  | 72 ++++++++++++++++++++
 2 files changed, 73 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/58f4845e/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
----------------------------------------------------------------------
diff --git a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
index ddbff14..ebef445 100644
--- a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
+++ b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
@@ -274,8 +274,7 @@ public class DefaultRestletBinding implements RestletBinding, HeaderFilterStrate
 
         // set HTTP headers so we return these in the response
         if (!series.isEmpty()) {
-            Series<Header> httpHeaders = (Series<Header>) response.getAttributes().get(HeaderConstants.ATTRIBUTE_HEADERS);
-            httpHeaders.addAll(series);
+            response.getAttributes().put(HeaderConstants.ATTRIBUTE_HEADERS, series);
         }
     }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/58f4845e/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostFormTest.java
----------------------------------------------------------------------
diff --git a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostFormTest.java
b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostFormTest.java
new file mode 100644
index 0000000..41f05e6
--- /dev/null
+++ b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostFormTest.java
@@ -0,0 +1,72 @@
+/**
+ * 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 org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.http.HttpResponse;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.methods.HttpUriRequest;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.message.BasicNameValuePair;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ *
+ * @version 
+ */
+public class RestletPostFormTest extends RestletTestSupport {
+
+    @Override
+    protected RouteBuilder createRouteBuilder() {
+
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("restlet:http://localhost:" + portNum + "/users?restletMethod=POST")
+                    .process(new PostProcessor());
+            }
+        };
+    }
+    
+    class PostProcessor implements Processor {
+        public void process(Exchange exchange) throws Exception {   
+            assertEquals("bar", exchange.getIn().getHeader("foo", String.class));
+        }
+    }
+    
+    @Test
+    public void testPostBody() throws Exception {
+        HttpUriRequest method = new HttpPost("http://localhost:" + portNum + "/users");
+
+        List<NameValuePair> urlParameters = new ArrayList<NameValuePair>();
+        urlParameters.add(new BasicNameValuePair("foo", "bar"));
+
+        ((HttpEntityEnclosingRequestBase)method).setEntity(new UrlEncodedFormEntity(urlParameters));
+
+        HttpResponse response = doExecute(method);
+        
+        assertHttpResponse(response, 200, "text/plain");
+    }
+}
\ No newline at end of file


Mime
View raw message