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/07/31 19:56:42 UTC
svn commit: r799674 - in /camel/trunk:
camel-core/src/test/java/org/apache/camel/impl/
camel-core/src/test/java/org/apache/camel/processor/
components/camel-jetty/src/test/java/org/apache/camel/component/jetty/
components/camel-restlet/src/test/java/or...
Author: hadrian
Date: Fri Jul 31 17:56:42 2009
New Revision: 799674
URL: http://svn.apache.org/viewvc?rev=799674&view=rev
Log:
CAMEL-316. More cleanup of getFault(), almost done.
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ExceptionHandlerStreamCacheTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FaultRetryRouteTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FaultRouteTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/HandleFaultPerRouteTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PipelineTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RedeliverWithExceptionAndFaultTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceableUnitOfWorkTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/UnitOfWorkSynchronizationAdapterTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/UnitOfWorkTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRouteTest.java
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletFaultTest.java
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateTest.java?rev=799674&r1=799673&r2=799674&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateTest.java Fri Jul 31 17:56:42 2009
@@ -126,7 +126,8 @@
from("direct:fault").process(new Processor() {
public void process(Exchange exchange) throws Exception {
- exchange.getFault().setBody("Faulty World");
+ exchange.getOut().setFault(true);
+ exchange.getOut().setBody("Faulty World");
}
}).to("mock:result");
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ExceptionHandlerStreamCacheTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ExceptionHandlerStreamCacheTest.java?rev=799674&r1=799673&r2=799674&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ExceptionHandlerStreamCacheTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ExceptionHandlerStreamCacheTest.java Fri Jul 31 17:56:42 2009
@@ -105,8 +105,9 @@
String message = exchange.getIn().getBody(String.class);
if (message.contains("fault")) {
- exchange.getFault().copyFrom(exchange.getIn());
- exchange.getFault().setBody(new ByteArrayInputStream(message.getBytes()));
+ exchange.getOut().copyFrom(exchange.getIn());
+ exchange.getOut().setBody(new ByteArrayInputStream(message.getBytes()));
+ exchange.getOut().setFault(true);
}
if (message.contains("error")) {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FaultRetryRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FaultRetryRouteTest.java?rev=799674&r1=799673&r2=799674&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FaultRetryRouteTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FaultRetryRouteTest.java Fri Jul 31 17:56:42 2009
@@ -20,7 +20,6 @@
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.LoggingLevel;
-import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -35,8 +34,8 @@
int count;
public void process(Exchange exchange) throws CamelException {
if (count++ == 0) {
- Message message = exchange.getFault();
- message.setBody(new CamelException("Failed the first time"));
+ exchange.getOut().setFault(true);
+ exchange.getOut().setBody(new CamelException("Failed the first time"));
}
}
};
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FaultRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FaultRouteTest.java?rev=799674&r1=799673&r2=799674&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FaultRouteTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FaultRouteTest.java Fri Jul 31 17:56:42 2009
@@ -49,7 +49,8 @@
public void testWithFault() throws Exception {
a.whenExchangeReceived(1, new Processor() {
public void process(Exchange exchange) throws Exception {
- exchange.getFault().setBody("fault");
+ exchange.getOut().setFault(true);
+ exchange.getOut().setBody("fault");
}
});
a.expectedMessageCount(1);
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/HandleFaultPerRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/HandleFaultPerRouteTest.java?rev=799674&r1=799673&r2=799674&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/HandleFaultPerRouteTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/HandleFaultPerRouteTest.java Fri Jul 31 17:56:42 2009
@@ -40,8 +40,8 @@
Exchange outA = template.send("direct:a", new Processor() {
public void process(Exchange exchange) throws Exception {
- Message message = exchange.getFault();
- message.setBody(new IllegalArgumentException("A"));
+ exchange.getOut().setFault(true);
+ exchange.getOut().setBody(new IllegalArgumentException("A"));
}
});
assertTrue("Should be failed", outA.isFailed());
@@ -50,8 +50,8 @@
Exchange outB = template.send("direct:b", new Processor() {
public void process(Exchange exchange) throws Exception {
- Message message = exchange.getFault();
- message.setBody(new IllegalArgumentException("B"));
+ exchange.getOut().setFault(true);
+ exchange.getOut().setBody(new IllegalArgumentException("B"));
}
});
@@ -62,8 +62,8 @@
Exchange outC = template.send("direct:c", new Processor() {
public void process(Exchange exchange) throws Exception {
- Message message = exchange.getFault();
- message.setBody(new IllegalArgumentException("C"));
+ exchange.getOut().setFault(true);
+ exchange.getOut().setBody(new IllegalArgumentException("C"));
}
});
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PipelineTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PipelineTest.java?rev=799674&r1=799673&r2=799674&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PipelineTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PipelineTest.java Fri Jul 31 17:56:42 2009
@@ -49,12 +49,13 @@
*/
private final class InToFault implements Processor {
public void process(Exchange exchange) throws Exception {
- exchange.getFault().setBody(exchange.getIn().getBody());
+ exchange.getOut().setFault(true);
+ exchange.getOut().setBody(exchange.getIn().getBody());
Integer counter = exchange.getIn().getHeader("copy-counter", Integer.class);
if (counter == null) {
counter = 0;
}
- exchange.getFault().setHeader("copy-counter", counter + 1);
+ exchange.getOut().setHeader("copy-counter", counter + 1);
}
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RedeliverWithExceptionAndFaultTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RedeliverWithExceptionAndFaultTest.java?rev=799674&r1=799673&r2=799674&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RedeliverWithExceptionAndFaultTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RedeliverWithExceptionAndFaultTest.java Fri Jul 31 17:56:42 2009
@@ -84,7 +84,8 @@
}
if (exchange.getIn().getBody().equals("Boom")) {
- exchange.getFault().setBody("Persistent error");
+ exchange.getOut().setFault(true);
+ exchange.getOut().setBody("Persistent error");
} else {
exchange.getOut().setBody("Bye World");
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceableUnitOfWorkTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceableUnitOfWorkTest.java?rev=799674&r1=799673&r2=799674&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceableUnitOfWorkTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceableUnitOfWorkTest.java Fri Jul 31 17:56:42 2009
@@ -77,7 +77,8 @@
Processor last = list.get(list.size() - 3).getProcessor();
// set error message
- exchange.getFault().setBody("Failed at: " + last.toString());
+ exchange.getOut().setFault(true);
+ exchange.getOut().setBody("Failed at: " + last.toString());
}
public String toString() {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/UnitOfWorkSynchronizationAdapterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/UnitOfWorkSynchronizationAdapterTest.java?rev=799674&r1=799673&r2=799674&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/UnitOfWorkSynchronizationAdapterTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/UnitOfWorkSynchronizationAdapterTest.java Fri Jul 31 17:56:42 2009
@@ -53,7 +53,8 @@
String name = getName();
if (name.equals("testFail")) {
log.info("Failing test!");
- exchange.getFault().setBody("testFail() should always fail with a fault!");
+ exchange.getOut().setFault(true);
+ exchange.getOut().setBody("testFail() should always fail with a fault!");
} else if (name.equals("testException")) {
log.info("Throwing exception!");
throw new Exception("Failing test!");
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/UnitOfWorkTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/UnitOfWorkTest.java?rev=799674&r1=799673&r2=799674&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/UnitOfWorkTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/UnitOfWorkTest.java Fri Jul 31 17:56:42 2009
@@ -103,7 +103,8 @@
String name = getName();
if (name.equals("testFail")) {
log.info("Failing test!");
- exchange.getFault().setBody("testFail() should always fail with a fault!");
+ exchange.getOut().setFault(true);
+ exchange.getOut().setBody("testFail() should always fail with a fault!");
} else if (name.equals("testException")) {
log.info("Throwing exception!");
throw new Exception("Failing test!");
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=799674&r1=799673&r2=799674&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 Fri Jul 31 17:56:42 2009
@@ -134,7 +134,8 @@
HttpSession session = message.getRequest().getSession();
assertNotNull("we should get session here", session);
} catch (Exception e) {
- exchange.getFault().setBody(e);
+ exchange.getOut().setFault(true);
+ exchange.getOut().setBody(e);
}
exchange.getOut().setBody("<b>Hello World</b>");
}
Modified: camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletFaultTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletFaultTest.java?rev=799674&r1=799673&r2=799674&view=diff
==============================================================================
--- camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletFaultTest.java (original)
+++ camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletFaultTest.java Fri Jul 31 17:56:42 2009
@@ -38,10 +38,10 @@
public void configure() throws Exception {
from("restlet:http://localhost:9080/users/{username}?restletMethod=POST").process(new Processor() {
public void process(Exchange exchange) throws Exception {
- exchange.getFault().setHeader(Exchange.HTTP_RESPONSE_CODE, "404");
- exchange.getFault().setHeader(Exchange.CONTENT_TYPE, "text/plain");
- exchange.getFault().setBody("Application fault");
-
+ exchange.getOut().setFault(true);
+ exchange.getOut().setHeader(Exchange.HTTP_RESPONSE_CODE, "404");
+ exchange.getOut().setHeader(Exchange.CONTENT_TYPE, "text/plain");
+ exchange.getOut().setBody("Application fault");
}
});
}
@@ -59,6 +59,5 @@
} finally {
method.releaseConnection();
}
-
}
}