From 5dcbe657b015c6df5ebbdf35e2548cef41099116 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Mon, 19 Oct 2015 20:49:49 +0200 Subject: [PATCH] WW-4536 Drops static to allow redefine the key (cherry picked from commit 755ad3fadb0f3b6b6b351c9bc41b59b95c45c07b) --- .../xwork2/validator/AnnotationActionValidatorManager.java | 2 +- .../xwork2/validator/AnnotationActionValidatorManagerTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java b/core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java index c0f41fe7b..d4b9cc665 100644 --- a/core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java +++ b/core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java @@ -210,7 +210,7 @@ public class AnnotationActionValidatorManager implements ActionValidatorManager * @param context context * @return a validator key which is the class name plus context. */ - protected static String buildValidatorKey(Class clazz, String context) { + protected String buildValidatorKey(Class clazz, String context) { ActionInvocation invocation = ActionContext.getContext().getActionInvocation(); ActionProxy proxy = invocation.getProxy(); ActionConfig config = proxy.getConfig(); diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java index 3c6462225..71111500f 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java @@ -86,7 +86,7 @@ public class AnnotationActionValidatorManagerTest extends XWorkTestCase { } public void testBuildValidatorKey() { - String validatorKey = AnnotationActionValidatorManager.buildValidatorKey(SimpleAnnotationAction.class, "name"); + String validatorKey = annotationActionValidatorManager.buildValidatorKey(SimpleAnnotationAction.class, "name"); assertEquals(SimpleAnnotationAction.class.getName() + "/packageName/name", validatorKey); }