CAMEL-6469: http component now have header with response status line …

…text as well (the code is already there)
apache · Jul 11, 2015 · a4828fa · a4828fa
1 parent 2dac9aa
commit a4828fa
Show file tree

Hide file tree

Showing 17 changed files with 27 additions and 6 deletions.
diff --git a/camel-core/src/main/java/org/apache/camel/Exchange.java b/camel-core/src/main/java/org/apache/camel/Exchange.java
@@ -145,6 +145,7 @@ public interface Exchange {
     String HTTP_QUERY              = "CamelHttpQuery";
     String HTTP_RAW_QUERY          = "CamelHttpRawQuery";
     String HTTP_RESPONSE_CODE      = "CamelHttpResponseCode";
+    String HTTP_RESPONSE_TEXT      = "CamelHttpResponseText";
     String HTTP_URI                = "CamelHttpUri";
     String HTTP_URL                = "CamelHttpUrl";
     String HTTP_CHUNKED            = "CamelHttpChunked";

diff --git a/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/DefaultAhcBinding.java b/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/DefaultAhcBinding.java
@@ -191,6 +191,7 @@ public void onStatusReceived(AhcEndpoint endpoint, Exchange exchange, HttpRespon
         // Just filter the http protocol headers 
         MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), httpProtocolHeaderFilterStrategy, false);
         exchange.getOut().setHeader(Exchange.HTTP_RESPONSE_CODE, responseStatus.getStatusCode());
+        exchange.getOut().setHeader(Exchange.HTTP_RESPONSE_TEXT, responseStatus.getStatusText());
     }
 
     @Override

