Author: davsclaus
Date: Thu Apr 2 09:38:16 2009
New Revision: 761216
URL: http://svn.apache.org/viewvc?rev=761216&view=rev
Log:
Using requestBody for InOut instead of sendBody.
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ConvertPayloadToInputStreamTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpClientRouteTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpGetTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRouteTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentBasedRouteTest.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/JettyHttpGetWithParamTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyResponseBodyWhenErrorTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySteveIssueTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyWithXPathChoiceTest.java
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ConvertPayloadToInputStreamTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ConvertPayloadToInputStreamTest.java?rev=761216&r1=761215&r2=761216&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ConvertPayloadToInputStreamTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ConvertPayloadToInputStreamTest.java
Thu Apr 2 09:38:16 2009
@@ -40,7 +40,7 @@
MockEndpoint mockEndpoint = getMockEndpoint("mock:result");
mockEndpoint.expectedMessageCount(1);
- template.sendBodyAndHeader("http://localhost:9080/test";, expectedBody,
"Content-Type", "application/xml");
+ template.requestBodyAndHeader("http://localhost:9080/test";,
expectedBody, "Content-Type", "application/xml");
mockEndpoint.assertIsSatisfied();
List<Exchange> list = mockEndpoint.getReceivedExchanges();
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpClientRouteTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpClientRouteTest.java?rev=761216&r1=761215&r2=761216&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpClientRouteTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpClientRouteTest.java
Thu Apr 2 09:38:16 2009
@@ -46,7 +46,7 @@
MockEndpoint mockEndpoint = getMockEndpoint("mock:a");
mockEndpoint.expectedBodiesReceived("<b>Hello World</b>");
- template.sendBodyAndHeader("direct:start", new
ByteArrayInputStream("This is a test".getBytes()), "Content-Type",
"application/xml");
+ template.requestBodyAndHeader("direct:start", new
ByteArrayInputStream("This is a test".getBytes()), "Content-Type",
"application/xml");
mockEndpoint.assertIsSatisfied();
List<Exchange> list = mockEndpoint.getReceivedExchanges();
@@ -68,11 +68,9 @@
public void configure() {
errorHandler(noErrorHandler());
Processor clientProc = new Processor() {
-
- public void process(Exchange exchange) throws Exception {
+ public void process(Exchange exchange) throws Exception {
InputStream is = (InputStream)
exchange.getIn().getBody();
}
-
};
from("direct:start").to("http://localhost:9080/hello";).process(clientProc).intercept(new
StreamCachingInterceptor()).convertBodyTo(String.class).to("mock:a");
@@ -80,7 +78,6 @@
Processor proc = new Processor() {
public void process(Exchange exchange) throws Exception {
ByteArrayInputStream bis = new
ByteArrayInputStream("<b>Hello World</b>".getBytes());
-
exchange.getOut(true).setBody(bis);
}
};
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpGetTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpGetTest.java?rev=761216&r1=761215&r2=761216&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpGetTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpGetTest.java
Thu Apr 2 09:38:16 2009
@@ -35,7 +35,7 @@
MockEndpoint mockEndpoint = resolveMandatoryEndpoint("mock:results",
MockEndpoint.class);
mockEndpoint.expectedMessageCount(1);
- template.sendBody("direct:start", null);
+ template.requestBody("direct:start", null, Object.class);
mockEndpoint.assertIsSatisfied();
List<Exchange> list = mockEndpoint.getReceivedExchanges();
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRouteTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRouteTest.java?rev=761216&r1=761215&r2=761216&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRouteTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRouteTest.java
Thu Apr 2 09:38:16 2009
@@ -75,7 +75,7 @@
}
protected void invokeHttpEndpoint() throws IOException {
- template.sendBodyAndHeader("http://localhost:9080/test";, expectedBody,
"Content-Type", "application/xml");
+ template.requestBodyAndHeader("http://localhost:9080/test";,
expectedBody, "Content-Type", "application/xml");
}
@Override
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentBasedRouteTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentBasedRouteTest.java?rev=761216&r1=761215&r2=761216&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentBasedRouteTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentBasedRouteTest.java
Thu Apr 2 09:38:16 2009
@@ -32,7 +32,7 @@
mock.expectedHeaderReceived("one", "true");
- template.sendBody(serverUri + "?one=true", null);
+ template.requestBody(serverUri + "?one=true", null, Object.class);
assertMockEndpointsSatisfied();
}
@@ -42,7 +42,7 @@
mock.expectedHeaderReceived("two", "true");
- template.sendBody(serverUri + "?two=true", null);
+ template.requestBody(serverUri + "?two=true", null, Object.class);
assertMockEndpointsSatisfied();
}
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=761216&r1=761215&r2=761216&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
Thu Apr 2 09:38:16 2009
@@ -34,7 +34,7 @@
mock.expectedHeaderReceived("two", "twei");
mock.expectedHeaderReceived(HttpConstants.HTTP_METHOD, "GET");
- template.sendBody(serverUri + "?one=einz&two=twei", null);
+ template.requestBody(serverUri + "?one=einz&two=twei", null,
Object.class);
assertMockEndpointsSatisfied();
}
@@ -45,7 +45,7 @@
mock.expectedHeaderReceived("two", "dos");
mock.expectedHeaderReceived(HttpConstants.HTTP_METHOD, "GET");
- template.sendBodyAndHeader(serverUri, null, HttpConstants.HTTP_QUERY,
"one=uno&two=dos");
+ template.requestBodyAndHeader(serverUri, null,
HttpConstants.HTTP_QUERY, "one=uno&two=dos");
assertMockEndpointsSatisfied();
}
@@ -55,7 +55,7 @@
mock.expectedBodiesReceived("Hello World");
mock.expectedHeaderReceived(HttpConstants.HTTP_METHOD, "POST");
- template.sendBody(serverUri, "Hello World");
+ template.requestBody(serverUri, "Hello World");
assertMockEndpointsSatisfied();
}
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpGetWithParamTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpGetWithParamTest.java?rev=761216&r1=761215&r2=761216&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpGetWithParamTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpGetWithParamTest.java
Thu Apr 2 09:38:16 2009
@@ -39,7 +39,7 @@
mock.expectedHeaderReceived("one", "einz");
mock.expectedHeaderReceived("two", "twei");
- template.sendBody(serverUri + "?one=uno&two=dos", "Hello World");
+ template.requestBody(serverUri + "?one=uno&two=dos", "Hello World");
assertMockEndpointsSatisfied();
}
@@ -50,7 +50,7 @@
mock.expectedHeaderReceived("one", "einz");
mock.expectedHeaderReceived("two", "twei");
- template.sendBodyAndHeader(serverUri, "Hello World",
HttpConstants.HTTP_QUERY, "one=uno&two=dos");
+ template.requestBodyAndHeader(serverUri, "Hello World",
HttpConstants.HTTP_QUERY, "one=uno&two=dos");
assertMockEndpointsSatisfied();
}
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyResponseBodyWhenErrorTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyResponseBodyWhenErrorTest.java?rev=761216&r1=761215&r2=761216&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyResponseBodyWhenErrorTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyResponseBodyWhenErrorTest.java
Thu Apr 2 09:38:16 2009
@@ -30,7 +30,7 @@
public void testResponseBodyWhenError() throws Exception {
try {
- template.sendBody("http://localhost:9080/myapp/myservice";,
"bookid=123");
+ template.requestBody("http://localhost:9080/myapp/myservice";,
"bookid=123");
fail("Should have thrown an exception");
} catch (RuntimeCamelException e) {
HttpOperationFailedException cause =
(HttpOperationFailedException) e.getCause();
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySteveIssueTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySteveIssueTest.java?rev=761216&r1=761215&r2=761216&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySteveIssueTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySteveIssueTest.java
Thu Apr 2 09:38:16 2009
@@ -32,7 +32,7 @@
mock.expectedBodiesReceived("<html><body>foo</body></html>");
mock.expectedHeaderReceived("x", "foo");
- template.sendBody(serverUri + "?x=foo", null);
+ template.requestBody(serverUri + "?x=foo", null, Object.class);
assertMockEndpointsSatisfied();
}
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyWithXPathChoiceTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyWithXPathChoiceTest.java?rev=761216&r1=761215&r2=761216&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyWithXPathChoiceTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyWithXPathChoiceTest.java
Thu Apr 2 09:38:16 2009
@@ -62,6 +62,8 @@
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
+ errorHandler(deadLetterChannel("mock:error").delay(0));
+
// Need a convertBodyTo processor here or we may get an error
// that we are at the end of the stream
from("jetty:http://localhost:9080/myworld";).choice()
