From f58db47ba41f7ce60dc82d5969ecff304c4f3716 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Wed, 16 Apr 2025 15:11:04 +0200 Subject: [PATCH] Fix error logging in client-side validation Closes gh-1144 --- .../support/interceptor/AbstractValidatingInterceptor.java | 2 +- .../support/interceptor/WebServiceValidationException.java | 6 ++++-- .../interceptor/PayloadValidatingInterceptorTest.java | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/AbstractValidatingInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/AbstractValidatingInterceptor.java index 5de59abb..60f71f29 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/AbstractValidatingInterceptor.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/AbstractValidatingInterceptor.java @@ -185,7 +185,7 @@ public abstract class AbstractValidatingInterceptor extends TransformerObjectSup errors = this.validator.validate(requestSource); } catch (IOException ex) { - throw new WebServiceIOException("Could not validate response: " + ex.getMessage(), ex); + throw new WebServiceIOException("Could not validate request: " + ex.getMessage(), ex); } if (!ObjectUtils.isEmpty(errors)) { return handleRequestValidationErrors(messageContext, errors); diff --git a/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/WebServiceValidationException.java b/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/WebServiceValidationException.java index b124975d..75243235 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/WebServiceValidationException.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/WebServiceValidationException.java @@ -41,7 +41,7 @@ public class WebServiceValidationException extends WebServiceClientException { } private static String createMessage(SAXParseException[] validationErrors) { - StringBuilder builder = new StringBuilder("XML validation error on response: "); + StringBuilder builder = new StringBuilder("XML validation error on request: "); for (SAXParseException validationError : validationErrors) { builder.append(validationError.getMessage()); @@ -49,7 +49,9 @@ public class WebServiceValidationException extends WebServiceClientException { return builder.toString(); } - /** Returns the validation errors. */ + /** + * Return the validation errors. + */ public SAXParseException[] getValidationErrors() { return this.validationErrors; } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/client/support/interceptor/PayloadValidatingInterceptorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/client/support/interceptor/PayloadValidatingInterceptorTest.java index ab7ef8f6..2a44f5ca 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/client/support/interceptor/PayloadValidatingInterceptorTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/client/support/interceptor/PayloadValidatingInterceptorTest.java @@ -93,7 +93,7 @@ public class PayloadValidatingInterceptorTest { assertThatExceptionOfType(WebServiceClientException.class) .isThrownBy(() -> this.interceptor.handleRequest(this.context)) - .withMessageContaining("XML validation error on response"); + .withMessageContaining("XML validation error on request"); } @Test @@ -105,7 +105,7 @@ public class PayloadValidatingInterceptorTest { assertThatExceptionOfType(WebServiceClientException.class) .isThrownBy(() -> this.interceptor.handleRequest(this.context)) - .withMessageContaining("XML validation error on response"); + .withMessageContaining("XML validation error on request"); } @Test @@ -199,7 +199,7 @@ public class PayloadValidatingInterceptorTest { assertThatExceptionOfType(WebServiceClientException.class) .isThrownBy(() -> this.interceptor.handleRequest(this.context)) - .withMessageContaining("XML validation error on response"); + .withMessageContaining("XML validation error on request"); } @Test