diff --git a/...ents/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceGetHeadersTest.java b/...ents/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceGetHeadersTest.java
@@ -31,6 +31,7 @@ public void testAhcProduce() throws Exception {
         getMockEndpoint("mock:result").expectedHeaderReceived("foo", 123);
         getMockEndpoint("mock:result").expectedHeaderReceived("bar", "cool");
         getMockEndpoint("mock:result").expectedHeaderReceived(Exchange.HTTP_RESPONSE_CODE, 200);
+        getMockEndpoint("mock:result").expectedHeaderReceived(Exchange.HTTP_RESPONSE_TEXT, "OK");
         getMockEndpoint("mock:result").expectedHeaderReceived(Exchange.CONTENT_LENGTH, 9);
 
         Map<String, Object> headers = new HashMap<String, Object>();

diff --git a/...src/test/java/org/apache/camel/component/ahc/AhcProduceNoThrowExceptionOnFailureTest.java b/...src/test/java/org/apache/camel/component/ahc/AhcProduceNoThrowExceptionOnFailureTest.java
@@ -27,6 +27,7 @@ public class AhcProduceNoThrowExceptionOnFailureTest extends BaseAhcTest {
     public void testAhcProduce() throws Exception {
         getMockEndpoint("mock:result").expectedBodiesReceived("Does not work");
         getMockEndpoint("mock:result").expectedHeaderReceived(Exchange.HTTP_RESPONSE_CODE, 500);
+        getMockEndpoint("mock:result").expectedHeaderReceived(Exchange.HTTP_RESPONSE_TEXT, "Server Error");
 
         template.sendBody("direct:start", null);
 

diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpPollingConsumer.java b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpPollingConsumer.java
@@ -91,6 +91,7 @@ protected Exchange doReceive(int timeout) {
                 }
             }
             message.setHeader(Exchange.HTTP_RESPONSE_CODE, responseCode);
+            message.setHeader(Exchange.HTTP_RESPONSE_TEXT, method.getStatusText());
 
             return exchange;
         } catch (IOException e) {

diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
@@ -173,6 +173,7 @@ protected void populateResponse(Exchange exchange, HttpMethod method, Message in
         Message answer = exchange.getOut();
 
         answer.setHeader(Exchange.HTTP_RESPONSE_CODE, responseCode);
+        answer.setHeader(Exchange.HTTP_RESPONSE_TEXT, method.getStatusText());
         answer.setBody(response);
 
         // propagate HTTP response headers

diff --git a/...nents/camel-http4/src/main/java/org/apache/camel/component/http4/HttpPollingConsumer.java b/...nents/camel-http4/src/main/java/org/apache/camel/component/http4/HttpPollingConsumer.java
@@ -100,6 +100,9 @@ protected Exchange doReceive(int timeout) {
                 }
             }
             message.setHeader(Exchange.HTTP_RESPONSE_CODE, responseCode);
+            if (response.getStatusLine() != null) {
+                message.setHeader(Exchange.HTTP_RESPONSE_TEXT, response.getStatusLine().getReasonPhrase());
+            }
 
             return exchange;
         } catch (IOException e) {

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
@@ -189,6 +189,9 @@ protected void populateResponse(Exchange exchange, HttpRequestBase httpRequest,
         Message answer = exchange.getOut();
 
         answer.setHeader(Exchange.HTTP_RESPONSE_CODE, responseCode);
+        if (httpResponse.getStatusLine() != null) {
+            answer.setHeader(Exchange.HTTP_RESPONSE_TEXT, httpResponse.getStatusLine().getReasonPhrase());
+        }
         answer.setBody(response);
 
         // propagate HTTP response headers

diff --git a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpMethodsTest.java b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpMethodsTest.java
@@ -97,6 +97,7 @@ public void process(Exchange exchange) throws Exception {
         Message out = exchange.getOut();
         Map<String, Object> headers = out.getHeaders();
         assertEquals(HttpStatus.SC_NOT_IMPLEMENTED, headers.get(Exchange.HTTP_RESPONSE_CODE));
+        assertEquals("Not Implemented", headers.get(Exchange.HTTP_RESPONSE_TEXT));
         assertEquals("26", headers.get("Content-Length"));
         assertNotNull("Should have Content-Type header", headers.get("Content-Type"));
         assertEquals("PATCH method not supported", out.getBody(String.class));

diff --git a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpRedirectTest.java b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpRedirectTest.java
@@ -101,6 +101,7 @@ public void process(Exchange exchange) throws Exception {
 
         assertNotNull(out);
         assertEquals(HttpStatus.SC_OK, out.getOut().getHeader(Exchange.HTTP_RESPONSE_CODE));
+        assertEquals("OK", out.getOut().getHeader(Exchange.HTTP_RESPONSE_TEXT));
         assertEquals("Bye World", out.getOut().getBody(String.class));
     }
 

diff --git a/...jetty9/src/test/java/org/apache/camel/component/jetty/JettyCallHttpThenExceptionTest.java b/...jetty9/src/test/java/org/apache/camel/component/jetty/JettyCallHttpThenExceptionTest.java
@@ -42,6 +42,7 @@ public void process(Exchange exchange) throws Exception {
         assertNotNull(reply);
         assertTrue(reply.getOut().getBody(String.class).startsWith("java.lang.IllegalArgumentException: I cannot do this"));
         assertEquals(500, reply.getOut().getHeader(Exchange.HTTP_RESPONSE_CODE));
+        assertEquals("Server Error", reply.getOut().getHeader(Exchange.HTTP_RESPONSE_TEXT));
     }
 
     @Override

diff --git a/...tty-http/src/main/java/org/apache/camel/component/netty/http/DefaultNettyHttpBinding.java b/...tty-http/src/main/java/org/apache/camel/component/netty/http/DefaultNettyHttpBinding.java
@@ -265,7 +265,7 @@ public void populateCamelHeaders(HttpResponse response, Map<String, Object> head
         LOG.trace("populateCamelHeaders: {}", response);
 
         headers.put(Exchange.HTTP_RESPONSE_CODE, response.getStatus().getCode());
-        headers.put(NettyHttpConstants.HTTP_RESPONSE_TEXT, response.getStatus().getReasonPhrase());
+        headers.put(Exchange.HTTP_RESPONSE_TEXT, response.getStatus().getReasonPhrase());
 
         for (String name : response.headers().names()) {
             // mapping the content-type

diff --git a/...el-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConstants.java b/...el-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConstants.java
@@ -16,14 +16,17 @@
  */
 package org.apache.camel.component.netty.http;
 
+import org.apache.camel.Exchange;
+
 /**
  * Netty HTTP constants.
  */
 public final class NettyHttpConstants {
 
     public static final String CONTENT_TYPE_JAVA_SERIALIZED_OBJECT = "application/x-java-serialized-object";
     public static final String CONTENT_TYPE_WWW_FORM_URLENCODED = "application/x-www-form-urlencoded";
-    public static final String HTTP_RESPONSE_TEXT = "CamelHttpResponseText";
+    @Deprecated
+    public static final String HTTP_RESPONSE_TEXT = Exchange.HTTP_RESPONSE_TEXT;
     public static final String HTTP_AUTHENTICATION = "CamelHttpAuthentication";
 
     private NettyHttpConstants() {

diff --git a/.../src/test/java/org/apache/camel/component/netty/http/NettyHttpFilterCamelHeadersTest.java b/.../src/test/java/org/apache/camel/component/netty/http/NettyHttpFilterCamelHeadersTest.java
@@ -42,7 +42,7 @@ public void process(Exchange exchange) throws Exception {
         // except for the response code and response text
         Map<String, Object> headers = out.getOut().getHeaders();
         for (String key : headers.keySet()) {
-            if (!key.equalsIgnoreCase(Exchange.HTTP_RESPONSE_CODE) && !key.equalsIgnoreCase(NettyHttpConstants.HTTP_RESPONSE_TEXT)) {
+            if (!key.equalsIgnoreCase(Exchange.HTTP_RESPONSE_CODE) && !key.equalsIgnoreCase(Exchange.HTTP_RESPONSE_TEXT)) {
                 assertTrue("Should not contain any Camel internal headers", !key.toLowerCase().startsWith("camel"));
             }
         }

diff --git a/...y4-http/src/main/java/org/apache/camel/component/netty4/http/DefaultNettyHttpBinding.java b/...y4-http/src/main/java/org/apache/camel/component/netty4/http/DefaultNettyHttpBinding.java
@@ -267,7 +267,7 @@ public void populateCamelHeaders(FullHttpResponse response, Map<String, Object>
         LOG.trace("populateCamelHeaders: {}", response);
 
         headers.put(Exchange.HTTP_RESPONSE_CODE, response.getStatus().code());
-        headers.put(NettyHttpConstants.HTTP_RESPONSE_TEXT, response.getStatus().reasonPhrase());
+        headers.put(Exchange.HTTP_RESPONSE_TEXT, response.getStatus().reasonPhrase());
 
         for (String name : response.headers().names()) {
             // mapping the content-type

diff --git a/...-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpConstants.java b/...-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpConstants.java
@@ -16,14 +16,17 @@
  */
 package org.apache.camel.component.netty4.http;
 
+import org.apache.camel.Exchange;
+
 /**
  * Netty HTTP constants.
  */
 public final class NettyHttpConstants {
 
     public static final String CONTENT_TYPE_JAVA_SERIALIZED_OBJECT = "application/x-java-serialized-object";
     public static final String CONTENT_TYPE_WWW_FORM_URLENCODED = "application/x-www-form-urlencoded";
-    public static final String HTTP_RESPONSE_TEXT = "CamelHttpResponseText";
+    @Deprecated
+    public static final String HTTP_RESPONSE_TEXT = Exchange.HTTP_RESPONSE_TEXT;
     public static final String HTTP_AUTHENTICATION = "CamelHttpAuthentication";
 
     private NettyHttpConstants() {

diff --git a/...src/test/java/org/apache/camel/component/netty4/http/NettyHttpFilterCamelHeadersTest.java b/...src/test/java/org/apache/camel/component/netty4/http/NettyHttpFilterCamelHeadersTest.java
@@ -42,7 +42,7 @@ public void process(Exchange exchange) throws Exception {
         // except for the response code and response text
         Map<String, Object> headers = out.getOut().getHeaders();
         for (String key : headers.keySet()) {
-            if (!key.equalsIgnoreCase(Exchange.HTTP_RESPONSE_CODE) && !key.equalsIgnoreCase(NettyHttpConstants.HTTP_RESPONSE_TEXT)) {
+            if (!key.equalsIgnoreCase(Exchange.HTTP_RESPONSE_CODE) && !key.equalsIgnoreCase(Exchange.HTTP_RESPONSE_TEXT)) {
                 assertTrue("Should not contain any Camel internal headers", !key.toLowerCase().startsWith("camel"));
             }
         }