diff --git a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/constraints/ValidationGroup.java b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/constraints/ValidationGroup.java index dccebba6b..19332288f 100644 --- a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/constraints/ValidationGroup.java +++ b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/constraints/ValidationGroup.java @@ -18,6 +18,7 @@ */ package org.apache.struts.beanvalidation.constraints; +import javax.validation.groups.Default; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -46,5 +47,5 @@ import java.lang.annotation.Target; @Retention(RetentionPolicy.RUNTIME) public @interface ValidationGroup { - Class[] value() default {}; + Class[] value() default {Default.class}; } \ 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 1545b4870..75c25f9c3 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 @@ -37,6 +37,7 @@ import org.apache.struts2.interceptor.validation.SkipValidation; import javax.validation.ConstraintViolation; import javax.validation.Validator; +import javax.validation.groups.Default; import java.lang.reflect.Method; import java.util.Arrays; import java.util.Set; @@ -108,7 +109,7 @@ public class BeanValidationInterceptor extends MethodFilterInterceptor { protected Class[] getValidationGroups(Object action, String methodName) throws NoSuchMethodException { ValidationGroup validationGroup = MethodUtils.getAnnotation(getActionMethod(action.getClass(), methodName), ValidationGroup.class, true, true); - return validationGroup == null ? new Class[]{} : validationGroup.value(); + return validationGroup == null ? new Class[]{Default.class} : validationGroup.value(); } protected void performBeanValidation(Object action, Validator validator, Class[] groups) {