You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by hu...@apache.org on 2006/01/21 01:21:00 UTC
svn commit: r370938 [18/50] - in /struts: action/trunk/
action/trunk/conf/java/ action/trunk/src/java/org/apache/struts/
action/trunk/src/java/org/apache/struts/action/
action/trunk/src/java/org/apache/struts/chain/
action/trunk/src/java/org/apache/str...
Modified: struts/action/trunk/src/java/org/apache/struts/validator/FieldChecks.java
URL: http://svn.apache.org/viewcvs/struts/action/trunk/src/java/org/apache/struts/validator/FieldChecks.java?rev=370938&r1=370937&r2=370938&view=diff
==============================================================================
--- struts/action/trunk/src/java/org/apache/struts/validator/FieldChecks.java (original)
+++ struts/action/trunk/src/java/org/apache/struts/validator/FieldChecks.java Fri Jan 20 16:19:02 2006
@@ -15,16 +15,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.struts.validator;
-import java.io.Serializable;
-import java.util.Locale;
-import java.util.StringTokenizer;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.validator.Field;
@@ -36,96 +28,96 @@
import org.apache.commons.validator.util.ValidatorUtils;
import org.apache.struts.action.ActionMessage;
import org.apache.struts.action.ActionMessages;
-import org.apache.struts.util.RequestUtils;
import org.apache.struts.util.MessageResources;
+import org.apache.struts.util.RequestUtils;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.Serializable;
+import java.util.Locale;
+import java.util.StringTokenizer;
/**
- * <p>
- * This class contains the default validations that are used in the
- * validator-rules.xml file.
- * </p>
- * <p>
- * In general passing in a null or blank will return a null Object or a false
- * boolean. However, nulls and blanks do not result in an error being added to the
- * errors.
- * </p>
+ * <p> This class contains the default validations that are used in the
+ * validator-rules.xml file. </p> <p> In general passing in a null or blank
+ * will return a null Object or a false boolean. However, nulls and blanks do
+ * not result in an error being added to the errors. </p>
*
* @since Struts 1.1
*/
public class FieldChecks implements Serializable {
-
/**
- * Commons Logging instance.
+ * Commons Logging instance.
*/
private static final Log log = LogFactory.getLog(FieldChecks.class);
/**
* The message resources for this package.
*/
- private static MessageResources sysmsgs =
- MessageResources.getMessageResources(
- "org.apache.struts.validator.LocalStrings");
-
-
+ private static MessageResources sysmsgs = MessageResources
+ .getMessageResources("org.apache.struts.validator.LocalStrings");
public static final String FIELD_TEST_NULL = "NULL";
public static final String FIELD_TEST_NOTNULL = "NOTNULL";
public static final String FIELD_TEST_EQUAL = "EQUAL";
/**
- * Checks if the field isn't null and length of the field is greater than zero not
- * including whitespace.
+ * Checks if the field isn't null and length of the field is greater than
+ * zero not including whitespace.
*
- * @param bean The bean validation is being performed on.
- * @param va The <code>ValidatorAction</code> that is currently being performed.
- * @param field The <code>Field</code> object associated with the current
- * field being validated.
- * @param errors The <code>ActionMessages</code> object to add errors to if
- * any validation errors occur.
+ * @param bean The bean validation is being performed on.
+ * @param va The <code>ValidatorAction</code> that is currently
+ * being performed.
+ * @param field The <code>Field</code> object associated with the
+ * current field being validated.
+ * @param errors The <code>ActionMessages</code> object to add errors
+ * to if any validation errors occur.
* @param validator The <code>Validator</code> instance, used to access
* other field values.
- * @param request Current request object.
+ * @param request Current request object.
* @return true if meets stated requirements, false otherwise.
*/
- public static boolean validateRequired(Object bean,
- ValidatorAction va, Field field,
- ActionMessages errors,
+ public static boolean validateRequired(Object bean, ValidatorAction va,
+ Field field, ActionMessages errors,
Validator validator,
HttpServletRequest request) {
-
String value = null;
+
value = evaluateBean(bean, field);
if (GenericValidator.isBlankOrNull(value)) {
- errors.add(field.getKey(), Resources.getActionMessage(validator, request, va, field));
+ errors.add(field.getKey(),
+ Resources.getActionMessage(validator,
+ request,
+ va,
+ field));
+
return false;
} else {
return true;
}
-
}
/**
* Checks if the field isn't null based on the values of other fields.
*
- * @param bean The bean validation is being performed on.
- * @param va The <code>ValidatorAction</code> that is currently being
- * performed.
- * @param field The <code>Field</code> object associated with the current
- * field being validated.
- * @param errors The <code>ActionMessages</code> object to add errors to if
- * any validation errors occur.
+ * @param bean The bean validation is being performed on.
+ * @param va The <code>ValidatorAction</code> that is currently
+ * being performed.
+ * @param field The <code>Field</code> object associated with the
+ * current field being validated.
+ * @param errors The <code>ActionMessages</code> object to add errors
+ * to if any validation errors occur.
* @param validator The <code>Validator</code> instance, used to access
- * other field values.
- * @param request Current request object.
+ * other field values.
+ * @param request Current request object.
* @return true if meets stated requirements, false otherwise.
*/
- public static boolean validateRequiredIf(Object bean,
- ValidatorAction va, Field field,
+ public static boolean validateRequiredIf(Object bean, ValidatorAction va,
+ Field field,
ActionMessages errors,
Validator validator,
HttpServletRequest request) {
-
- Object form = validator.getParameterValue(org.apache.commons.validator.Validator.BEAN_PARAM);
+ Object form = validator
+ .getParameterValue(org.apache.commons.validator.Validator.BEAN_PARAM);
String value = null;
boolean required = false;
@@ -133,6 +125,7 @@
int i = 0;
String fieldJoin = "AND";
+
if (!GenericValidator.isBlankOrNull(field.getVarValue("fieldJoin"))) {
fieldJoin = field.getVarValue("fieldJoin");
}
@@ -141,11 +134,14 @@
required = true;
}
- while (!GenericValidator.isBlankOrNull(field.getVarValue("field[" + i + "]"))) {
+ while (!GenericValidator.isBlankOrNull(field.getVarValue("field[" + i
+ + "]"))) {
String dependProp = field.getVarValue("field[" + i + "]");
String dependTest = field.getVarValue("fieldTest[" + i + "]");
- String dependTestValue = field.getVarValue("fieldValue[" + i + "]");
- String dependIndexed = field.getVarValue("fieldIndexed[" + i + "]");
+ String dependTestValue =
+ field.getVarValue("fieldValue[" + i + "]");
+ String dependIndexed =
+ field.getVarValue("fieldIndexed[" + i + "]");
if (dependIndexed == null) {
dependIndexed = "false";
@@ -153,15 +149,19 @@
String dependVal = null;
boolean thisRequired = false;
+
if (field.isIndexed() && dependIndexed.equalsIgnoreCase("true")) {
String key = field.getKey();
+
if ((key.indexOf("[") > -1) && (key.indexOf("]") > -1)) {
String ind = key.substring(0, key.indexOf(".") + 1);
+
dependProp = ind + dependProp;
}
}
dependVal = ValidatorUtils.getValueAsString(form, dependProp);
+
if (dependTest.equals(FIELD_TEST_NULL)) {
if ((dependVal != null) && (dependVal.length() > 0)) {
thisRequired = false;
@@ -193,88 +193,91 @@
if (required) {
if (GenericValidator.isBlankOrNull(value)) {
- errors.add(
- field.getKey(),
- Resources.getActionMessage(validator, request, va, field));
+ errors.add(field.getKey(),
+ Resources.getActionMessage(validator,
+ request,
+ va,
+ field));
return false;
-
} else {
return true;
}
}
+
return true;
}
/**
- * Checks if the field matches the regular expression in the field's mask attribute.
+ * Checks if the field matches the regular expression in the field's mask
+ * attribute.
*
- * @param bean The bean validation is being performed on.
- * @param va The <code>ValidatorAction</code> that is currently being
- * performed.
- * @param field The <code>Field</code> object associated with the current
- * field being validated.
- * @param errors The <code>ActionMessages</code> object to add errors to if
- * any validation errors occur.
+ * @param bean The bean validation is being performed on.
+ * @param va The <code>ValidatorAction</code> that is currently
+ * being performed.
+ * @param field The <code>Field</code> object associated with the
+ * current field being validated.
+ * @param errors The <code>ActionMessages</code> object to add errors
+ * to if any validation errors occur.
* @param validator The <code>Validator</code> instance, used to access
- * other field values.
- * @param request Current request object.
+ * other field values.
+ * @param request Current request object.
* @return true if field matches mask, false otherwise.
*/
- public static boolean validateMask(Object bean,
- ValidatorAction va, Field field,
- ActionMessages errors,
+ public static boolean validateMask(Object bean, ValidatorAction va,
+ Field field, ActionMessages errors,
Validator validator,
HttpServletRequest request) {
-
String value = null;
+
value = evaluateBean(bean, field);
try {
-
- String mask = Resources.getVarValue("mask", field, validator, request, true);
+ String mask = Resources.getVarValue("mask", field, validator,
+ request, true);
if (!GenericValidator.isBlankOrNull(value)
- && !GenericValidator.matchRegexp(value, mask)) {
-
- errors.add(
- field.getKey(),
- Resources.getActionMessage(validator, request, va, field));
+ && !GenericValidator.matchRegexp(value, mask)) {
+ errors.add(field.getKey(),
+ Resources.getActionMessage(validator,
+ request,
+ va,
+ field));
return false;
} else {
return true;
}
- } catch (Exception e) {
+ }
+ catch (Exception e) {
processFailure(errors, field, "mask", e);
+
return false;
}
-
}
-
/**
* Checks if the field can safely be converted to a byte primitive.
*
- *@param bean The bean validation is being performed on.
- *@param va The <code>ValidatorAction</code> that is currently being performed.
- *@param field The <code>Field</code> object associated with the current
- *field being validated.
- *@param errors The <code>ActionMessages</code> object to add errors to if
- *any validation errors occur.
- * @param validator The <code>Validator</code> instance, used to access
- * other field values.
- *@param request Current request object.
- *@return true if valid, false otherwise.
- */
- public static Object validateByte(Object bean,
- ValidatorAction va, Field field,
- ActionMessages errors,
- Validator validator,
- HttpServletRequest request) {
-
+ * @param bean The bean validation is being performed on.
+ * @param va The <code>ValidatorAction</code> that is currently
+ * being performed.
+ * @param field The <code>Field</code> object associated with the
+ * current field being validated.
+ * @param errors The <code>ActionMessages</code> object to add errors
+ * to if any validation errors occur.
+ * @param validator The <code>Validator</code> instance, used to access
+ * other field values.
+ * @param request Current request object.
+ * @return true if valid, false otherwise.
+ */
+ public static Object validateByte(Object bean, ValidatorAction va,
+ Field field, ActionMessages errors,
+ Validator validator,
+ HttpServletRequest request) {
Object result = null;
String value = null;
+
value = evaluateBean(bean, field);
if (GenericValidator.isBlankOrNull(value)) {
@@ -284,35 +287,39 @@
result = GenericTypeValidator.formatByte(value);
if (result == null) {
- errors.add(field.getKey(), Resources.getActionMessage(validator, request, va, field));
+ errors.add(field.getKey(),
+ Resources.getActionMessage(validator,
+ request,
+ va,
+ field));
}
- return result == null ? Boolean.FALSE : result;
+ return (result == null) ? Boolean.FALSE : result;
}
-
-
+
/**
* Checks if the field can safely be converted to a byte primitive.
*
- *@param bean The bean validation is being performed on.
- *@param va The <code>ValidatorAction</code> that is currently being performed.
- *@param field The <code>Field</code> object associated with the current
- *field being validated.
- *@param errors The <code>ActionMessages</code> object to add errors to if
- *any validation errors occur.
- * @param validator The <code>Validator</code> instance, used to access
- * other field values.
- *@param request Current request object.
- *@return true if valid, false otherwise.
- */
- public static Object validateByteLocale(Object bean,
- ValidatorAction va, Field field,
- ActionMessages errors,
- Validator validator,
- HttpServletRequest request) {
-
+ * @param bean The bean validation is being performed on.
+ * @param va The <code>ValidatorAction</code> that is currently
+ * being performed.
+ * @param field The <code>Field</code> object associated with the
+ * current field being validated.
+ * @param errors The <code>ActionMessages</code> object to add errors
+ * to if any validation errors occur.
+ * @param validator The <code>Validator</code> instance, used to access
+ * other field values.
+ * @param request Current request object.
+ * @return true if valid, false otherwise.
+ */
+ public static Object validateByteLocale(Object bean, ValidatorAction va,
+ Field field,
+ ActionMessages errors,
+ Validator validator,
+ HttpServletRequest request) {
Object result = null;
String value = null;
+
value = evaluateBean(bean, field);
if (GenericValidator.isBlankOrNull(value)) {
@@ -320,13 +327,18 @@
}
Locale locale = RequestUtils.getUserLocale(request, null);
+
result = GenericTypeValidator.formatByte(value, locale);
if (result == null) {
- errors.add(field.getKey(), Resources.getActionMessage(validator, request, va, field));
+ errors.add(field.getKey(),
+ Resources.getActionMessage(validator,
+ request,
+ va,
+ field));
}
- return result == null ? Boolean.FALSE : result;
+ return (result == null) ? Boolean.FALSE : result;
}
/**
@@ -336,36 +348,39 @@
*/
private static String evaluateBean(Object bean, Field field) {
String value;
+
if (isString(bean)) {
value = (String) bean;
} else {
- value = ValidatorUtils.getValueAsString(bean, field.getProperty());
+ value = ValidatorUtils
+ .getValueAsString(bean, field.getProperty());
}
+
return value;
}
-
/**
* Checks if the field can safely be converted to a short primitive.
*
- * @param bean The bean validation is being performed on.
- * @param va The <code>ValidatorAction</code> that is currently being performed.
- * @param field The <code>Field</code> object associated with the current
- * field being validated.
- * @param errors The <code>ActionMessages</code> object to add errors to if
- * any validation errors occur.
+ * @param bean The bean validation is being performed on.
+ * @param va The <code>ValidatorAction</code> that is currently
+ * being performed.
+ * @param field The <code>Field</code> object associated with the
+ * current field being validated.
+ * @param errors The <code>ActionMessages</code> object to add errors
+ * to if any validation errors occur.
* @param validator The <code>Validator</code> instance, used to access
- * other field values.
- * @param request Current request object.
+ * other field values.
+ * @param request Current request object.
* @return true if valid, false otherwise.
*/
- public static Object validateShort(Object bean,
- ValidatorAction va, Field field,
- ActionMessages errors,
- Validator validator,
- HttpServletRequest request) {
+ public static Object validateShort(Object bean, ValidatorAction va,
+ Field field, ActionMessages errors,
+ Validator validator,
+ HttpServletRequest request) {
Object result = null;
String value = null;
+
value = evaluateBean(bean, field);
if (GenericValidator.isBlankOrNull(value)) {
@@ -375,34 +390,39 @@
result = GenericTypeValidator.formatShort(value);
if (result == null) {
- errors.add(field.getKey(), Resources.getActionMessage(validator, request, va, field));
+ errors.add(field.getKey(),
+ Resources.getActionMessage(validator,
+ request,
+ va,
+ field));
}
- return result == null ? Boolean.FALSE : result;
+ return (result == null) ? Boolean.FALSE : result;
}
-
-
+
/**
* Checks if the field can safely be converted to a short primitive.
*
- * @param bean The bean validation is being performed on.
- * @param va The <code>ValidatorAction</code> that is currently being performed.
- * @param field The <code>Field</code> object associated with the current
- * field being validated.
- * @param errors The <code>ActionMessages</code> object to add errors to if
- * any validation errors occur.
+ * @param bean The bean validation is being performed on.
+ * @param va The <code>ValidatorAction</code> that is currently
+ * being performed.
+ * @param field The <code>Field</code> object associated with the
+ * current field being validated.
+ * @param errors The <code>ActionMessages</code> object to add errors
+ * to if any validation errors occur.
* @param validator The <code>Validator</code> instance, used to access
- * other field values.
- * @param request Current request object.
+ * other field values.
+ * @param request Current request object.
* @return true if valid, false otherwise.
*/
- public static Object validateShortLocale(Object bean,
- ValidatorAction va, Field field,
- ActionMessages errors,
- Validator validator,
- HttpServletRequest request) {
+ public static Object validateShortLocale(Object bean, ValidatorAction va,
+ Field field,
+ ActionMessages errors,
+ Validator validator,
+ HttpServletRequest request) {
Object result = null;
String value = null;
+
value = evaluateBean(bean, field);
if (GenericValidator.isBlankOrNull(value)) {
@@ -410,37 +430,42 @@
}
Locale locale = RequestUtils.getUserLocale(request, null);
+
result = GenericTypeValidator.formatShort(value, locale);
if (result == null) {
- errors.add(field.getKey(), Resources.getActionMessage(validator, request, va, field));
+ errors.add(field.getKey(),
+ Resources.getActionMessage(validator,
+ request,
+ va,
+ field));
}
- return result == null ? Boolean.FALSE : result;
+ return (result == null) ? Boolean.FALSE : result;
}
-
/**
* Checks if the field can safely be converted to an int primitive.
*
- * @param bean The bean validation is being performed on.
- * @param va The <code>ValidatorAction</code> that is currently being performed.
- * @param field The <code>Field</code> object associated with the current
- * field being validated.
- * @param errors The <code>ActionMessages</code> object to add errors to if any
- * validation errors occur.
+ * @param bean The bean validation is being performed on.
+ * @param va The <code>ValidatorAction</code> that is currently
+ * being performed.
+ * @param field The <code>Field</code> object associated with the
+ * current field being validated.
+ * @param errors The <code>ActionMessages</code> object to add errors
+ * to if any validation errors occur.
* @param validator The <code>Validator</code> instance, used to access
- * other field values.
- * @param request Current request object.
+ * other field values.
+ * @param request Current request object.
* @return true if valid, false otherwise.
*/
- public static Object validateInteger(Object bean,
- ValidatorAction va, Field field,
- ActionMessages errors,
- Validator validator,
- HttpServletRequest request) {
+ public static Object validateInteger(Object bean, ValidatorAction va,
+ Field field, ActionMessages errors,
+ Validator validator,
+ HttpServletRequest request) {
Object result = null;
String value = null;
+
value = evaluateBean(bean, field);
if (GenericValidator.isBlankOrNull(value)) {
@@ -450,34 +475,40 @@
result = GenericTypeValidator.formatInt(value);
if (result == null) {
- errors.add(field.getKey(), Resources.getActionMessage(validator, request, va, field));
+ errors.add(field.getKey(),
+ Resources.getActionMessage(validator,
+ request,
+ va,
+ field));
}
- return result == null ? Boolean.FALSE : result;
+ return (result == null) ? Boolean.FALSE : result;
}
-
/**
* Checks if the field can safely be converted to an int primitive.
*
- * @param bean The bean validation is being performed on.
- * @param va The <code>ValidatorAction</code> that is currently being performed.
- * @param field The <code>Field</code> object associated with the current
- * field being validated.
- * @param errors The <code>ActionMessages</code> object to add errors to if any
- * validation errors occur.
+ * @param bean The bean validation is being performed on.
+ * @param va The <code>ValidatorAction</code> that is currently
+ * being performed.
+ * @param field The <code>Field</code> object associated with the
+ * current field being validated.
+ * @param errors The <code>ActionMessages</code> object to add errors
+ * to if any validation errors occur.
* @param validator The <code>Validator</code> instance, used to access
- * other field values.
- * @param request Current request object.
+ * other field values.
+ * @param request Current request object.
* @return true if valid, false otherwise.
*/
public static Object validateIntegerLocale(Object bean,
- ValidatorAction va, Field field,
- ActionMessages errors,
- Validator validator,
- HttpServletRequest request) {
+ ValidatorAction va,
+ Field field,
+ ActionMessages errors,
+ Validator validator,
+ HttpServletRequest request) {
Object result = null;
String value = null;
+
value = evaluateBean(bean, field);
if (GenericValidator.isBlankOrNull(value)) {
@@ -485,37 +516,42 @@
}
Locale locale = RequestUtils.getUserLocale(request, null);
+
result = GenericTypeValidator.formatInt(value, locale);
if (result == null) {
- errors.add(field.getKey(), Resources.getActionMessage(validator, request, va, field));
+ errors.add(field.getKey(),
+ Resources.getActionMessage(validator,
+ request,
+ va,
+ field));
}
- return result == null ? Boolean.FALSE : result;
+ return (result == null) ? Boolean.FALSE : result;
}
-
/**
* Checks if the field can safely be converted to a long primitive.
*
- * @param bean The bean validation is being performed on.
- * @param va The <code>ValidatorAction</code> that is currently being performed.
- * @param field The <code>Field</code> object associated with the current
- * field being validated.
- * @param errors The <code>ActionMessages</code> object to add errors to if any
- * validation errors occur.
+ * @param bean The bean validation is being performed on.
+ * @param va The <code>ValidatorAction</code> that is currently
+ * being performed.
+ * @param field The <code>Field</code> object associated with the
+ * current field being validated.
+ * @param errors The <code>ActionMessages</code> object to add errors
+ * to if any validation errors occur.
* @param validator The <code>Validator</code> instance, used to access
- * other field values.
- * @param request Current request object.
+ * other field values.
+ * @param request Current request object.
* @return true if valid, false otherwise.
*/
- public static Object validateLong(Object bean,
- ValidatorAction va, Field field,
- ActionMessages errors,
- Validator validator,
- HttpServletRequest request) {
+ public static Object validateLong(Object bean, ValidatorAction va,
+ Field field, ActionMessages errors,
+ Validator validator,
+ HttpServletRequest request) {
Object result = null;
String value = null;
+
value = evaluateBean(bean, field);
if (GenericValidator.isBlankOrNull(value)) {
@@ -525,34 +561,39 @@
result = GenericTypeValidator.formatLong(value);
if (result == null) {
- errors.add(field.getKey(), Resources.getActionMessage(validator, request, va, field));
+ errors.add(field.getKey(),
+ Resources.getActionMessage(validator,
+ request,
+ va,
+ field));
}
- return result == null ? Boolean.FALSE : result;
+ return (result == null) ? Boolean.FALSE : result;
}
-
-
+
/**
* Checks if the field can safely be converted to a long primitive.
*
- * @param bean The bean validation is being performed on.
- * @param va The <code>ValidatorAction</code> that is currently being performed.
- * @param field The <code>Field</code> object associated with the current
- * field being validated.
- * @param errors The <code>ActionMessages</code> object to add errors to if any
- * validation errors occur.
+ * @param bean The bean validation is being performed on.
+ * @param va The <code>ValidatorAction</code> that is currently
+ * being performed.
+ * @param field The <code>Field</code> object associated with the
+ * current field being validated.
+ * @param errors The <code>ActionMessages</code> object to add errors
+ * to if any validation errors occur.
* @param validator The <code>Validator</code> instance, used to access
- * other field values.
- * @param request Current request object.
+ * other field values.
+ * @param request Current request object.
* @return true if valid, false otherwise.
*/
- public static Object validateLongLocale(Object bean,
- ValidatorAction va, Field field,
- ActionMessages errors,
- Validator validator,
- HttpServletRequest request) {
+ public static Object validateLongLocale(Object bean, ValidatorAction va,
+ Field field,
+ ActionMessages errors,
+ Validator validator,
+ HttpServletRequest request) {
Object result = null;
String value = null;
+
value = evaluateBean(bean, field);
if (GenericValidator.isBlankOrNull(value)) {
@@ -560,37 +601,42 @@
}
Locale locale = RequestUtils.getUserLocale(request, null);
+
result = GenericTypeValidator.formatLong(value, locale);
if (result == null) {
- errors.add(field.getKey(), Resources.getActionMessage(validator, request, va, field));
+ errors.add(field.getKey(),
+ Resources.getActionMessage(validator,
+ request,
+ va,
+ field));
}
- return result == null ? Boolean.FALSE : result;
+ return (result == null) ? Boolean.FALSE : result;
}
-
/**
* Checks if the field can safely be converted to a float primitive.
*
- * @param bean The bean validation is being performed on.
- * @param va The <code>ValidatorAction</code> that is currently being performed.
- * @param field The <code>Field</code> object associated with the current
- * field being validated.
- * @param errors The <code>ActionMessages</code> object to add errors to if any
- * validation errors occur.
+ * @param bean The bean validation is being performed on.
+ * @param va The <code>ValidatorAction</code> that is currently
+ * being performed.
+ * @param field The <code>Field</code> object associated with the
+ * current field being validated.
+ * @param errors The <code>ActionMessages</code> object to add errors
+ * to if any validation errors occur.
* @param validator The <code>Validator</code> instance, used to access
- * other field values.
- * @param request Current request object.
+ * other field values.
+ * @param request Current request object.
* @return true if valid, false otherwise.
*/
- public static Object validateFloat(Object bean,
- ValidatorAction va, Field field,
- ActionMessages errors,
- Validator validator,
- HttpServletRequest request) {
+ public static Object validateFloat(Object bean, ValidatorAction va,
+ Field field, ActionMessages errors,
+ Validator validator,
+ HttpServletRequest request) {
Object result = null;
String value = null;
+
value = evaluateBean(bean, field);
if (GenericValidator.isBlankOrNull(value)) {
@@ -600,34 +646,39 @@
result = GenericTypeValidator.formatFloat(value);
if (result == null) {
- errors.add(field.getKey(), Resources.getActionMessage(validator, request, va, field));
+ errors.add(field.getKey(),
+ Resources.getActionMessage(validator,
+ request,
+ va,
+ field));
}
- return result == null ? Boolean.FALSE : result;
+ return (result == null) ? Boolean.FALSE : result;
}
-
/**
* Checks if the field can safely be converted to a float primitive.
*
- * @param bean The bean validation is being performed on.
- * @param va The <code>ValidatorAction</code> that is currently being performed.
- * @param field The <code>Field</code> object associated with the current
- * field being validated.
- * @param errors The <code>ActionMessages</code> object to add errors to if any
- * validation errors occur.
+ * @param bean The bean validation is being performed on.
+ * @param va The <code>ValidatorAction</code> that is currently
+ * being performed.
+ * @param field The <code>Field</code> object associated with the
+ * current field being validated.
+ * @param errors The <code>ActionMessages</code> object to add errors
+ * to if any validation errors occur.
* @param validator The <code>Validator</code> instance, used to access
- * other field values.
- * @param request Current request object.
+ * other field values.
+ * @param request Current request object.
* @return true if valid, false otherwise.
*/
- public static Object validateFloatLocale(Object bean,
- ValidatorAction va, Field field,
- ActionMessages errors,
- Validator validator,
- HttpServletRequest request) {
+ public static Object validateFloatLocale(Object bean, ValidatorAction va,
+ Field field,
+ ActionMessages errors,
+ Validator validator,
+ HttpServletRequest request) {
Object result = null;
String value = null;
+
value = evaluateBean(bean, field);
if (GenericValidator.isBlankOrNull(value)) {
@@ -635,37 +686,42 @@
}
Locale locale = RequestUtils.getUserLocale(request, null);
+
result = GenericTypeValidator.formatFloat(value, locale);
if (result == null) {
- errors.add(field.getKey(), Resources.getActionMessage(validator, request, va, field));
+ errors.add(field.getKey(),
+ Resources.getActionMessage(validator,
+ request,
+ va,
+ field));
}
- return result == null ? Boolean.FALSE : result;
+ return (result == null) ? Boolean.FALSE : result;
}
-
/**
- * Checks if the field can safely be converted to a double primitive.
+ * Checks if the field can safely be converted to a double primitive.
*
- * @param bean The bean validation is being performed on.
- * @param va The <code>ValidatorAction</code> that is currently being performed.
- * @param field The <code>Field</code> object associated with the current
- * field being validated.
- * @param errors The <code>ActionMessages</code> object to add errors to if any
- * validation errors occur.
+ * @param bean The bean validation is being performed on.
+ * @param va The <code>ValidatorAction</code> that is currently
+ * being performed.
+ * @param field The <code>Field</code> object associated with the
+ * current field being validated.
+ * @param errors The <code>ActionMessages</code> object to add errors
+ * to if any validation errors occur.
* @param validator The <code>Validator</code> instance, used to access
- * other field values.
- * @param request Current request object.
+ * other field values.
+ * @param request Current request object.
* @return true if valid, false otherwise.
*/
- public static Object validateDouble(Object bean,
- ValidatorAction va, Field field,
- ActionMessages errors,
+ public static Object validateDouble(Object bean, ValidatorAction va,
+ Field field, ActionMessages errors,
Validator validator,
HttpServletRequest request) {
Object result = null;
String value = null;
+
value = evaluateBean(bean, field);
if (GenericValidator.isBlankOrNull(value)) {
@@ -675,34 +731,39 @@
result = GenericTypeValidator.formatDouble(value);
if (result == null) {
- errors.add(field.getKey(), Resources.getActionMessage(validator, request, va, field));
+ errors.add(field.getKey(),
+ Resources.getActionMessage(validator,
+ request,
+ va,
+ field));
}
- return result == null ? Boolean.FALSE : result;
+ return (result == null) ? Boolean.FALSE : result;
}
-
-
+
/**
- * Checks if the field can safely be converted to a double primitive.
+ * Checks if the field can safely be converted to a double primitive.
*
- * @param bean The bean validation is being performed on.
- * @param va The <code>ValidatorAction</code> that is currently being performed.
- * @param field The <code>Field</code> object associated with the current
- * field being validated.
- * @param errors The <code>ActionMessages</code> object to add errors to if any
- * validation errors occur.
+ * @param bean The bean validation is being performed on.
+ * @param va The <code>ValidatorAction</code> that is currently
+ * being performed.
+ * @param field The <code>Field</code> object associated with the
+ * current field being validated.
+ * @param errors The <code>ActionMessages</code> object to add errors
+ * to if any validation errors occur.
* @param validator The <code>Validator</code> instance, used to access
- * other field values.
- * @param request Current request object.
+ * other field values.
+ * @param request Current request object.
* @return true if valid, false otherwise.
*/
- public static Object validateDoubleLocale(Object bean,
- ValidatorAction va, Field field,
- ActionMessages errors,
- Validator validator,
- HttpServletRequest request) {
+ public static Object validateDoubleLocale(Object bean, ValidatorAction va,
+ Field field,
+ ActionMessages errors,
+ Validator validator,
+ HttpServletRequest request) {
Object result = null;
String value = null;
+
value = evaluateBean(bean, field);
if (GenericValidator.isBlankOrNull(value)) {
@@ -710,49 +771,60 @@
}
Locale locale = RequestUtils.getUserLocale(request, null);
+
result = GenericTypeValidator.formatDouble(value, locale);
if (result == null) {
- errors.add(field.getKey(), Resources.getActionMessage(validator, request, va, field));
- }
-
- return result == null ? Boolean.FALSE : result;
+ errors.add(field.getKey(),
+ Resources.getActionMessage(validator,
+ request,
+ va,
+ field));
+ }
+
+ return (result == null) ? Boolean.FALSE : result;
}
-
/**
- * Checks if the field is a valid date. If the field has a datePattern variable,
- * that will be used to format <code>java.text.SimpleDateFormat</code>. If the
- * field has a datePatternStrict variable, that will be used to format <code>java.text.SimpleDateFormat</code>
- * and the length will be checked so '2/12/1999' will not pass validation with
- * the format 'MM/dd/yyyy' because the month isn't two digits. If no datePattern
- * variable is specified, then the field gets the DateFormat.SHORT format for
- * the locale. The setLenient method is set to <code>false</code> for all variations.
- *
- * @param bean The bean validation is being performed on.
- * @param va The <code>ValidatorAction</code> that is currently being performed.
- * @param field The <code>Field</code> object associated with the current
- * field being validated.
- * @param errors The <code>ActionMessages</code> object to add errors to if any
- * validation errors occur.
+ * Checks if the field is a valid date. If the field has a datePattern
+ * variable, that will be used to format <code>java.text.SimpleDateFormat</code>.
+ * If the field has a datePatternStrict variable, that will be used to
+ * format <code>java.text.SimpleDateFormat</code> and the length will be
+ * checked so '2/12/1999' will not pass validation with the format
+ * 'MM/dd/yyyy' because the month isn't two digits. If no datePattern
+ * variable is specified, then the field gets the DateFormat.SHORT format
+ * for the locale. The setLenient method is set to <code>false</code> for
+ * all variations.
+ *
+ * @param bean The bean validation is being performed on.
+ * @param va The <code>ValidatorAction</code> that is currently
+ * being performed.
+ * @param field The <code>Field</code> object associated with the
+ * current field being validated.
+ * @param errors The <code>ActionMessages</code> object to add errors
+ * to if any validation errors occur.
* @param validator The <code>Validator</code> instance, used to access
- * other field values.
- * @param request Current request object.
+ * other field values.
+ * @param request Current request object.
* @return true if valid, false otherwise.
*/
- public static Object validateDate(Object bean,
- ValidatorAction va, Field field,
- ActionMessages errors,
- Validator validator,
- HttpServletRequest request) {
-
+ public static Object validateDate(Object bean, ValidatorAction va,
+ Field field, ActionMessages errors,
+ Validator validator,
+ HttpServletRequest request) {
Object result = null;
String value = null;
+
value = evaluateBean(bean, field);
+
boolean isStrict = false;
- String datePattern = Resources.getVarValue("datePattern", field, validator, request, false);
+ String datePattern = Resources.getVarValue("datePattern", field,
+ validator, request, false);
+
if (GenericValidator.isBlankOrNull(datePattern)) {
- datePattern = Resources.getVarValue("datePatternStrict", field, validator, request, false);
+ datePattern = Resources.getVarValue("datePatternStrict", field,
+ validator, request, false);
+
if (!GenericValidator.isBlankOrNull(datePattern)) {
isStrict = true;
}
@@ -768,63 +840,78 @@
if (GenericValidator.isBlankOrNull(datePattern)) {
result = GenericTypeValidator.formatDate(value, locale);
} else {
- result = GenericTypeValidator.formatDate(value, datePattern, isStrict);
+ result = GenericTypeValidator.formatDate(value, datePattern,
+ isStrict);
}
- } catch (Exception e) {
+ }
+ catch (Exception e) {
log.error(e.getMessage(), e);
}
if (result == null) {
- errors.add(field.getKey(), Resources.getActionMessage(validator, request, va, field));
+ errors.add(field.getKey(),
+ Resources.getActionMessage(validator,
+ request,
+ va,
+ field));
}
- return result == null ? Boolean.FALSE : result;
+ return (result == null) ? Boolean.FALSE : result;
}
-
/**
- * Checks if a fields value is within a range (min & max specified in the
- * vars attribute).
+ * Checks if a fields value is within a range (min & max specified in
+ * the vars attribute).
*
- * @param bean The bean validation is being performed on.
- * @param va The <code>ValidatorAction</code> that is currently being performed.
- * @param field The <code>Field</code> object associated with the current
- * field being validated.
- * @param errors The <code>ActionMessages</code> object to add errors to if any
- * validation errors occur.
+ * @param bean The bean validation is being performed on.
+ * @param va The <code>ValidatorAction</code> that is currently
+ * being performed.
+ * @param field The <code>Field</code> object associated with the
+ * current field being validated.
+ * @param errors The <code>ActionMessages</code> object to add errors
+ * to if any validation errors occur.
* @param validator The <code>Validator</code> instance, used to access
- * other field values.
- * @param request Current request object.
+ * other field values.
+ * @param request Current request object.
* @return True if in range, false otherwise.
*/
- public static boolean validateLongRange(Object bean,
- ValidatorAction va, Field field,
- ActionMessages errors,
- Validator validator,
- HttpServletRequest request) {
-
+ public static boolean validateLongRange(Object bean, ValidatorAction va,
+ Field field,
+ ActionMessages errors,
+ Validator validator,
+ HttpServletRequest request) {
String value = null;
+
value = evaluateBean(bean, field);
if (!GenericValidator.isBlankOrNull(value)) {
try {
- String minVar = Resources.getVarValue("min", field, validator, request, true);
- String maxVar = Resources.getVarValue("max", field, validator, request, true);
+ String minVar = Resources.getVarValue("min", field, validator,
+ request, true);
+ String maxVar = Resources.getVarValue("max", field, validator,
+ request, true);
long longValue = Long.parseLong(value);
long min = Long.parseLong(minVar);
long max = Long.parseLong(maxVar);
+
if (min > max) {
throw new IllegalArgumentException(sysmsgs.getMessage(
- "invalid.range", minVar, maxVar));
+ "invalid.range", minVar, maxVar));
}
if (!GenericValidator.isInRange(longValue, min, max)) {
- errors.add(field.getKey(), Resources.getActionMessage(validator, request, va, field));
+ errors.add(field.getKey(),
+ Resources.getActionMessage(validator,
+ request,
+ va,
+ field));
return false;
}
- } catch (Exception e) {
+ }
+ catch (Exception e) {
processFailure(errors, field, "longRange", e);
+
return false;
}
}
@@ -832,50 +919,58 @@
return true;
}
-
/**
- * Checks if a fields value is within a range (min & max specified in the
- * vars attribute).
+ * Checks if a fields value is within a range (min & max specified in
+ * the vars attribute).
*
- * @param bean The bean validation is being performed on.
- * @param va The <code>ValidatorAction</code> that is currently being performed.
- * @param field The <code>Field</code> object associated with the current
- * field being validated.
- * @param errors The <code>ActionMessages</code> object to add errors to if any
- * validation errors occur.
+ * @param bean The bean validation is being performed on.
+ * @param va The <code>ValidatorAction</code> that is currently
+ * being performed.
+ * @param field The <code>Field</code> object associated with the
+ * current field being validated.
+ * @param errors The <code>ActionMessages</code> object to add errors
+ * to if any validation errors occur.
* @param validator The <code>Validator</code> instance, used to access
- * other field values.
- * @param request Current request object.
+ * other field values.
+ * @param request Current request object.
* @return True if in range, false otherwise.
*/
- public static boolean validateIntRange(Object bean,
- ValidatorAction va, Field field,
- ActionMessages errors,
+ public static boolean validateIntRange(Object bean, ValidatorAction va,
+ Field field, ActionMessages errors,
Validator validator,
HttpServletRequest request) {
-
String value = null;
+
value = evaluateBean(bean, field);
if (!GenericValidator.isBlankOrNull(value)) {
try {
- String minVar = Resources.getVarValue("min", field, validator, request, true);
- String maxVar = Resources.getVarValue("max", field, validator, request, true);
+ String minVar = Resources.getVarValue("min", field, validator,
+ request, true);
+ String maxVar = Resources.getVarValue("max", field, validator,
+ request, true);
int min = Integer.parseInt(minVar);
int max = Integer.parseInt(maxVar);
int intValue = Integer.parseInt(value);
+
if (min > max) {
throw new IllegalArgumentException(sysmsgs.getMessage(
- "invalid.range", minVar, maxVar));
+ "invalid.range", minVar, maxVar));
}
if (!GenericValidator.isInRange(intValue, min, max)) {
- errors.add(field.getKey(), Resources.getActionMessage(validator, request, va, field));
+ errors.add(field.getKey(),
+ Resources.getActionMessage(validator,
+ request,
+ va,
+ field));
return false;
}
- } catch (Exception e) {
+ }
+ catch (Exception e) {
processFailure(errors, field, "intRange", e);
+
return false;
}
}
@@ -884,48 +979,58 @@
}
/**
- * Checks if a fields value is within a range (min & max specified in the
- * vars attribute).
+ * Checks if a fields value is within a range (min & max specified in
+ * the vars attribute).
*
- * @param bean The bean validation is being performed on.
- * @param va The <code>ValidatorAction</code> that is currently being performed.
- * @param field The <code>Field</code> object associated with the current
- * field being validated.
- * @param errors The <code>ActionMessages</code> object to add errors to if any
- * validation errors occur.
- * @param validator The <code>Validator</code> instance, used to access
- * other field values.
- * @param request Current request object.
- * @return True if in range, false otherwise.
+ * @param bean The bean validation is being performed on.
+ * @param va The <code>ValidatorAction</code> that is currently
+ * being performed.
+ * @param field The <code>Field</code> object associated with the
+ * current field being validated.
+ * @param errors The <code>ActionMessages</code> object to add errors
+ * to if any validation errors occur.
+ * @param validator The <code>Validator</code> instance, used to access
+ * other field values.
+ * @param request Current request object.
+ * @return True if in range, false otherwise.
*/
- public static boolean validateDoubleRange(Object bean,
- ValidatorAction va, Field field,
+ public static boolean validateDoubleRange(Object bean, ValidatorAction va,
+ Field field,
ActionMessages errors,
Validator validator,
HttpServletRequest request) {
-
String value = null;
+
value = evaluateBean(bean, field);
if (!GenericValidator.isBlankOrNull(value)) {
try {
- String minVar = Resources.getVarValue("min", field, validator, request, true);
- String maxVar = Resources.getVarValue("max", field, validator, request, true);
+ String minVar = Resources.getVarValue("min", field, validator,
+ request, true);
+ String maxVar = Resources.getVarValue("max", field, validator,
+ request, true);
double doubleValue = Double.parseDouble(value);
double min = Double.parseDouble(minVar);
double max = Double.parseDouble(maxVar);
+
if (min > max) {
throw new IllegalArgumentException(sysmsgs.getMessage(
- "invalid.range", minVar, maxVar));
+ "invalid.range", minVar, maxVar));
}
if (!GenericValidator.isInRange(doubleValue, min, max)) {
- errors.add(field.getKey(), Resources.getActionMessage(validator, request, va, field));
+ errors.add(field.getKey(),
+ Resources.getActionMessage(validator,
+ request,
+ va,
+ field));
return false;
}
- } catch (Exception e) {
+ }
+ catch (Exception e) {
processFailure(errors, field, "doubleRange", e);
+
return false;
}
}
@@ -934,48 +1039,58 @@
}
/**
- * Checks if a fields value is within a range (min & max specified in the
- * vars attribute).
+ * Checks if a fields value is within a range (min & max specified in
+ * the vars attribute).
*
- * @param bean The bean validation is being performed on.
- * @param va The <code>ValidatorAction</code> that is currently being performed.
- * @param field The <code>Field</code> object associated with the current
- * field being validated.
- * @param errors The <code>ActionMessages</code> object to add errors to if any
- * validation errors occur.
+ * @param bean The bean validation is being performed on.
+ * @param va The <code>ValidatorAction</code> that is currently
+ * being performed.
+ * @param field The <code>Field</code> object associated with the
+ * current field being validated.
+ * @param errors The <code>ActionMessages</code> object to add errors
+ * to if any validation errors occur.
* @param validator The <code>Validator</code> instance, used to access
- * other field values.
- * @param request Current request object.
+ * other field values.
+ * @param request Current request object.
* @return True if in range, false otherwise.
*/
- public static boolean validateFloatRange(Object bean,
- ValidatorAction va, Field field,
+ public static boolean validateFloatRange(Object bean, ValidatorAction va,
+ Field field,
ActionMessages errors,
Validator validator,
HttpServletRequest request) {
-
String value = null;
+
value = evaluateBean(bean, field);
if (!GenericValidator.isBlankOrNull(value)) {
try {
- String minVar = Resources.getVarValue("min", field, validator, request, true);
- String maxVar = Resources.getVarValue("max", field, validator, request, true);
+ String minVar = Resources.getVarValue("min", field, validator,
+ request, true);
+ String maxVar = Resources.getVarValue("max", field, validator,
+ request, true);
float floatValue = Float.parseFloat(value);
float min = Float.parseFloat(minVar);
float max = Float.parseFloat(maxVar);
+
if (min > max) {
throw new IllegalArgumentException(sysmsgs.getMessage(
- "invalid.range", minVar, maxVar));
+ "invalid.range", minVar, maxVar));
}
if (!GenericValidator.isInRange(floatValue, min, max)) {
- errors.add(field.getKey(), Resources.getActionMessage(validator, request, va, field));
+ errors.add(field.getKey(),
+ Resources.getActionMessage(validator,
+ request,
+ va,
+ field));
return false;
}
- } catch (Exception e) {
+ }
+ catch (Exception e) {
processFailure(errors, field, "floatRange", e);
+
return false;
}
}
@@ -983,29 +1098,29 @@
return true;
}
-
/**
- * Checks if the field is a valid credit card number.
+ * Checks if the field is a valid credit card number.
*
- * @param bean The bean validation is being performed on.
- * @param va The <code>ValidatorAction</code> that is currently being performed.
- * @param field The <code>Field</code> object associated with the current
- * field being validated.
- * @param errors The <code>ActionMessages</code> object to add errors to if any
- * validation errors occur.
+ * @param bean The bean validation is being performed on.
+ * @param va The <code>ValidatorAction</code> that is currently
+ * being performed.
+ * @param field The <code>Field</code> object associated with the
+ * current field being validated.
+ * @param errors The <code>ActionMessages</code> object to add errors
+ * to if any validation errors occur.
* @param validator The <code>Validator</code> instance, used to access
- * other field values.
- * @param request Current request object.
+ * other field values.
+ * @param request Current request object.
* @return true if valid, false otherwise.
*/
- public static Object validateCreditCard(Object bean,
- ValidatorAction va, Field field,
- ActionMessages errors,
- Validator validator,
- HttpServletRequest request) {
-
+ public static Object validateCreditCard(Object bean, ValidatorAction va,
+ Field field,
+ ActionMessages errors,
+ Validator validator,
+ HttpServletRequest request) {
Object result = null;
String value = null;
+
value = evaluateBean(bean, field);
if (GenericValidator.isBlankOrNull(value)) {
@@ -1015,82 +1130,97 @@
result = GenericTypeValidator.formatCreditCard(value);
if (result == null) {
- errors.add(field.getKey(), Resources.getActionMessage(validator, request, va, field));
+ errors.add(field.getKey(),
+ Resources.getActionMessage(validator,
+ request,
+ va,
+ field));
}
- return result == null ? Boolean.FALSE : result;
-
+ return (result == null) ? Boolean.FALSE : result;
}
-
/**
- * Checks if a field has a valid e-mail address.
+ * Checks if a field has a valid e-mail address.
*
- * @param bean The bean validation is being performed on.
- * @param va The <code>ValidatorAction</code> that is currently being performed.
- * @param field The <code>Field</code> object associated with the current
- * field being validated.
- * @param errors The <code>ActionMessages</code> object to add errors to if any
- * validation errors occur.
+ * @param bean The bean validation is being performed on.
+ * @param va The <code>ValidatorAction</code> that is currently
+ * being performed.
+ * @param field The <code>Field</code> object associated with the
+ * current field being validated.
+ * @param errors The <code>ActionMessages</code> object to add errors
+ * to if any validation errors occur.
* @param validator The <code>Validator</code> instance, used to access
- * other field values.
- * @param request Current request object.
+ * other field values.
+ * @param request Current request object.
* @return True if valid, false otherwise.
*/
- public static boolean validateEmail(Object bean,
- ValidatorAction va, Field field,
- ActionMessages errors,
+ public static boolean validateEmail(Object bean, ValidatorAction va,
+ Field field, ActionMessages errors,
Validator validator,
HttpServletRequest request) {
-
String value = null;
+
value = evaluateBean(bean, field);
- if (!GenericValidator.isBlankOrNull(value) && !GenericValidator.isEmail(value)) {
- errors.add(field.getKey(), Resources.getActionMessage(validator, request, va, field));
+ if (!GenericValidator.isBlankOrNull(value)
+ && !GenericValidator.isEmail(value)) {
+ errors.add(field.getKey(),
+ Resources.getActionMessage(validator,
+ request,
+ va,
+ field));
+
return false;
} else {
return true;
}
}
-
/**
- * Checks if the field's length is less than or equal to the maximum value.
- * A <code>Null</code> will be considered an error.
+ * Checks if the field's length is less than or equal to the maximum
+ * value. A <code>Null</code> will be considered an error.
*
- * @param bean The bean validation is being performed on.
- * @param va The <code>ValidatorAction</code> that is currently being performed.
- * @param field The <code>Field</code> object associated with the current
- * field being validated.
- * @param errors The <code>ActionMessages</code> object to add errors to if any
- * validation errors occur.
+ * @param bean The bean validation is being performed on.
+ * @param va The <code>ValidatorAction</code> that is currently
+ * being performed.
+ * @param field The <code>Field</code> object associated with the
+ * current field being validated.
+ * @param errors The <code>ActionMessages</code> object to add errors
+ * to if any validation errors occur.
* @param validator The <code>Validator</code> instance, used to access
- * other field values.
- * @param request Current request object.
+ * other field values.
+ * @param request Current request object.
* @return True if stated conditions met.
*/
- public static boolean validateMaxLength(Object bean,
- ValidatorAction va, Field field,
+ public static boolean validateMaxLength(Object bean, ValidatorAction va,
+ Field field,
ActionMessages errors,
Validator validator,
HttpServletRequest request) {
-
String value = null;
+
value = evaluateBean(bean, field);
if (value != null) {
try {
- String maxVar = Resources.getVarValue("maxlength", field, validator, request, true);
+ String maxVar = Resources.getVarValue("maxlength", field,
+ validator, request, true);
int max = Integer.parseInt(maxVar);
if (!GenericValidator.maxLength(value, max)) {
- errors.add(field.getKey(), Resources.getActionMessage(validator, request, va, field));
+ errors.add(field.getKey(),
+ Resources.getActionMessage(validator,
+ request,
+ va,
+ field));
return false;
}
- } catch (Exception e) {
+ }
+ catch (Exception e) {
processFailure(errors, field, "floatRange", e);
+
return false;
}
}
@@ -1098,43 +1228,50 @@
return true;
}
-
/**
- * Checks if the field's length is greater than or equal to the minimum value.
- * A <code>Null</code> will be considered an error.
+ * Checks if the field's length is greater than or equal to the minimum
+ * value. A <code>Null</code> will be considered an error.
*
- * @param bean The bean validation is being performed on.
- * @param va The <code>ValidatorAction</code> that is currently being performed.
- * @param field The <code>Field</code> object associated with the current
- * field being validated.
- * @param errors The <code>ActionMessages</code> object to add errors to if any
- * validation errors occur.
+ * @param bean The bean validation is being performed on.
+ * @param va The <code>ValidatorAction</code> that is currently
+ * being performed.
+ * @param field The <code>Field</code> object associated with the
+ * current field being validated.
+ * @param errors The <code>ActionMessages</code> object to add errors
+ * to if any validation errors occur.
* @param validator The <code>Validator</code> instance, used to access
- * other field values.
- * @param request Current request object.
+ * other field values.
+ * @param request Current request object.
* @return True if stated conditions met.
*/
- public static boolean validateMinLength(Object bean,
- ValidatorAction va, Field field,
+ public static boolean validateMinLength(Object bean, ValidatorAction va,
+ Field field,
ActionMessages errors,
Validator validator,
HttpServletRequest request) {
-
String value = null;
+
value = evaluateBean(bean, field);
if (!GenericValidator.isBlankOrNull(value)) {
try {
- String minVar = Resources.getVarValue("minlength", field, validator, request, true);
+ String minVar = Resources.getVarValue("minlength", field,
+ validator, request, true);
int min = Integer.parseInt(minVar);
if (!GenericValidator.minLength(value, min)) {
- errors.add(field.getKey(), Resources.getActionMessage(validator, request, va, field));
+ errors.add(field.getKey(),
+ Resources.getActionMessage(validator,
+ request,
+ va,
+ field));
return false;
}
- } catch (Exception e) {
+ }
+ catch (Exception e) {
processFailure(errors, field, "minlength", e);
+
return false;
}
}
@@ -1144,41 +1281,40 @@
/**
* Checks if a field has a valid url. Four optional variables can be
- * specified to configure url validation.
- * <ul>
- * <li>Variable <code>allow2slashes</code> can be set to <code>true</code> or
- * <code>false</code> to control whether two slashes are allowed -
- * default is <code>false</code> (i.e. two slashes are NOT allowed).</li>
- * <li>Variable <code>nofragments</code> can be set to <code>true</code> or
- * <code>false</code> to control whether fragments are allowed -
- * default is <code>false</code> (i.e. fragments ARE allowed).</li>
- * <li>Variable <code>allowallschemes</code> can be set to <code>true</code> or
- * <code>false</code> to control if all schemes are allowed - default
- * is <code>false</code> (i.e. all schemes are NOT allowed).</li>
- * <li>Variable <code>schemes</code> can be set to a comma delimited list of
- * valid schemes. This value is ignored if <code>allowallschemes</code>
- * is set to <code>true</code>. Default schemes allowed are "http",
- * "https" and "ftp" if this variable is not specified.</li>
- * </ul>
- *
- * @param bean The bean validation is being performed on.
- * @param va The <code>ValidatorAction</code> that is currently being performed.
- * @param field The <code>Field</code> object associated with the current
- * field being validated.
- * @param errors The <code>ActionMessages</code> object to add errors to if any
- * validation errors occur.
+ * specified to configure url validation. <ul> <li>Variable
+ * <code>allow2slashes</code> can be set to <code>true</code> or
+ * <code>false</code> to control whether two slashes are allowed - default
+ * is <code>false</code> (i.e. two slashes are NOT allowed).</li>
+ * <li>Variable <code>nofragments</code> can be set to <code>true</code>
+ * or <code>false</code> to control whether fragments are allowed -
+ * default is <code>false</code> (i.e. fragments ARE allowed).</li>
+ * <li>Variable <code>allowallschemes</code> can be set to
+ * <code>true</code> or <code>false</code> to control if all schemes are
+ * allowed - default is <code>false</code> (i.e. all schemes are NOT
+ * allowed).</li> <li>Variable <code>schemes</code> can be set to a comma
+ * delimited list of valid schemes. This value is ignored if
+ * <code>allowallschemes</code> is set to <code>true</code>. Default
+ * schemes allowed are "http", "https" and "ftp" if this variable is not
+ * specified.</li> </ul>
+ *
+ * @param bean The bean validation is being performed on.
+ * @param va The <code>ValidatorAction</code> that is currently
+ * being performed.
+ * @param field The <code>Field</code> object associated with the
+ * current field being validated.
+ * @param errors The <code>ActionMessages</code> object to add errors
+ * to if any validation errors occur.
* @param validator The <code>Validator</code> instance, used to access
- * other field values.
- * @param request Current request object.
+ * other field values.
+ * @param request Current request object.
* @return True if valid, false otherwise.
*/
- public static boolean validateUrl(Object bean,
- ValidatorAction va, Field field,
- ActionMessages errors,
- Validator validator,
- HttpServletRequest request) {
-
+ public static boolean validateUrl(Object bean, ValidatorAction va,
+ Field field, ActionMessages errors,
+ Validator validator,
+ HttpServletRequest request) {
String value = null;
+
value = evaluateBean(bean, field);
if (GenericValidator.isBlankOrNull(value)) {
@@ -1186,78 +1322,97 @@
}
// Get the options and schemes Vars
- String allowallschemesVar = Resources.getVarValue("allowallschemes", field, validator, request, false);
+ String allowallschemesVar = Resources.getVarValue("allowallschemes",
+ field, validator, request, false);
boolean allowallschemes = "true".equalsIgnoreCase(allowallschemesVar);
int options = allowallschemes ? UrlValidator.ALLOW_ALL_SCHEMES : 0;
- String allow2slashesVar = Resources.getVarValue("allow2slashes", field, validator, request, false);
+ String allow2slashesVar =
+ Resources.getVarValue("allow2slashes", field,
+ validator, request, false);
+
if ("true".equalsIgnoreCase(allow2slashesVar)) {
- options += UrlValidator.ALLOW_2_SLASHES;
+ options += UrlValidator.ALLOW_2_SLASHES;
}
- String nofragmentsVar = Resources.getVarValue("nofragments", field, validator, request, false);
+ String nofragmentsVar = Resources.getVarValue("nofragments", field,
+ validator, request, false);
+
if ("true".equalsIgnoreCase(nofragmentsVar)) {
- options += UrlValidator.NO_FRAGMENTS;
+ options += UrlValidator.NO_FRAGMENTS;
}
- String schemesVar = allowallschemes ? null :
- Resources.getVarValue("schemes", field, validator, request, false);
+ String schemesVar = allowallschemes ? null
+ : Resources.getVarValue("schemes",
+ field, validator, request, false);
// No options or schemes - use GenericValidator as default
- if (options == 0 && schemesVar == null) {
+ if ((options == 0) && (schemesVar == null)) {
if (GenericValidator.isUrl(value)) {
return true;
} else {
- errors.add(field.getKey(), Resources.getActionMessage(validator, request, va, field));
+ errors.add(field.getKey(),
+ Resources.getActionMessage(validator,
+ request,
+ va,
+ field));
+
return false;
}
}
// Parse comma delimited list of schemes into a String[]
String[] schemes = null;
+
if (schemesVar != null) {
+ StringTokenizer st = new StringTokenizer(schemesVar, ",");
- StringTokenizer st = new StringTokenizer(schemesVar, ",");
- schemes = new String[st.countTokens()];
+ schemes = new String[st.countTokens()];
- int i = 0;
- while (st.hasMoreTokens()) {
- schemes[i++] = st.nextToken().trim();
- }
+ int i = 0;
+ while (st.hasMoreTokens()) {
+ schemes[i++] = st.nextToken().trim();
+ }
}
// Create UrlValidator and validate with options/schemes
UrlValidator urlValidator = new UrlValidator(schemes, options);
+
if (urlValidator.isValid(value)) {
return true;
} else {
- errors.add(field.getKey(), Resources.getActionMessage(validator, request, va, field));
+ errors.add(field.getKey(),
+ Resources.getActionMessage(validator,
+ request,
+ va,
+ field));
+
return false;
}
}
/**
- * Process a validation failure.
+ * Process a validation failure.
*/
- private static void processFailure(ActionMessages errors,
- Field field,
- String validator,
- Throwable t) {
+ private static void processFailure(ActionMessages errors, Field field,
+ String validator, Throwable t) {
// Log the error
- String logErrorMsg = sysmsgs.getMessage("validation.failed",
- validator, field.getProperty(), t.toString());
+ String logErrorMsg =
+ sysmsgs.getMessage("validation.failed", validator,
+ field.getProperty(), t.toString());
+
log.error(logErrorMsg);
// Add general "system error" message to show to the user
String userErrorMsg = sysmsgs.getMessage("system.error");
- errors.add(field.getKey(), new ActionMessage(userErrorMsg, false));
+ errors.add(field.getKey(), new ActionMessage(userErrorMsg, false));
}
/**
- * Return <code>true</code> if the specified object is a String or a <code>null</code>
- * value.
+ * Return <code>true</code> if the specified object is a String or a
+ * <code>null</code> value.
*
* @param o Object to be tested
* @return The string value
@@ -1265,6 +1420,4 @@
protected static boolean isString(Object o) {
return (o == null) ? true : String.class.isInstance(o);
}
-
}
-
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org