From 215eb627d46d448aa5f7ebf7697b34736946b339 Mon Sep 17 00:00:00 2001
From: Hedju Hor <hedjuhor1@gmail.com>
Date: Thu, 11 Jan 2018 19:47:14 +0100
Subject: [PATCH] refactoring ValidateGroup -> ValidationGroup

---
 .../{ValidateGroup.java => ValidationGroup.java}   |  6 +++---
 .../interceptor/BeanValidationInterceptor.java     |  6 +++---
 .../actions/ValidateGroupAction.java               | 14 +++++++-------
 3 files changed, 13 insertions(+), 13 deletions(-)
 rename plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/constraints/{ValidateGroup.java => ValidationGroup.java} (89%)

diff --git a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/constraints/ValidateGroup.java b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/constraints/ValidationGroup.java
similarity index 89%
rename from plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/constraints/ValidateGroup.java
rename to plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/constraints/ValidationGroup.java
index 4ca0b37cb..dccebba6b 100644
--- a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/constraints/ValidateGroup.java
+++ b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/constraints/ValidationGroup.java
@@ -30,7 +30,7 @@ import java.lang.annotation.Target;
  * </p>
  * <pre>
  *
- *  {@literal @}ValidateGroup(CarChecks.class)
+ *  {@literal @}ValidationGroup(CarChecks.class)
  *  {@literal @}Action...
  * </pre>
  * <p>
@@ -38,13 +38,13 @@ import java.lang.annotation.Target;
  * Example, Validate with severals special group
  * </p>
  * <pre>
- *  {@literal @}ValidateGroup(Default.class, CarChecks.class, DriverChecks.class)
+ *  {@literal @}ValidationGroup(Default.class, CarChecks.class, DriverChecks.class)
  *  {@literal @}Action...
  * </pre>
  */
 @Target({ElementType.METHOD})
 @Retention(RetentionPolicy.RUNTIME)
-public @interface ValidateGroup {
+public @interface ValidationGroup {
 
     Class<?>[] value() default {};
 }
\ No newline at end of file
diff --git a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationInterceptor.java b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationInterceptor.java
index bdbca6a2f..f2b2e9b0b 100644
--- a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationInterceptor.java
+++ b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationInterceptor.java
@@ -31,7 +31,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.reflect.MethodUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.struts.beanvalidation.constraints.ValidateGroup;
+import org.apache.struts.beanvalidation.constraints.ValidationGroup;
 import org.apache.struts.beanvalidation.validation.constant.ValidatorConstants;
 import org.apache.struts2.interceptor.validation.SkipValidation;
 
@@ -109,8 +109,8 @@ public class BeanValidationInterceptor extends MethodFilterInterceptor {
     }
 
     protected Class<?>[] getValidationGroups(Object action, String methodName) throws NoSuchMethodException {
-        ValidateGroup validateGroup = MethodUtils.getAnnotation(getActionMethod(action.getClass(), methodName), ValidateGroup.class, true, true);
-        return validateGroup == null ? new Class[]{} : validateGroup.value();
+        ValidationGroup validationGroup = MethodUtils.getAnnotation(getActionMethod(action.getClass(), methodName), ValidationGroup.class, true, true);
+        return validationGroup == null ? new Class[]{} : validationGroup.value();
     }
 
     protected void performBeanValidation(Object action, Validator validator, Class<?>[] groups) {
diff --git a/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/actions/ValidateGroupAction.java b/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/actions/ValidateGroupAction.java
index a2107a918..6b17ab736 100644
--- a/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/actions/ValidateGroupAction.java
+++ b/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/actions/ValidateGroupAction.java
@@ -20,7 +20,7 @@ package org.apache.struts.beanvalidation.actions;
 
 import com.opensymphony.xwork2.ActionSupport;
 import com.opensymphony.xwork2.ModelDriven;
-import org.apache.struts.beanvalidation.constraints.ValidateGroup;
+import org.apache.struts.beanvalidation.constraints.ValidationGroup;
 import org.apache.struts.beanvalidation.models.Person;
 
 import javax.validation.Valid;
@@ -38,32 +38,32 @@ public class ValidateGroupAction extends ActionSupport implements ModelDriven<Pe
         return SUCCESS;
     }
 
-    @ValidateGroup
+    @ValidationGroup
     public String actionDefault() {
         return SUCCESS;
     }
 
-    @ValidateGroup(Person.NameChecks.class)
+    @ValidationGroup(Person.NameChecks.class)
     public String actionNameChecks() {
         return SUCCESS;
     }
 
-    @ValidateGroup(Person.StreetChecks.class)
+    @ValidationGroup(Person.StreetChecks.class)
     public String actionStreetChecks() {
         return SUCCESS;
     }
 
-    @ValidateGroup(Person.NameAndStreetChecks.class)
+    @ValidationGroup(Person.NameAndStreetChecks.class)
     public String actionNameAndStreetChecks() {
         return SUCCESS;
     }
 
-    @ValidateGroup({Person.NameChecks.class, Person.FirstNameChecks.class})
+    @ValidationGroup({Person.NameChecks.class, Person.FirstNameChecks.class})
     public String actionMultiGroupsChecks() {
         return SUCCESS;
     }
 
-    @ValidateGroup({Person.LongNameChecks.class})
+    @ValidationGroup({Person.LongNameChecks.class})
     public String actionLongNameChecks() {
         return SUCCESS;
     }