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-4013 Improves UrlValidator annotation to match UrlValidator class

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1457744 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Lukasz Lenart
2013-03-18 12:54:02 +00:00
parent cff4d773b4
commit 878d7e55cb
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
@@ -535,6 +535,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/UrlValidator.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>
@@ -101,6 +107,11 @@ public @interface UrlValidator {
*/
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
@@ -15,6 +15,7 @@ import com.opensymphony.xwork2.validator.annotations.RequiredFieldValidator;
import com.opensymphony.xwork2.validator.annotations.RequiredStringValidator;
import com.opensymphony.xwork2.validator.annotations.ShortRangeFieldValidator;
import com.opensymphony.xwork2.validator.annotations.StringLengthFieldValidator;
import com.opensymphony.xwork2.validator.annotations.UrlValidator;
import com.opensymphony.xwork2.validator.annotations.ValidationParameter;
/**
@@ -57,6 +58,8 @@ public class AnnotationValidationAction extends ActionSupport {
messageParams = {"one", "two", "three"}, shortCircuit = true)
@StringLengthFieldValidator(fieldName = "foo", key = "stringlength.key", message = "Foo is too long!",
maxLength = "10", minLength = "1", shortCircuit = true, trim = false, messageParams = {"one", "two", "three"})
@UrlValidator(fieldName = "foo", key = "url.key", message = "Foo isn't a valid URL!", shortCircuit = true,
messageParams = {"one", "two", "three"})
public String execute() {
return SUCCESS;
}
xwork-core/src/test/java/com/opensymphony/xwork2/validator/AnnotationValidationConfigurationBuilderTest.java
+13 -2
View File
@@ -27,6 +27,7 @@ import com.opensymphony.xwork2.validator.validators.RequiredFieldValidator;
import com.opensymphony.xwork2.validator.validators.RequiredStringValidator;
import com.opensymphony.xwork2.validator.validators.ShortRangeFieldValidator;
import com.opensymphony.xwork2.validator.validators.StringLengthFieldValidator;
import com.opensymphony.xwork2.validator.validators.URLValidator;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@@ -48,7 +49,7 @@ public class AnnotationValidationConfigurationBuilderTest extends XWorkTestCase
List<Validator> validators = manager.getValidators(AnnotationValidationAction.class, null);
// then
assertEquals(validators.size(), 14);
assertEquals(validators.size(), 15);
for (Validator validator : validators) {
validate(validator);
}
@@ -65,7 +66,7 @@ public class AnnotationValidationConfigurationBuilderTest extends XWorkTestCase
ValueStack valueStack = container.getInstance(ValueStackFactory.class).createValueStack();
valueStack.push(new AnnotationValidationExpAction());
assertEquals(validators.size(), 14);
assertEquals(validators.size(), 15);
for (Validator validator : validators) {
validator.setValueStack(valueStack);
validate(validator);
@@ -101,9 +102,19 @@ public class AnnotationValidationConfigurationBuilderTest extends XWorkTestCase
validateShortRangeFieldValidator((ShortRangeFieldValidator) validator);
} else if (validator.getValidatorType().equals("stringlength")) {
validateStringLengthFieldValidator((StringLengthFieldValidator) validator);
} else if (validator.getValidatorType().equals("url")) {
validateUrlValidator((URLValidator) validator);
}
}
private void validateUrlValidator(URLValidator validator) {
assertEquals("foo", validator.getFieldName());
assertEquals("Foo isn't a valid URL!", validator.getDefaultMessage());
assertEquals("url.key", validator.getMessageKey());
assertTrue(Arrays.equals(new String[]{"one", "two", "three"}, validator.getMessageParameters()));
assertEquals(true, validator.isShortCircuit());
}
private void validateStringLengthFieldValidator(StringLengthFieldValidator validator) {
assertEquals("foo", validator.getFieldName());
assertEquals("stringlength.key", validator.getMessageKey());
xwork-core/src/test/java/com/opensymphony/xwork2/validator/AnnotationValidationExpAction.java
+3
View File
@@ -15,6 +15,7 @@ import com.opensymphony.xwork2.validator.annotations.RequiredFieldValidator;
import com.opensymphony.xwork2.validator.annotations.RequiredStringValidator;
import com.opensymphony.xwork2.validator.annotations.ShortRangeFieldValidator;
import com.opensymphony.xwork2.validator.annotations.StringLengthFieldValidator;
import com.opensymphony.xwork2.validator.annotations.UrlValidator;
import com.opensymphony.xwork2.validator.annotations.ValidationParameter;
import java.text.ParseException;
@@ -65,6 +66,8 @@ public class AnnotationValidationExpAction extends ActionSupport {
@StringLengthFieldValidator(fieldName = "foo", key = "stringlength.key", message = "Foo is too long!",
maxLengthExpression = "${maxLength}", minLengthExpression = "${minLength}", shortCircuit = true, trimExpression = "${false}",
messageParams = {"one", "two", "three"})
@UrlValidator(fieldName = "foo", key = "url.key", message = "Foo isn't a valid URL!", shortCircuit = true,
messageParams = {"one", "two", "three"})
public String execute() {
return SUCCESS;
}