WW-4536 Drops static to allow redefine the key

(cherry picked from commit 755ad3f)
liuruizhi · Oct 19, 2015 · 5dcbe65 · 5dcbe65
1 parent 617bfd2
commit 5dcbe65
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 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
@@ -210,7 +210,7 @@ public void validate(Object object, String context, ValidatorContext validatorCo
      * @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/...src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java b/...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);
     }