Author: davsclaus
Date: Thu Dec 27 13:39:04 2012
New Revision: 1426200
URL: http://svn.apache.org/viewvc?rev=1426200&view=rev
Log:
CAMEL-5912: Polished
Removed:
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpRequestAdapter.java
Modified:
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/GoogleUrlRewrite.java
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
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=1426200&r1=1426199&r2=1426200&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
Thu Dec 27 13:39:04 2012
@@ -333,6 +333,7 @@ public class HttpProducer extends Defaul
*/
@SuppressWarnings("deprecation")
protected HttpMethod createMethod(Exchange exchange) throws Exception {
+ // creating the url to use takes 2-steps
String url = HttpHelper.createURL(exchange, getEndpoint());
URI uri = HttpHelper.createURI(exchange, url, getEndpoint());
// get the url and query string from the uri
Modified:
camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/GoogleUrlRewrite.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/GoogleUrlRewrite.java?rev=1426200&r1=1426199&r2=1426200&view=diff
==============================================================================
---
camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/GoogleUrlRewrite.java
(original)
+++
camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/GoogleUrlRewrite.java
Thu Dec 27 13:39:04 2012
@@ -18,8 +18,11 @@ package org.apache.camel.component.http;
import org.apache.camel.Producer;
+// START SNIPPET: e1
/**
- *
+ * A very simple url rewrite that replaces yahoo with google in the url.
+ * <p/>
+ * This is only used for testing purposes.
*/
public class GoogleUrlRewrite implements UrlRewrite {
@@ -28,3 +31,4 @@ public class GoogleUrlRewrite implements
return url.replaceAll("yahoo", "google");
}
}
+// END SNIPPET: e1
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=1426200&r1=1426199&r2=1426200&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 Dec 27 13:39:04 2012
@@ -104,9 +104,10 @@ public class JettyHttpProducer extends D
}
protected JettyContentExchange createHttpExchange(Exchange exchange,
AsyncCallback callback) throws Exception {
+ // creating the url to use takes 2-steps
String url = HttpHelper.createURL(exchange, getEndpoint());
URI uri = HttpHelper.createURI(exchange, url, getEndpoint());
- // get the url and query string from the uri
+ // get the url from the uri
url = uri.toASCIIString();
// execute any custom url rewrite
