From 9d07c3b4c37031ddfecddd44d0a5057c9e6964fa Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Fri, 3 Jan 2025 17:04:15 +0100 Subject: [PATCH] WW-5498 Adds devMode errors as action messages to avoid breaking validation logic --- .../java/com/opensymphony/xwork2/util/DebugUtils.java | 2 +- .../parameter/ParametersInterceptorTest.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/com/opensymphony/xwork2/util/DebugUtils.java b/core/src/main/java/com/opensymphony/xwork2/util/DebugUtils.java index ff7042b59..0838c22ec 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/DebugUtils.java +++ b/core/src/main/java/com/opensymphony/xwork2/util/DebugUtils.java @@ -35,7 +35,7 @@ public final class DebugUtils { log.error(message); if (action instanceof ValidationAware) { ValidationAware validationAware = (ValidationAware) action; - validationAware.addActionError(message); + validationAware.addActionMessage(message); } } diff --git a/core/src/test/java/org/apache/struts2/interceptor/parameter/ParametersInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/parameter/ParametersInterceptorTest.java index b15594f95..cf87495bc 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/parameter/ParametersInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/parameter/ParametersInterceptorTest.java @@ -116,9 +116,9 @@ public class ParametersInterceptorTest extends XWorkTestCase { pi.setParameters(action, vs, HttpParameters.create(params).build()); // then - assertEquals(3, action.getActionErrors().size()); + assertEquals(3, action.getActionMessages().size()); - List actionErrors = new ArrayList<>(action.getActionErrors()); + List actionErrors = new ArrayList<>(action.getActionMessages()); String msg1 = actionErrors.get(0); String msg2 = actionErrors.get(1); @@ -203,9 +203,9 @@ public class ParametersInterceptorTest extends XWorkTestCase { pi.setParameters(action, vs, HttpParameters.create(params).build()); // then - assertEquals(3, action.getActionErrors().size()); + assertEquals(3, action.getActionMessages().size()); - List actionErrors = new ArrayList<>(action.getActionErrors()); + List actionErrors = new ArrayList<>(action.getActionMessages()); String msg1 = actionErrors.get(0); String msg2 = actionErrors.get(1); String msg3 = actionErrors.get(2); @@ -585,7 +585,7 @@ public class ParametersInterceptorTest extends XWorkTestCase { container.inject(config.getInterceptors().get(0).getInterceptor()); ActionProxy proxy = actionProxyFactory.createActionProxy("", MockConfigurationProvider.PARAM_INTERCEPTOR_ACTION_NAME, null, extraContext.getContextMap()); proxy.execute(); - final String actionError = "" + ((SimpleAction) proxy.getAction()).getActionErrors().toArray()[0]; + final String actionError = "" + ((SimpleAction) proxy.getAction()).getActionMessages().toArray()[0]; assertTrue(actionError.contains("Error setting expression 'not_a_property' with value 'There is no action property named like this'")); }