This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch CAMEL-13755 in repository https://gitbox.apache.org/repos/asf/camel.git
commit 4e170eb619ef5f5bc2e03606d529065bcc2a2692 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Sun Jul 21 19:35:25 2019 +0200 CAMEL-13755: camel3 - Remove fault from camel-core/message and let it be component specific for camel-cxf and camel-spring-ws as its only used by SOAP-WS --- components/camel-cxf/src/main/docs/cxf-component.adoc | 2 +- .../src/main/java/org/apache/camel/component/milo/Messages.java | 1 - .../src/main/java/org/apache/camel/support/DefaultMessage.java | 7 ------- docs/components/modules/ROOT/pages/cxf-component.adoc | 2 +- .../src/main/resources/META-INF/spring-configuration-metadata.json | 7 ------- 5 files changed, 2 insertions(+), 17 deletions(-) diff --git a/components/camel-cxf/src/main/docs/cxf-component.adoc b/components/camel-cxf/src/main/docs/cxf-component.adoc index 38f3e9f..431bfb2 100644 --- a/components/camel-cxf/src/main/docs/cxf-component.adoc +++ b/components/camel-cxf/src/main/docs/cxf-component.adoc @@ -771,7 +771,7 @@ set the SOAP Fault message in the message body and set the response code in the message header. Same for using POJO data format. You can set the SOAPFault on the out -body and also indicate it's a fault by calling Message.setFault(true): +body. === How to propagate a camel-cxf endpoint's request and response context diff --git a/components/camel-milo/src/main/java/org/apache/camel/component/milo/Messages.java b/components/camel-milo/src/main/java/org/apache/camel/component/milo/Messages.java index db42455..12998ce 100644 --- a/components/camel-milo/src/main/java/org/apache/camel/component/milo/Messages.java +++ b/components/camel-milo/src/main/java/org/apache/camel/component/milo/Messages.java @@ -31,6 +31,5 @@ public final class Messages { */ public static void fillFromDataValue(final DataValue value, final DefaultMessage result) { result.setBody(value); - result.setFault(value.getStatusCode().isBad()); } } diff --git a/core/camel-support/src/main/java/org/apache/camel/support/DefaultMessage.java b/core/camel-support/src/main/java/org/apache/camel/support/DefaultMessage.java index 181c750..403b214 100644 --- a/core/camel-support/src/main/java/org/apache/camel/support/DefaultMessage.java +++ b/core/camel-support/src/main/java/org/apache/camel/support/DefaultMessage.java @@ -48,13 +48,6 @@ public class DefaultMessage extends MessageSupport { setCamelContext(camelContext); } - public boolean isFault() { - return false; - } - - public void setFault(boolean fault) { - } - public Object getHeader(String name) { if (hasHeaders()) { return getHeaders().get(name); diff --git a/docs/components/modules/ROOT/pages/cxf-component.adoc b/docs/components/modules/ROOT/pages/cxf-component.adoc index 38f3e9f..431bfb2 100644 --- a/docs/components/modules/ROOT/pages/cxf-component.adoc +++ b/docs/components/modules/ROOT/pages/cxf-component.adoc @@ -771,7 +771,7 @@ set the SOAP Fault message in the message body and set the response code in the message header. Same for using POJO data format. You can set the SOAPFault on the out -body and also indicate it's a fault by calling Message.setFault(true): +body. === How to propagate a camel-cxf endpoint's request and response context diff --git a/examples/camel-example-main-artemis/src/main/resources/META-INF/spring-configuration-metadata.json b/examples/camel-example-main-artemis/src/main/resources/META-INF/spring-configuration-metadata.json index e2830d0..8efef32 100644 --- a/examples/camel-example-main-artemis/src/main/resources/META-INF/spring-configuration-metadata.json +++ b/examples/camel-example-main-artemis/src/main/resources/META-INF/spring-configuration-metadata.json @@ -1661,13 +1661,6 @@ "defaultValue":"false" }, { - "name":"camel.component.jms.transfer-fault", - "type":"java.lang.Boolean", - "sourceType":"org.apache.camel.component.jms.JmsComponent", - "description":"If enabled and you are using Request Reply messaging (InOut) and an Exchange failed with a SOAP fault (not exception) on the consumer side, then the fault flag on org.apache.camel.Message#isFault() will be send back in the response as a JMS header with the key JmsConstants#JMS_TRANSFER_FAULT. If the client is Camel, the returned fault flag will be set on the org.apache.camel.Message#setFault(boolean). You may want to enable this when using Camel components that support [...] - "defaultValue":"false" - }, - { "name":"camel.component.jms.jms-operations", "type":"org.springframework.jms.core.JmsOperations", "sourceType":"org.apache.camel.component.jms.JmsComponent",