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/29 23:29:49 UTC
svn commit: r799086 - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/
camel-core/src/main/java/org/apache/camel/impl/
camel-core/src/main/java/org/apache/camel/processor/
camel-core/src/main/java/org/apache/camel/processor/interceptor/ came...
Author: hadrian
Date: Wed Jul 29 21:29:48 2009
New Revision: 799086
URL: http://svn.apache.org/viewvc?rev=799086&view=rev
Log:
CAMEL-316. More cleanup around Faults api.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeHolder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/HandleFaultInterceptor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ExchangeResource.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java?rev=799086&r1=799085&r2=799086&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java Wed Jul 29 21:29:48 2009
@@ -226,14 +226,6 @@
Message getFault();
/**
- * Returns whether a FAULT message has been set or not.
- *
- * @return <tt>true</tt> if a FAULT message exists, <tt>false</tt> otherwise.
- */
- @Deprecated
- boolean hasFault();
-
- /**
* Returns the exception associated with this exchange
*
* @return the exception (or null if no faults)
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java?rev=799086&r1=799085&r2=799086&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java Wed Jul 29 21:29:48 2009
@@ -261,11 +261,6 @@
this.fromEndpoint = fromEndpoint;
}
- public boolean hasFault() {
- Message out = getOut(false);
- return out != null && out.isFault();
- }
-
public Message getFault() {
Message fault = getOut(true);
if (fault != null) {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeHolder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeHolder.java?rev=799086&r1=799085&r2=799086&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeHolder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeHolder.java Wed Jul 29 21:29:48 2009
@@ -51,11 +51,9 @@
private Object inBody;
private Object outBody;
- private Object faultBody;
private final Map<String, Object> inHeaders = new LinkedHashMap<String, Object>();
private final Map<String, Object> outHeaders = new LinkedHashMap<String, Object>();
private final Map<String, Object> properties = new LinkedHashMap<String, Object>();
- private final Map<String, Object> faultHeaders = new LinkedHashMap<String, Object>();
private Exception exception;
/**
@@ -74,10 +72,6 @@
payload.outBody = checkSerializableObject("out body", exchange, exchange.getOut().getBody());
payload.outHeaders.putAll(checkMapSerializableObjects("out headers", exchange, exchange.getOut().getHeaders()));
}
- if (exchange.hasFault()) {
- payload.faultBody = checkSerializableObject("fault body", exchange, exchange.getFault().getBody());
- payload.faultHeaders.putAll(checkMapSerializableObjects("fault headers", exchange, exchange.getFault().getHeaders()));
- }
payload.properties.putAll(checkMapSerializableObjects("exchange properties", exchange, exchange.getProperties()));
payload.exception = exchange.getException();
@@ -97,10 +91,6 @@
exchange.getOut().setBody(payload.outBody);
exchange.getOut().setHeaders(payload.outHeaders);
}
- if (payload.faultBody != null) {
- exchange.getFault().setBody(payload.faultBody);
- exchange.getFault().setHeaders(payload.faultHeaders);
- }
for (String key : payload.properties.keySet()) {
exchange.setProperty(key, payload.properties.get(key));
}
@@ -111,7 +101,6 @@
StringBuilder sb = new StringBuilder("DefaultExchangeHolder[");
sb.append("inBody=").append(inBody).append(", outBody=").append(outBody);
sb.append(", inHeaders=").append(inHeaders).append(", outHeaders=").append(outHeaders);
- sb.append(", faultBody=").append(faultBody).append(", faultHeaders=").append(faultHeaders);
sb.append(", properties=").append(properties).append(", exception=").append(exception);
return sb.append(']').toString();
}
@@ -148,5 +137,4 @@
return result;
}
-
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java?rev=799086&r1=799085&r2=799086&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java Wed Jul 29 21:29:48 2009
@@ -89,8 +89,8 @@
if (nextExchange.getException() != null) {
sb.append(" Exception: ").append(nextExchange.getException());
}
- if (nextExchange.hasFault()) {
- sb.append(" Fault: ").append(nextExchange.getFault());
+ if (nextExchange.hasOut() && nextExchange.getOut().isFault()) {
+ sb.append(" Fault: ").append(nextExchange.getOut());
}
if (exceptionHandled) {
sb.append(" Handled by the error handler.");
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java?rev=799086&r1=799085&r2=799086&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java Wed Jul 29 21:29:48 2009
@@ -151,8 +151,8 @@
private void copyOutToIn(Exchange result, Exchange source) {
result.setException(source.getException());
- if (source.hasFault()) {
- result.getFault().copyFrom(source.getFault());
+ if (source.hasOut() && source.getOut().isFault()) {
+ result.getOut(true).copyFrom(source.getOut());
}
result.setIn(getResultMessage(source));
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/HandleFaultInterceptor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/HandleFaultInterceptor.java?rev=799086&r1=799085&r2=799086&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/HandleFaultInterceptor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/HandleFaultInterceptor.java Wed Jul 29 21:29:48 2009
@@ -57,8 +57,8 @@
*/
protected void handleFault(Exchange exchange) {
// Take the fault message out before we keep on going
- if (exchange.hasFault()) {
- final Object faultBody = exchange.getFault().getBody();
+ if (exchange.hasOut() && exchange.getOut().isFault()) {
+ final Object faultBody = exchange.getOut().getBody();
if (faultBody != null && exchange.getException() == null) {
// remove fault as we are converting it to an exception
exchange.setOut(null);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java?rev=799086&r1=799085&r2=799086&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java Wed Jul 29 21:29:48 2009
@@ -193,10 +193,6 @@
if (result != source) {
result.setException(source.getException());
- if (source.hasFault()) {
- result.getFault().copyFrom(source.getFault());
- }
-
if (source.hasOut()) {
result.getOut().copyFrom(source.getOut());
} else if (result.getPattern() == ExchangePattern.InOptionalOut) {
@@ -489,13 +485,7 @@
* @return <tt>true</tt> if fault message exists
*/
public static boolean hasFaultMessage(Exchange exchange) {
- if (exchange.hasFault()) {
- Object faultBody = exchange.getFault().getBody();
- if (faultBody != null) {
- return true;
- }
- }
- return false;
+ return exchange.hasOut() && exchange.getOut().isFault() && exchange.getOut().getBody() != null;
}
/**
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java?rev=799086&r1=799085&r2=799086&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java Wed Jul 29 21:29:48 2009
@@ -90,8 +90,8 @@
// check failure
if (camelExchange.isFailed()) {
// either Fault or Exception
- Throwable t = (camelExchange.hasFault())
- ? (Throwable)camelExchange.getFault().getBody() : camelExchange.getException();
+ Throwable t = (camelExchange.hasOut() && camelExchange.getOut().isFault())
+ ? (Throwable)camelExchange.getOut().getBody() : camelExchange.getException();
throw (t instanceof Fault) ? (Fault)t : new Fault(t);
}
Modified: camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java?rev=799086&r1=799085&r2=799086&view=diff
==============================================================================
--- camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java (original)
+++ camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java Wed Jul 29 21:29:48 2009
@@ -146,8 +146,8 @@
if (exchange.isFailed()) {
// 500 for internal server error which can be overridden by response code in header
response.setStatus(Status.valueOf(500));
- if (exchange.hasFault()) {
- out = exchange.getFault();
+ if (exchange.hasOut() && exchange.getOut().isFault()) {
+ out = exchange.getOut();
} else {
// print exception as message and stacktrace
Exception t = exchange.getException();
Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ExchangeResource.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ExchangeResource.java?rev=799086&r1=799085&r2=799086&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ExchangeResource.java (original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ExchangeResource.java Wed Jul 29 21:29:48 2009
@@ -59,14 +59,6 @@
return exchange.getException();
}
- public Message getFault() {
- return exchange.getFault();
- }
-
- public boolean hasFault() {
- return exchange.hasFault();
- }
-
public Endpoint getFromEndpoint() {
return exchange.getFromEndpoint();
}