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

WW-4010 Improves RequiredStringValidator annotation to match RequiredStringValidator class

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1457728 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Lukasz Lenart
2013-03-18 12:12:58 +00:00
parent a4eb0803dc
commit 9122aff601
5 changed files with 32 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
@@ -607,6 +607,7 @@ public class AnnotationValidationConfigurationBuilder {
.addParam("methodName", methodName)
.shortCircuit(v.shortCircuit())
.defaultMessage(v.message())
.messageParams(v.messageParams())
.messageKey(v.key())
.build();
}
xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/RequiredStringValidator.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>
@@ -113,6 +119,11 @@ public @interface RequiredStringValidator {
*/
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
@@ -12,6 +12,7 @@ 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.RequiredStringValidator;
import com.opensymphony.xwork2.validator.annotations.ValidationParameter;
/**
@@ -48,6 +49,8 @@ public class AnnotationValidationAction extends ActionSupport {
messageParams = {"one", "two", "three"}, shortCircuit = true)
@RequiredFieldValidator(fieldName = "foo", key = "required.key", message = "Foo is required!",
messageParams = {"one", "two", "three"}, shortCircuit = true)
@RequiredStringValidator(fieldName = "foo", key = "requiredstring.key", message = "Foo is required!",
messageParams = {"one", "two", "three"}, shortCircuit = true, trim = false)
public String execute() {
return SUCCESS;
}
xwork-core/src/test/java/com/opensymphony/xwork2/validator/AnnotationValidationConfigurationBuilderTest.java
+14 -2
View File
@@ -24,6 +24,7 @@ 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 com.opensymphony.xwork2.validator.validators.RequiredStringValidator;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@@ -45,7 +46,7 @@ public class AnnotationValidationConfigurationBuilderTest extends XWorkTestCase
List<Validator> validators = manager.getValidators(AnnotationValidationAction.class, null);
// then
assertEquals(validators.size(), 11);
assertEquals(validators.size(), 12);
for (Validator validator : validators) {
validate(validator);
}
@@ -62,7 +63,7 @@ public class AnnotationValidationConfigurationBuilderTest extends XWorkTestCase
ValueStack valueStack = container.getInstance(ValueStackFactory.class).createValueStack();
valueStack.push(new AnnotationValidationExpAction());
assertEquals(validators.size(), 11);
assertEquals(validators.size(), 12);
for (Validator validator : validators) {
validator.setValueStack(valueStack);
validate(validator);
@@ -92,9 +93,20 @@ public class AnnotationValidationConfigurationBuilderTest extends XWorkTestCase
validateIntRangeFieldValidator((IntRangeFieldValidator) validator);
} else if (validator.getValidatorType().equals("required")) {
validateRequiredFieldValidator((RequiredFieldValidator) validator);
} else if (validator.getValidatorType().equals("requiredstring")) {
validateRequiredStringValidator((RequiredStringValidator) validator);
}
}
private void validateRequiredStringValidator(RequiredStringValidator validator) {
assertEquals("foo", validator.getFieldName());
assertEquals("requiredstring.key", validator.getMessageKey());
assertEquals("Foo is required!", validator.getDefaultMessage());
assertTrue(Arrays.equals(new String[]{"one", "two", "three"}, validator.getMessageParameters()));
assertEquals(true, validator.isShortCircuit());
assertEquals(false, validator.isTrim());
}
private void validateRequiredFieldValidator(RequiredFieldValidator validator) {
assertEquals("foo", validator.getFieldName());
assertEquals("Foo is required!", validator.getDefaultMessage());
xwork-core/src/test/java/com/opensymphony/xwork2/validator/AnnotationValidationExpAction.java
+3
View File
@@ -12,6 +12,7 @@ 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.RequiredStringValidator;
import com.opensymphony.xwork2.validator.annotations.ValidationParameter;
import java.text.ParseException;
@@ -54,6 +55,8 @@ public class AnnotationValidationExpAction extends ActionSupport {
messageParams = {"one", "two", "three"}, shortCircuit = true)
@RequiredFieldValidator(fieldName = "foo", key = "required.key", message = "Foo is required!",
messageParams = {"one", "two", "three"}, shortCircuit = true)
@RequiredStringValidator(fieldName = "foo", key = "requiredstring.key", message = "Foo is required!",
messageParams = {"one", "two", "three"}, shortCircuit = true, trim = false)
public String execute() {
return SUCCESS;
}