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

WW-3904 removes parse param as is not needed anymore

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1432606 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Lukasz Lenart
2013-01-13 13:20:30 +00:00
parent a8966a383d
commit 2db92f7040
8 changed files with 6 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/ValidatorSupport.java
+5 -21
View File
@@ -44,7 +44,6 @@ public abstract class ValidatorSupport implements Validator, ShortCircuitableVal
protected String messageKey;
private ValidatorContext validatorContext;
private boolean shortCircuit;
protected boolean parse;
private String type;
private String[] messageParameters;
protected ValueStack stack;
@@ -64,14 +63,6 @@ public abstract class ValidatorSupport implements Validator, ShortCircuitableVal
return defaultMessage;
}
public void setParse(boolean parse) {
this.parse = parse;
}
public boolean getParse() {
return parse;
}
public String getMessage(Object object) {
String message;
boolean pop = false;
@@ -167,19 +158,12 @@ public abstract class ValidatorSupport implements Validator, ShortCircuitableVal
}
/**
* Parse <code>expression</code> passed in against value stack. Only parse
* when 'parse' param is set to true, else just returns the expression unparsed.
* Parse <code>expression</code> passed in against value stack.
*
* @param expression
* @param expression an OGNL expression
* @param type type to return
* @return Object
*/
protected Object conditionalParse(String expression) {
if (parse) {
return TextParseUtil.translateVariables('$', expression, stack);
}
return expression;
}
protected Object parse(String expression, Class type) {
if (expression == null) {
return null;
@@ -191,8 +175,8 @@ public abstract class ValidatorSupport implements Validator, ShortCircuitableVal
* Return the field value named <code>name</code> from <code>object</code>,
* <code>object</code> should have the appropriate getter/setter.
*
* @param name
* @param object
* @param name name of the field
* @param object to search field name on
* @return Object as field value
* @throws ValidationException
*/
xwork-core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java
-1
View File
@@ -226,7 +226,6 @@ public class DoubleRangeValidatorTest extends XWorkTestCase {
stack.push(action);
val.setParse(true);
val.setMinInclusiveExpression("${minInclusiveValue}");
val.setMaxInclusiveExpression("${maxInclusiveValue}");
val.setMinExclusiveExpression("${minExclusiveValue}");
xwork-core/src/test/java/com/opensymphony/xwork2/validator/EmailValidatorTest.java
-3
View File
@@ -94,7 +94,6 @@ public class EmailValidatorTest extends XWorkTestCase {
validator.setValidatorContext(new DelegatingValidatorContext(action));
validator.setFieldName("myEmail");
validator.setDefaultMessage("invalid email");
validator.setParse(true);
validator.setRegexExpression("${emailExpression}");
validator.validate(action);
@@ -123,7 +122,6 @@ public class EmailValidatorTest extends XWorkTestCase {
valueStack.push(action);
validator.setValueStack(valueStack);
validator.setParse(true);
validator.setCaseSensitiveExpression("${emailCaseSensitive}");
valueStack.pop();
@@ -151,7 +149,6 @@ public class EmailValidatorTest extends XWorkTestCase {
valueStack.push(action);
validator.setValueStack(valueStack);
validator.setParse(true);
validator.setTrimExpression("${trimEmail}");
valueStack.pop();
xwork-core/src/test/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidatorTest.java
-1
View File
@@ -75,7 +75,6 @@ public class DateRangeFieldValidatorTest extends XWorkTestCase {
DateRangeFieldValidator validator = new DateRangeFieldValidator();
validator.setValueStack(valueStack);
validator.setParse(true);
validator.setMaxExpression("${dateMaxValue}");
validator.setMinExpression("${dateMinValue}");
xwork-core/src/test/java/com/opensymphony/xwork2/validator/validators/IntRangeFieldValidatorTest.java
-1
View File
@@ -63,7 +63,6 @@ public class IntRangeFieldValidatorTest extends XWorkTestCase {
IntRangeFieldValidator validator = new IntRangeFieldValidator();
validator.setValueStack(valueStack);
validator.setParse(true);
validator.setMaxExpression("${intMaxValue}");
validator.setMinExpression("${intMinValue}");
xwork-core/src/test/java/com/opensymphony/xwork2/validator/validators/LongRangeFieldValidatorTest.java
-1
View File
@@ -63,7 +63,6 @@ public class LongRangeFieldValidatorTest extends XWorkTestCase {
LongRangeFieldValidator validator = new LongRangeFieldValidator();
validator.setValueStack(valueStack);
validator.setParse(true);
validator.setMaxExpression("${longMaxValue}");
validator.setMinExpression("${longMinValue}");
xwork-core/src/test/java/com/opensymphony/xwork2/validator/validators/ShortRangeFieldValidatorTest.java
-1
View File
@@ -63,7 +63,6 @@ public class ShortRangeFieldValidatorTest extends XWorkTestCase {
ShortRangeFieldValidator validator = new ShortRangeFieldValidator();
validator.setValueStack(valueStack);
validator.setParse(true);
validator.setMaxExpression("${shortMaxValue}");
validator.setMinExpression("${shortMinValue}");
xwork-core/src/test/java/com/opensymphony/xwork2/validator/validators/ValidatorSupportTest.java
+1 -6
View File
@@ -41,14 +41,9 @@ public class ValidatorSupportTest extends XWorkTestCase {
};
validator.setValueStack(ActionContext.getContext().getValueStack());
validator.setParse(true);
String result1 = validator.conditionalParse("${#something}").toString();
validator.setParse(false);
String result2 = validator.conditionalParse("${#something}").toString();
String result1 = validator.parse("${#something}", String.class).toString();
assertEquals(result1, "somevalue");
assertEquals(result2, "${#something}");
}
finally {
ActionContext.getContext().setValueStack(oldStack);