This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push: new d079c85ea59 Fix and update spring ws tests (#15801) d079c85ea59 is described below commit d079c85ea5912a0e90727bc864bc5df36b2ce9d7 Author: Federico Mariani <34543311+cro...@users.noreply.github.com> AuthorDate: Wed Oct 2 11:50:45 2024 +0200 Fix and update spring ws tests (#15801) --- ...rEndpointMappingByBeanNameRouteTest-context.xml | 2 +- ...intMappingResponseHandlingRouteTest-context.xml | 16 ++++++------- .../spring/ws/ProducerLocalRouteTest-context.xml | 2 +- .../component/spring/ws/SoapHeaderTest-context.xml | 2 +- .../ws/SoapResponseAttachmentTest-context.xml | 2 +- .../ws/addresing/CamelDirectSenderTest-context.xml | 10 ++++---- .../ConsumerWSAParamsActionTests-context.xml | 28 +++++++++++----------- .../addresing/ConsumerWSAParamsTOTests-context.xml | 28 +++++++++++----------- .../addresing/ProducerParamsBasicTest-context.xml | 18 +++++++------- .../ProducerParamsPrecedenceTest-context.xml | 12 +++++----- 10 files changed, 60 insertions(+), 60 deletions(-) diff --git a/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/ConsumerEndpointMappingByBeanNameRouteTest-context.xml b/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/ConsumerEndpointMappingByBeanNameRouteTest-context.xml index dcd87404d70..563400a5220 100644 --- a/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/ConsumerEndpointMappingByBeanNameRouteTest-context.xml +++ b/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/ConsumerEndpointMappingByBeanNameRouteTest-context.xml @@ -29,7 +29,7 @@ <camelContext xmlns="http://camel.apache.org/schema/spring"> <route> <from uri="spring-ws:beanname:QuoteEndpointDispatcher"/> - <to uri="bean:responseProcessor"/> + <process ref="responseProcessor"/> </route> </camelContext> diff --git a/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/ConsumerEndpointMappingResponseHandlingRouteTest-context.xml b/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/ConsumerEndpointMappingResponseHandlingRouteTest-context.xml index 58c729c5ac6..9fe8626431a 100644 --- a/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/ConsumerEndpointMappingResponseHandlingRouteTest-context.xml +++ b/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/ConsumerEndpointMappingResponseHandlingRouteTest-context.xml @@ -30,35 +30,35 @@ <camelContext xmlns="http://camel.apache.org/schema/spring"> <route> <from uri="spring-ws:rootqname:{http://www.webserviceX.NET/}GetQuote?endpointMapping=#endpointMapping"/> - <to uri="bean:responseProcessor"/> + <process ref="responseProcessor"/> </route> <route> <from uri="spring-ws:soapaction:http://www.webserviceX.NET/GetQuote?endpointMapping=#endpointMapping"/> - <to uri="bean:responseProcessor"/> + <process ref="responseProcessor"/> </route> <route> <from uri="spring-ws:uri:http://localhost/stockquote2?endpointMapping=#endpointMapping"/> - <to uri="bean:responseProcessor"/> + <process ref="responseProcessor"/> </route> <route> <from uri="spring-ws:uripath:/stockquote3/service?endpointMapping=#endpointMapping"/> - <to uri="bean:responseProcessor"/> + <process ref="responseProcessor"/> </route> <route> <from uri="spring-ws:uripath:/stockquote4/service*?endpointMapping=#endpointMapping"/> - <to uri="bean:responseProcessor"/> + <process ref="responseProcessor"/> </route> <route> <from uri="spring-ws:xpathresult:GRABME?expression=//GetQuote&endpointMapping=#endpointMapping"/> - <to uri="bean:responseProcessor"/> + <process ref="responseProcessor"/> </route> <route> <from uri="spring-ws:action:http://www.webserviceX.NET/GetQuote?endpointMapping=#wsaEndpointMapping"/> - <to uri="bean:wsaResponseProcessor"/> + <process ref="wsaResponseProcessor"/> </route> <route> <from uri="spring-ws:to:http://url.to?endpointMapping=#wsaEndpointMapping"/> - <to uri="bean:wsaResponseProcessor"/> + <process ref="wsaResponseProcessor"/> </route> </camelContext> diff --git a/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/ProducerLocalRouteTest-context.xml b/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/ProducerLocalRouteTest-context.xml index b69df506a22..a978e7a075f 100644 --- a/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/ProducerLocalRouteTest-context.xml +++ b/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/ProducerLocalRouteTest-context.xml @@ -64,7 +64,7 @@ <!-- consumer route (providing the actual web service) --> <route> <from uri="spring-ws:soapaction:http://www.stockquotes.edu/GetQuote?endpointMapping=#endpointMapping"/> - <to uri="bean:responseProcessor"/> + <process ref="responseProcessor"/> </route> </camelContext> diff --git a/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/SoapHeaderTest-context.xml b/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/SoapHeaderTest-context.xml index 9192417168c..98e65814559 100644 --- a/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/SoapHeaderTest-context.xml +++ b/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/SoapHeaderTest-context.xml @@ -38,7 +38,7 @@ <!-- consumer route (providing the actual web service) that responds with the request so we can see SOAP headers --> <route> <from uri="spring-ws:soapaction:http://www.stockquotes.edu/GetQuote?endpointMapping=#endpointMapping"/> - <to uri="bean:responseProcessor"/> + <process ref="responseProcessor"/> </route> </camelContext> diff --git a/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/SoapResponseAttachmentTest-context.xml b/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/SoapResponseAttachmentTest-context.xml index add606229c7..27e140fa0e8 100644 --- a/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/SoapResponseAttachmentTest-context.xml +++ b/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/SoapResponseAttachmentTest-context.xml @@ -33,7 +33,7 @@ <!-- consumer route (providing the actual web service) that responds with the request so we can see SOAP headers --> <route> <from uri="spring-ws:soapaction:http://www.stockquotes.edu/GetQuote?endpointMapping=#endpointMapping"/> - <to uri="bean:responseProcessor"/> + <process ref="responseProcessor"/> </route> </camelContext> diff --git a/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/addresing/CamelDirectSenderTest-context.xml b/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/addresing/CamelDirectSenderTest-context.xml index 586991f20d6..629e9ddfd73 100644 --- a/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/addresing/CamelDirectSenderTest-context.xml +++ b/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/addresing/CamelDirectSenderTest-context.xml @@ -31,19 +31,19 @@ <route> <from uri="spring-ws:to:http://sender-default.com?endpointMapping=#wsaEndpointMapping" /> - <to uri="bean:okResponse" /> + <process ref="okResponse" /> </route> <route> <from uri="spring-ws:to:http://sender-custom.com?messageSender=#customMessageSender&endpointMapping=#wsaEndpointMapping" /> - <to uri="bean:okResponse" /> + <process ref="okResponse" /> </route> <route> <from uri="spring-ws:to:http://sender-camel.com?messageSender=#camelDirectMessageSender&endpointMapping=#wsaEndpointMapping" /> - <to uri="bean:okResponse" /> + <process ref="okResponse" /> </route> <route> @@ -55,12 +55,12 @@ <route> <from uri="spring-ws:to:http://messageIdStrategy-default.com?endpointMapping=#wsaEndpointMapping" /> - <to uri="bean:okResponse" /> + <process ref="okResponse" /> </route> <route> <from uri="spring-ws:to:http://messageIdStrategy-custom.com?endpointMapping=#wsaEndpointMapping&messageIdStrategy=#staticId" /> - <to uri="bean:okResponse" /> + <process ref="okResponse" /> </route> </camelContext> diff --git a/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/addresing/ConsumerWSAParamsActionTests-context.xml b/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/addresing/ConsumerWSAParamsActionTests-context.xml index 052e88d610a..982cd308ae9 100644 --- a/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/addresing/ConsumerWSAParamsActionTests-context.xml +++ b/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/addresing/ConsumerWSAParamsActionTests-context.xml @@ -32,37 +32,37 @@ <route> <from uri="spring-ws:action:http://default-ok.com/?endpointMapping=#wsaEndpointMapping" /> - <to uri="okResponse" /> + <process ref="okResponse" /> </route> <route> <from uri="spring-ws:action:http://default-fault.com/?endpointMapping=#wsaEndpointMapping" /> - <to uri="causeFault" /> + <process ref="causeFault" /> </route> <route> <from uri="spring-ws:action:http://uri-ok.com?outputAction=http://customURIOutputAction&faultAction=http://customURIFaultAction&endpointMapping=#wsaEndpointMapping" /> - <to uri="okResponse" /> + <process ref="okResponse" /> </route> <route> <from uri="spring-ws:action:http://uri-fault.com?outputAction=http://customURIOutputAction&faultAction=http://customURIFaultAction&endpointMapping=#wsaEndpointMapping" /> - <to uri="causeFault" /> + <process ref="causeFault" /> </route> <route> <from uri="spring-ws:action:http://override-ok.com?outputAction=http://do-not-use.com&faultAction=http://do-not-use.com&endpointMapping=#wsaEndpointMapping" /> - <to uri="overrideOkResponse" /> + <process ref="overrideOkResponse" /> </route> <route> <from uri="spring-ws:action:http://override-fault.com?endpointMapping=#wsaEndpointMapping" /> - <to uri="overrideOkResponse" /> - <to uri="causeFault" /> + <process ref="overrideOkResponse" /> + <process ref="causeFault" /> </route> @@ -70,13 +70,13 @@ <route> <from uri="spring-ws:action:http://headerOnly-ok.com?endpointMapping=#wsaEndpointMapping" /> - <to uri="overrideOkResponse" /> + <process ref="overrideOkResponse" /> </route> <route> <from uri="spring-ws:action:http://headerOnly-fault.com?endpointMapping=#wsaEndpointMapping" /> - <to uri="overrideOkResponse" /> - <to uri="causeFault" /> + <process ref="overrideOkResponse" /> + <process ref="causeFault" /> </route> @@ -86,24 +86,24 @@ <route> <from uri="spring-ws:action:http://uriOutputOnly-ok.com/?outputAction=http://customURIOutputAction&endpointMapping=#wsaEndpointMapping" /> - <to uri="okResponse" /> + <process ref="okResponse" /> </route> <route> <from uri="spring-ws:action:http://uriOutputOnly-fault.com/?outputAction=http://customURIOutputAction&endpointMapping=#wsaEndpointMapping" /> - <to uri="causeFault" /> + <process ref="causeFault" /> </route> <route> <from uri="spring-ws:action:http://uriFaultOnly-ok.com/?faultAction=http://customURIFaultAction&endpointMapping=#wsaEndpointMapping" /> - <to uri="okResponse" /> + <process ref="okResponse" /> </route> <route> <from uri="spring-ws:action:http://uriFaultOnly-fault.com/?faultAction=http://customURIFaultAction&endpointMapping=#wsaEndpointMapping" /> - <to uri="causeFault" /> + <process ref="causeFault" /> </route> diff --git a/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/addresing/ConsumerWSAParamsTOTests-context.xml b/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/addresing/ConsumerWSAParamsTOTests-context.xml index 0059829bf2a..e145bf62813 100644 --- a/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/addresing/ConsumerWSAParamsTOTests-context.xml +++ b/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/addresing/ConsumerWSAParamsTOTests-context.xml @@ -32,37 +32,37 @@ <route> <from uri="spring-ws:to:http://default-ok.com/?endpointMapping=#wsaEndpointMapping" /> - <to uri="okResponse" /> + <process ref="okResponse" /> </route> <route> <from uri="spring-ws:to:http://default-fault.com/?endpointMapping=#wsaEndpointMapping" /> - <to uri="causeFault" /> + <process ref="causeFault" /> </route> <route> <from uri="spring-ws:to:http://uri-ok.com?outputAction=http://customURIOutputAction&faultAction=http://customURIFaultAction&endpointMapping=#wsaEndpointMapping" /> - <to uri="okResponse" /> + <process ref="okResponse" /> </route> <route> <from uri="spring-ws:to:http://uri-fault.com?outputAction=http://customURIOutputAction&faultAction=http://customURIFaultAction&endpointMapping=#wsaEndpointMapping" /> - <to uri="causeFault" /> + <process ref="causeFault" /> </route> <route> <from uri="spring-ws:to:http://override-ok.com?outputAction=http://do-not-use.com&faultAction=http://do-not-use.com&endpointMapping=#wsaEndpointMapping" /> - <to uri="overrideOkResponse" /> + <process ref="overrideOkResponse" /> </route> <route> <from uri="spring-ws:to:http://override-fault.com?endpointMapping=#wsaEndpointMapping" /> - <to uri="overrideOkResponse" /> - <to uri="causeFault" /> + <process ref="overrideOkResponse" /> + <process ref="causeFault" /> </route> @@ -70,13 +70,13 @@ <route> <from uri="spring-ws:to:http://headerOnly-ok.com?endpointMapping=#wsaEndpointMapping" /> - <to uri="overrideOkResponse" /> + <process ref="overrideOkResponse" /> </route> <route> <from uri="spring-ws:to:http://headerOnly-fault.com?endpointMapping=#wsaEndpointMapping" /> - <to uri="overrideOkResponse" /> - <to uri="causeFault" /> + <process ref="overrideOkResponse" /> + <process ref="causeFault" /> </route> @@ -86,24 +86,24 @@ <route> <from uri="spring-ws:to:http://uriOutputOnly-ok.com/?outputAction=http://customURIOutputAction&endpointMapping=#wsaEndpointMapping" /> - <to uri="okResponse" /> + <process ref="okResponse" /> </route> <route> <from uri="spring-ws:to:http://uriOutputOnly-fault.com/?outputAction=http://customURIOutputAction&endpointMapping=#wsaEndpointMapping" /> - <to uri="causeFault" /> + <process ref="causeFault" /> </route> <route> <from uri="spring-ws:to:http://uriFaultOnly-ok.com/?faultAction=http://customURIFaultAction&endpointMapping=#wsaEndpointMapping" /> - <to uri="okResponse" /> + <process ref="okResponse" /> </route> <route> <from uri="spring-ws:to:http://uriFaultOnly-fault.com/?faultAction=http://customURIFaultAction&endpointMapping=#wsaEndpointMapping" /> - <to uri="causeFault" /> + <process ref="causeFault" /> </route> diff --git a/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/addresing/ProducerParamsBasicTest-context.xml b/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/addresing/ProducerParamsBasicTest-context.xml index 97f089e159c..5cf94cb22bc 100644 --- a/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/addresing/ProducerParamsBasicTest-context.xml +++ b/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/addresing/ProducerParamsBasicTest-context.xml @@ -30,38 +30,38 @@ <camelContext xmlns="http://camel.apache.org/schema/spring"> <route> <from uri="direct:noAction" /> - <to uri="bean:wsaResponseProcessor" /> + <process ref="wsaResponseProcessor" /> <to uri="spring-ws:http://google.com?webServiceTemplate=#webServiceTemplate&endpointMapping=#endpointMapping" /> </route> <route> <from uri="direct:defaultOk" /> - <to uri="bean:wsaResponseProcessor" /> + <process ref="wsaResponseProcessor" /> <to uri="spring-ws:http://google.com?wsAddressingAction=http://wsaAction.com&webServiceTemplate=#webServiceTemplate&endpointMapping=#endpointMapping" /> </route> <route> <from uri="direct:defaultFault" /> - <to uri="bean:wsaResponseProcessor" /> + <process ref="wsaResponseProcessor" /> <to uri="spring-ws:http://google.com?wsAddressingAction=http://wsaAction.com&webServiceTemplate=#webServiceTemplate&endpointMapping=#endpointMapping" /> </route> <route> <from uri="direct:replyTo" /> - <to uri="bean:wsaResponseProcessor" /> + <process ref="wsaResponseProcessor" /> <to uri="spring-ws:http://google.com?wsAddressingAction=http://wsaAction.com&webServiceTemplate=#webServiceTemplate&replyTo=mailto://repl...@chocolatejar.eu&endpointMapping=#endpointMapping&faultTo=http://fault.to" /> </route> <route> <from uri="direct:replyTo-customMessageIdStrategy" /> - <to uri="bean:wsaResponseProcessor" /> + <process ref="wsaResponseProcessor" /> <to uri="spring-ws:http://google.com?wsAddressingAction=http://wsaAction.com&webServiceTemplate=#webServiceTemplate&replyTo=mailto://repl...@chocolatejar.eu&endpointMapping=#endpointMapping&faultTo=http://fault.to&messageIdStrategy=#staticId" /> </route> <route> <from uri="direct:faultTo" /> - <to uri="bean:wsaResponseProcessor" /> + <process ref="wsaResponseProcessor" /> <to uri="spring-ws:http://google.com?wsAddressingAction=http://wsaAction.com&webServiceTemplate=#webServiceTemplate&faultTo=http://fault.to&endpointMapping=#endpointMapping" /> </route> @@ -69,13 +69,13 @@ <route> <from uri="direct:omittedFaultTo" /> - <to uri="bean:wsaResponseProcessor" /> + <process ref="wsaResponseProcessor" /> <to uri="spring-ws:http://google.com?wsAddressingAction=http://turnOnWSA.com&replyTo=http://reply.to&webServiceTemplate=#webServiceTemplate&endpointMapping=#endpointMapping" /> </route> <route> <from uri="direct:omittedReplyTo" /> - <to uri="bean:wsaResponseProcessor" /> + <process ref="wsaResponseProcessor" /> <to uri="spring-ws:http://google.com?wsAddressingAction=http://turnOnWSA.com&faultTo=http://fault.to&webServiceTemplate=#webServiceTemplate&endpointMapping=#endpointMapping" /> </route> @@ -83,7 +83,7 @@ <route> <from uri="direct:empty" /> - <to uri="bean:wsaResponseProcessor" /> + <process ref="wsaResponseProcessor" /> <to uri="spring-ws:http://google.com?wsAddressingAction=http://turnOnWSA.com&webServiceTemplate=#webServiceTemplate&endpointMapping=#endpointMapping" /> </route> diff --git a/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/addresing/ProducerParamsPrecedenceTest-context.xml b/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/addresing/ProducerParamsPrecedenceTest-context.xml index 3f9621db775..0594ffd9959 100644 --- a/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/addresing/ProducerParamsPrecedenceTest-context.xml +++ b/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/addresing/ProducerParamsPrecedenceTest-context.xml @@ -31,13 +31,13 @@ <route> <from uri="direct:wsAddressingAction" /> - <to uri="bean:wsaResponseProcessor" /> + <process ref="wsaResponseProcessor" /> <to uri="spring-ws:http://google.com?wsAddressingAction=http://wsaAction.com&webServiceTemplate=#webServiceTemplate&endpointMapping=#endpointMapping" /> </route> <route> <from uri="direct:precedenceWsAddressingAction" /> - <to uri="bean:wsaPrecedenceResponseProcessor" /> + <process ref="wsaPrecedenceResponseProcessor" /> <to uri="spring-ws:http://google.com?wsAddressingAction=http://doNotUse.com&webServiceTemplate=#webServiceTemplate&endpointMapping=#endpointMapping" /> </route> @@ -45,13 +45,13 @@ <route> <from uri="direct:replyTo" /> - <to uri="bean:wsaResponseProcessor" /> + <process ref="wsaResponseProcessor" /> <to uri="spring-ws:http://google.com?wsAddressingAction=http://turnOnWSA.com&replyTo=http://reply.to&faultTo=http://fault.to&webServiceTemplate=#webServiceTemplate&endpointMapping=#endpointMapping" /> </route> <route> <from uri="direct:precedenceReplyTo" /> - <to uri="bean:wsaPrecedenceResponseProcessor" /> + <process ref="wsaPrecedenceResponseProcessor" /> <to uri="spring-ws:http://google.com?wsAddressingAction=http://turnOnWSA.com&replyTo=http://doNotUse.to&faultTo=http://fault.to&webServiceTemplate=#webServiceTemplate&endpointMapping=#endpointMapping" /> </route> @@ -60,13 +60,13 @@ <route> <from uri="direct:faultTo" /> - <to uri="bean:wsaResponseProcessor" /> + <process ref="wsaResponseProcessor" /> <to uri="spring-ws:http://google.com?wsAddressingAction=http://turnOnWSA.com&faultTo=http://fault.to&webServiceTemplate=#webServiceTemplate&endpointMapping=#endpointMapping" /> </route> <route> <from uri="direct:precedenceFaultTo" /> - <to uri="bean:wsaPrecedenceResponseProcessor" /> + <process ref="wsaPrecedenceResponseProcessor" /> <to uri="spring-ws:http://google.com?wsAddressingAction=http://turnOnWSA.com&faultTo=http://doNotUse.to&webServiceTemplate=#webServiceTemplate&endpointMapping=#endpointMapping" /> </route>