You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2009/06/23 04:38:38 UTC
svn commit: r787522 - in /camel/trunk:
components/camel-http/src/main/java/org/apache/camel/component/http/
components/camel-http/src/main/java/org/apache/camel/component/http/helper/
components/camel-jetty/src/test/java/org/apache/camel/component/jett...
Author: hadrian
Date: Tue Jun 23 02:38:37 2009
New Revision: 787522
URL: http://svn.apache.org/viewvc?rev=787522&view=rev
Log:
CAMEL-1740. Moved CONTENT_ENCODING to HttpMessage.
Removed:
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConstants.java
Modified:
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/CamelServlet.java
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/DefaultHttpBinding.java
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConverter.java
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpMessage.java
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/RequestEntityConverter.java
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/helper/GZIPHelper.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentTypeTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpGetWithParamAsExchangeHeaderTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyImageFileTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySimplifiedHandle404Test.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithOnExceptionAndNoTransactionErrorHandlerConfiguredRoute.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithOnExceptionRoute.java
Modified: camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/CamelServlet.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/CamelServlet.java?rev=787522&r1=787521&r2=787522&view=diff
==============================================================================
--- camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/CamelServlet.java (original)
+++ camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/CamelServlet.java Tue Jun 23 02:38:37 2009
@@ -54,8 +54,6 @@
// Have the camel process the HTTP exchange.
DefaultExchange exchange = new DefaultExchange(consumer.getEndpoint(), ExchangePattern.InOut);
- exchange.setProperty(HttpConstants.SERVLET_REQUEST, request);
- exchange.setProperty(HttpConstants.SERVLET_RESPONSE, response);
exchange.setIn(new HttpMessage(exchange, request));
consumer.getProcessor().process(exchange);
Modified: camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/DefaultHttpBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/DefaultHttpBinding.java?rev=787522&r1=787521&r2=787522&view=diff
==============================================================================
--- camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/DefaultHttpBinding.java (original)
+++ camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/DefaultHttpBinding.java Tue Jun 23 02:38:37 2009
@@ -113,9 +113,9 @@
}
private void copyProtocolHeaders(Message request, Message response) {
- if (request.getHeader(HttpConstants.CONTENT_ENCODING) != null) {
- String contentEncoding = request.getHeader(HttpConstants.CONTENT_ENCODING, String.class);
- response.setHeader(HttpConstants.CONTENT_ENCODING, contentEncoding);
+ if (request.getHeader(HttpMessage.CONTENT_ENCODING) != null) {
+ String contentEncoding = request.getHeader(HttpMessage.CONTENT_ENCODING, String.class);
+ response.setHeader(HttpMessage.CONTENT_ENCODING, contentEncoding);
}
}
Modified: camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConverter.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConverter.java?rev=787522&r1=787521&r2=787522&view=diff
==============================================================================
--- camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConverter.java (original)
+++ camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConverter.java Tue Jun 23 02:38:37 2009
@@ -73,7 +73,7 @@
if (request == null) {
return null;
}
- String contentEncoding = request.getHeader(HttpConstants.CONTENT_ENCODING);
+ String contentEncoding = request.getHeader(HttpMessage.CONTENT_ENCODING);
return GZIPHelper.toGZIPInputStream(contentEncoding, request.getInputStream());
}
Modified: camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java?rev=787522&r1=787521&r2=787522&view=diff
==============================================================================
--- camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java (original)
+++ camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java Tue Jun 23 02:38:37 2009
@@ -84,8 +84,6 @@
public Exchange createExchange(HttpServletRequest request, HttpServletResponse response) {
DefaultExchange exchange = new DefaultExchange(this, ExchangePattern.InOut);
- exchange.setProperty(HttpConstants.SERVLET_REQUEST, request);
- exchange.setProperty(HttpConstants.SERVLET_RESPONSE, response);
exchange.setIn(new HttpMessage(exchange, request));
return exchange;
}
Modified: camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpMessage.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpMessage.java?rev=787522&r1=787521&r2=787522&view=diff
==============================================================================
--- camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpMessage.java (original)
+++ camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpMessage.java Tue Jun 23 02:38:37 2009
@@ -28,6 +28,8 @@
* @version $Revision$
*/
public class HttpMessage extends DefaultMessage {
+ public static final String CONTENT_ENCODING = "Content-Encoding";
+
private HttpServletRequest request;
public HttpMessage(Exchange exchange, HttpServletRequest request) {
Modified: camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java?rev=787522&r1=787521&r2=787522&view=diff
==============================================================================
--- camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java (original)
+++ camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java Tue Jun 23 02:38:37 2009
@@ -161,7 +161,7 @@
return null;
}
- Header header = method.getRequestHeader(HttpConstants.CONTENT_ENCODING);
+ Header header = method.getRequestHeader(HttpMessage.CONTENT_ENCODING);
String contentEncoding = header != null ? header.getValue() : null;
is = GZIPHelper.toGZIPInputStream(contentEncoding, is);
Modified: camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/RequestEntityConverter.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/RequestEntityConverter.java?rev=787522&r1=787521&r2=787522&view=diff
==============================================================================
--- camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/RequestEntityConverter.java (original)
+++ camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/RequestEntityConverter.java Tue Jun 23 02:38:37 2009
@@ -62,17 +62,15 @@
private RequestEntity asRequestEntity(InputStream in, Exchange exchange) throws IOException {
return new InputStreamRequestEntity(
GZIPHelper.toGZIPInputStream(
- exchange.getIn().getHeader(HttpConstants.CONTENT_ENCODING, String.class),
+ exchange.getIn().getHeader(HttpMessage.CONTENT_ENCODING, String.class),
in), ExchangeHelper.getContentType(exchange));
}
private RequestEntity asRequestEntity(byte[] data, Exchange exchange) throws Exception {
return new InputStreamRequestEntity(
GZIPHelper.toGZIPInputStream(
- exchange.getIn().getHeader(HttpConstants.CONTENT_ENCODING, String.class),
+ exchange.getIn().getHeader(HttpMessage.CONTENT_ENCODING, String.class),
data), ExchangeHelper.getContentType(exchange));
}
-
-
}
Modified: camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/helper/GZIPHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/helper/GZIPHelper.java?rev=787522&r1=787521&r2=787522&view=diff
==============================================================================
--- camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/helper/GZIPHelper.java (original)
+++ camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/helper/GZIPHelper.java Tue Jun 23 02:38:37 2009
@@ -24,7 +24,7 @@
import java.util.zip.GZIPOutputStream;
import org.apache.camel.Message;
-import org.apache.camel.component.http.HttpConstants;
+import org.apache.camel.component.http.HttpMessage;
import org.apache.camel.util.ObjectHelper;
/**
@@ -76,7 +76,7 @@
}
public static boolean isGzip(Message message) {
- return isGzip(message.getHeader(HttpConstants.CONTENT_ENCODING, String.class));
+ return isGzip(message.getHeader(HttpMessage.CONTENT_ENCODING, String.class));
}
public static boolean isGzip(String header) {
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentTypeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentTypeTest.java?rev=787522&r1=787521&r2=787522&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentTypeTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentTypeTest.java Tue Jun 23 02:38:37 2009
@@ -20,7 +20,7 @@
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.http.HttpConstants;
+import org.apache.camel.component.http.HttpMessage;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.camel.util.ExchangeHelper;
import org.apache.camel.util.MessageHelper;
@@ -38,7 +38,7 @@
exchange.getIn().setHeader("user", "Claus");
exchange.getIn().setHeader("Content-Type", "text/xml");
if (usingGZip) {
- exchange.getIn().setHeader(HttpConstants.CONTENT_ENCODING, "gzip");
+ exchange.getIn().setHeader(HttpMessage.CONTENT_ENCODING, "gzip");
}
template.send(endpoint, exchange);
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpGetWithParamAsExchangeHeaderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpGetWithParamAsExchangeHeaderTest.java?rev=787522&r1=787521&r2=787522&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpGetWithParamAsExchangeHeaderTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpGetWithParamAsExchangeHeaderTest.java Tue Jun 23 02:38:37 2009
@@ -18,7 +18,6 @@
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.http.HttpConstants;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
@@ -72,5 +71,4 @@
}
};
}
-
}
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyImageFileTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyImageFileTest.java?rev=787522&r1=787521&r2=787522&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyImageFileTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyImageFileTest.java Tue Jun 23 02:38:37 2009
@@ -22,7 +22,7 @@
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.http.HttpConstants;
+import org.apache.camel.component.http.HttpMessage;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.camel.util.MessageHelper;
import org.junit.Test;
@@ -36,7 +36,7 @@
Endpoint endpoint = context.getEndpoint("http://localhost:9080/myapp/myservice");
Exchange exchange = endpoint.createExchange();
if (usingGZip) {
- exchange.getIn().setHeader(HttpConstants.CONTENT_ENCODING, "gzip");
+ exchange.getIn().setHeader(HttpMessage.CONTENT_ENCODING, "gzip");
}
template.send(endpoint, exchange);
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySimplifiedHandle404Test.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySimplifiedHandle404Test.java?rev=787522&r1=787521&r2=787522&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySimplifiedHandle404Test.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySimplifiedHandle404Test.java Tue Jun 23 02:38:37 2009
@@ -19,7 +19,6 @@
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.http.HttpConstants;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.processor.aggregate.AggregationStrategy;
import org.apache.camel.test.junit4.CamelTestSupport;
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithOnExceptionAndNoTransactionErrorHandlerConfiguredRoute.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithOnExceptionAndNoTransactionErrorHandlerConfiguredRoute.java?rev=787522&r1=787521&r2=787522&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithOnExceptionAndNoTransactionErrorHandlerConfiguredRoute.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithOnExceptionAndNoTransactionErrorHandlerConfiguredRoute.java Tue Jun 23 02:38:37 2009
@@ -19,7 +19,6 @@
import org.apache.camel.Exchange;
import org.apache.camel.Predicate;
import org.apache.camel.Processor;
-import org.apache.camel.component.http.HttpConstants;
import org.apache.camel.component.http.HttpOperationFailedException;
/**
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithOnExceptionRoute.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithOnExceptionRoute.java?rev=787522&r1=787521&r2=787522&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithOnExceptionRoute.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithOnExceptionRoute.java Tue Jun 23 02:38:37 2009
@@ -19,7 +19,6 @@
import org.apache.camel.Exchange;
import org.apache.camel.Predicate;
import org.apache.camel.Processor;
-import org.apache.camel.component.http.HttpConstants;
import org.apache.camel.component.http.HttpOperationFailedException;
/**