Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-07 15:46:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-4009 Improves RequiredFieldValidator annotation to match RequiredFieldValidator class

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1457722 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Lukasz Lenart
2013-03-18 12:00:22 +00:00
parent 34a10bae06
commit a4eb0803dc
5 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xwork-core/src/main/java/com/opensymphony/xwork2/validator/AnnotationValidationConfigurationBuilder.java
+1
View File
@@ -629,6 +629,7 @@ public class AnnotationValidationConfigurationBuilder {
.shortCircuit(v.shortCircuit())
.defaultMessage(v.message())
.messageKey(v.key())
.messageParams(v.messageParams())
.build();
}
xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/RequiredFieldValidator.java
+11
View File
@@ -55,6 +55,12 @@ import java.lang.annotation.Target;
* <td class='confluenceTd'>i18n key from language specific properties file.</td>
* </tr>
* <tr>
* <td class='confluenceTd'>messageParams</td>
* <td class='confluenceTd'>no</td>
* <td class='confluenceTd'>&nbsp;</td>
* <td class='confluenceTd'>Additional params to be used to customize message - will be evaluated against the Value Stack</td>
* </tr>
* <tr>
* <td class='confluenceTd'>fieldName</td>
* <td class='confluenceTd'>no</td>
* <td class='confluenceTd'>&nbsp;</td>
@@ -102,6 +108,11 @@ public @interface RequiredFieldValidator {
*/
String key() default "";
/**
* Additional params to be used to customize message - will be evaluated against the Value Stack
*/
String[] messageParams() default {};
/**
* The optional fieldName for SIMPLE validator types.
*/
xwork-core/src/test/java/com/opensymphony/xwork2/validator/AnnotationValidationAction.java
+3
View File
@@ -11,6 +11,7 @@ import com.opensymphony.xwork2.validator.annotations.ExpressionValidator;
import com.opensymphony.xwork2.validator.annotations.FieldExpressionValidator;
import com.opensymphony.xwork2.validator.annotations.IntRangeFieldValidator;
import com.opensymphony.xwork2.validator.annotations.RegexFieldValidator;
import com.opensymphony.xwork2.validator.annotations.RequiredFieldValidator;
import com.opensymphony.xwork2.validator.annotations.ValidationParameter;
/**
@@ -45,6 +46,8 @@ public class AnnotationValidationAction extends ActionSupport {
messageParams = {"one", "two", "three"}, shortCircuit = true)
@IntRangeFieldValidator(fieldName = "foo", key = "int.key", message = "Foo is out of range!", max = "10", min = "1",
messageParams = {"one", "two", "three"}, shortCircuit = true)
@RequiredFieldValidator(fieldName = "foo", key = "required.key", message = "Foo is required!",
messageParams = {"one", "two", "three"}, shortCircuit = true)
public String execute() {
return SUCCESS;
}
xwork-core/src/test/java/com/opensymphony/xwork2/validator/AnnotationValidationConfigurationBuilderTest.java
+13 -2
View File
@@ -23,6 +23,7 @@ import com.opensymphony.xwork2.validator.validators.ExpressionValidator;
import com.opensymphony.xwork2.validator.validators.FieldExpressionValidator;
import com.opensymphony.xwork2.validator.validators.IntRangeFieldValidator;
import com.opensymphony.xwork2.validator.validators.RegexFieldValidator;
import com.opensymphony.xwork2.validator.validators.RequiredFieldValidator;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@@ -44,7 +45,7 @@ public class AnnotationValidationConfigurationBuilderTest extends XWorkTestCase
List<Validator> validators = manager.getValidators(AnnotationValidationAction.class, null);
// then
assertEquals(validators.size(), 10);
assertEquals(validators.size(), 11);
for (Validator validator : validators) {
validate(validator);
}
@@ -61,7 +62,7 @@ public class AnnotationValidationConfigurationBuilderTest extends XWorkTestCase
ValueStack valueStack = container.getInstance(ValueStackFactory.class).createValueStack();
valueStack.push(new AnnotationValidationExpAction());
assertEquals(validators.size(), 10);
assertEquals(validators.size(), 11);
for (Validator validator : validators) {
validator.setValueStack(valueStack);
validate(validator);
@@ -89,9 +90,19 @@ public class AnnotationValidationConfigurationBuilderTest extends XWorkTestCase
validateFieldExpressionValidator((FieldExpressionValidator) validator);
} else if (validator.getValidatorType().equals("int")) {
validateIntRangeFieldValidator((IntRangeFieldValidator) validator);
} else if (validator.getValidatorType().equals("required")) {
validateRequiredFieldValidator((RequiredFieldValidator) validator);
}
}
private void validateRequiredFieldValidator(RequiredFieldValidator validator) {
assertEquals("foo", validator.getFieldName());
assertEquals("Foo is required!", validator.getDefaultMessage());
assertEquals("required.key", validator.getMessageKey());
assertTrue(Arrays.equals(new String[]{"one", "two", "three"}, validator.getMessageParameters()));
assertEquals(true, validator.isShortCircuit());
}
private void validateIntRangeFieldValidator(IntRangeFieldValidator validator) {
assertEquals("foo", validator.getFieldName());
assertEquals("int.key", validator.getMessageKey());
xwork-core/src/test/java/com/opensymphony/xwork2/validator/AnnotationValidationExpAction.java
+3
View File
@@ -11,6 +11,7 @@ import com.opensymphony.xwork2.validator.annotations.ExpressionValidator;
import com.opensymphony.xwork2.validator.annotations.FieldExpressionValidator;
import com.opensymphony.xwork2.validator.annotations.IntRangeFieldValidator;
import com.opensymphony.xwork2.validator.annotations.RegexFieldValidator;
import com.opensymphony.xwork2.validator.annotations.RequiredFieldValidator;
import com.opensymphony.xwork2.validator.annotations.ValidationParameter;
import java.text.ParseException;
@@ -51,6 +52,8 @@ public class AnnotationValidationExpAction extends ActionSupport {
@IntRangeFieldValidator(fieldName = "foo", key = "int.key", message = "Foo is out of range!",
maxExpression = "${intMax}", minExpression = "${intMin}",
messageParams = {"one", "two", "three"}, shortCircuit = true)
@RequiredFieldValidator(fieldName = "foo", key = "required.key", message = "Foo is required!",
messageParams = {"one", "two", "three"}, shortCircuit = true)
public String execute() {
return SUCCESS;
}