Author: hadrian
Date: Thu Jul 30 01:38:22 2009
New Revision: 799153
URL: http://svn.apache.org/viewvc?rev=799153&view=rev
Log:
CAMEL-316. More cleanup.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumerTemplate.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.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/enricher/EnricherTest.java
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java
camel/trunk/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/RootObject.java
camel/trunk/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/RootObject.java
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapter.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java?rev=799153&r1=799152&r2=799153&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
Thu Jul 30 01:38:22 2009
@@ -497,7 +497,7 @@
public static Expression faultBodyExpression() {
return new ExpressionAdapter() {
public Object evaluate(Exchange exchange) {
- return exchange.getFault().getBody();
+ return exchange.getOut().isFault() ?
exchange.getOut().getBody() : null;
}
@Override
@@ -514,7 +514,7 @@
public static <T> Expression faultBodyExpression(final Class<T> type) {
return new ExpressionAdapter() {
public Object evaluate(Exchange exchange) {
- return exchange.getFault().getBody(type);
+ return exchange.getOut().isFault() ?
exchange.getOut().getBody(type) : null;
}
@Override
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumerTemplate.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumerTemplate.java?rev=799153&r1=799152&r2=799153&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumerTemplate.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumerTemplate.java
Thu Jul 30 01:38:22 2009
@@ -146,11 +146,6 @@
throw wrapRuntimeCamelException(result.getException());
}
- // result could have a fault message
- if (hasFaultMessage(result)) {
- return result.getFault().getBody();
- }
-
// okay no fault then return the response
if (result.hasOut()) {
// use OUT as the response
@@ -162,8 +157,4 @@
}
return answer;
}
-
- protected boolean hasFaultMessage(Exchange result) {
- return result.hasOut() && result.getOut().isFault() &&
result.getOut().getBody() != 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=799153&r1=799152&r2=799153&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
Thu Jul 30 01:38:22 2009
@@ -456,7 +456,7 @@
// result could have a fault message
if (hasFaultMessage(exchange)) {
- return exchange.getFault().getBody();
+ return exchange.getOut().getBody();
}
// okay no fault then return the response according to the pattern
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=799153&r1=799152&r2=799153&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
Thu Jul 30 01:38:22 2009
@@ -57,7 +57,8 @@
assertTrue("Should be failed", outB.isFailed());
assertNull("Should not handle fault", outB.getException());
- assertIsInstanceOf(IllegalArgumentException.class,
outB.getFault().getBody());
+ assertTrue(outB.getOut() != null && outB.getOut().isFault());
+ assertIsInstanceOf(IllegalArgumentException.class,
outB.getOut().getBody());
Exchange outC = template.send("direct:c", new Processor() {
public void process(Exchange exchange) throws Exception {
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=799153&r1=799152&r2=799153&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
Thu Jul 30 01:38:22 2009
@@ -102,8 +102,9 @@
});
// Check the fault..
- assertEquals("Fault Message", exchange.getFault().getBody());
- assertEquals(2, exchange.getFault().getHeader("copy-counter"));
+ assertTrue(exchange.getOut() != null && exchange.getOut().isFault());
+ assertEquals("Fault Message", exchange.getOut().getBody());
+ assertEquals(2, exchange.getOut().getHeader("copy-counter"));
}
public void testOnlyProperties() {
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=799153&r1=799152&r2=799153&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
Thu Jul 30 01:38:22 2009
@@ -62,7 +62,8 @@
});
assertTrue("Should be failed", out.isFailed());
assertNull("No exception", out.getException());
- assertEquals("Persistent error", out.getFault().getBody());
+ assertTrue(out.getOut() != null && out.getOut().isFault());
+ assertEquals("Persistent error", out.getOut().getBody());
assertMockEndpointsSatisfied();
}
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherTest.java?rev=799153&r1=799152&r2=799153&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherTest.java
Thu Jul 30 01:38:22 2009
@@ -59,7 +59,8 @@
});
mock.assertIsSatisfied();
assertEquals("test", exchange.getIn().getBody());
- assertEquals("failed", exchange.getFault().getBody());
+ assertTrue(exchange.getOut() != null && exchange.getOut().isFault());
+ assertEquals("failed", exchange.getOut().getBody());
assertNull(exchange.getException());
}
@@ -105,7 +106,8 @@
}
});
assertEquals("test", exchange.getIn().getBody());
- assertEquals("failed", exchange.getFault().getBody());
+ assertTrue(exchange.getOut() != null && exchange.getOut().isFault());
+ assertEquals("failed", exchange.getOut().getBody());
assertNull(exchange.getException());
}
Modified:
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java?rev=799153&r1=799152&r2=799153&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java
(original)
+++
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java
Thu Jul 30 01:38:22 2009
@@ -102,9 +102,9 @@
// do not send a reply but wrap and rethrow the
exception
rce =
wrapRuntimeCamelException(exchange.getException());
}
- } else if (exchange.getFault().getBody() != null) {
+ } else if (exchange.getOut().getBody() != null) {
// a fault occurred while processing
- body = (JmsMessage) exchange.getFault();
+ body = (JmsMessage) exchange.getOut();
sendReply = true;
}
} else if (exchange.hasOut()) {
Modified:
camel/trunk/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/RootObject.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/RootObject.java?rev=799153&r1=799152&r2=799153&view=diff
==============================================================================
---
camel/trunk/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/RootObject.java
(original)
+++
camel/trunk/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/RootObject.java
Thu Jul 30 01:38:22 2009
@@ -45,10 +45,6 @@
return exchange.getExchangeId();
}
- public Message getFault() {
- return exchange.getFault();
- }
-
public Message getRequest() {
return exchange.getIn();
}
Modified:
camel/trunk/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/RootObject.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/RootObject.java?rev=799153&r1=799152&r2=799153&view=diff
==============================================================================
---
camel/trunk/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/RootObject.java
(original)
+++
camel/trunk/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/RootObject.java
Thu Jul 30 01:38:22 2009
@@ -48,10 +48,6 @@
return exchange.getExchangeId();
}
- public Message getFault() {
- return exchange.getFault();
- }
-
public Message getRequest() {
return exchange.getIn();
}
Modified:
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapter.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapter.java?rev=799153&r1=799152&r2=799153&view=diff
==============================================================================
---
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapter.java
(original)
+++
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapter.java
Thu Jul 30 01:38:22 2009
@@ -76,7 +76,7 @@
Exchange inExchange = new DefaultExchange(getCamelContext(), pattern);
SpringIntegrationBinding.storeToCamelMessage(message,
inExchange.getIn());
Exchange outExchange = getCamelTemplate().send(getCamelEndpointUri(),
inExchange);
- if (outExchange.getFault() != null) {
+ if (outExchange.getOut() != null && outExchange.getOut().isFault()) {
result = true;
}
Message response = null;
