Browse Source

Rename BeanValidationValidator to BeanValidator based on review.

tags/7.0.0.alpha1
Henri Sara 12 years ago
parent
commit
29d7012647

+ 2
- 2
src/com/vaadin/data/fieldbinder/BeanFieldGroup.java View File

import com.vaadin.data.Item; import com.vaadin.data.Item;
import com.vaadin.data.util.BeanItem; import com.vaadin.data.util.BeanItem;
import com.vaadin.data.validator.BeanValidationValidator;
import com.vaadin.data.validator.BeanValidator;
import com.vaadin.ui.Field; import com.vaadin.ui.Field;
public class BeanFieldGroup<T> extends FieldGroup { public class BeanFieldGroup<T> extends FieldGroup {
super.configureField(field); super.configureField(field);
// Add Bean validators if there are annotations // Add Bean validators if there are annotations
if (isBeanValidationImplementationAvailable()) { if (isBeanValidationImplementationAvailable()) {
BeanValidationValidator validator = new BeanValidationValidator(
BeanValidator validator = new BeanValidator(
beanType, getPropertyId(field).toString()); beanType, getPropertyId(field).toString());
field.addValidator(validator); field.addValidator(validator);
if (field.getLocale() != null) { if (field.getLocale() != null) {

src/com/vaadin/data/validator/BeanValidationValidator.java → src/com/vaadin/data/validator/BeanValidator.java View File

* @author Petri Hakala * @author Petri Hakala
* @author Henri Sara * @author Henri Sara
*/ */
public class BeanValidationValidator implements Validator {
public class BeanValidator implements Validator {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static ValidatorFactory factory; private static ValidatorFactory factory;
* @param propertyName * @param propertyName
* property to validate * property to validate
*/ */
public BeanValidationValidator(Class<?> beanClass, String propertyName) {
public BeanValidator(Class<?> beanClass, String propertyName) {
this.beanClass = beanClass; this.beanClass = beanClass;
this.propertyName = propertyName; this.propertyName = propertyName;
locale = Locale.getDefault(); locale = Locale.getDefault();
/** /**
* Returns a shared Validator instance to use. An instance is created using * Returns a shared Validator instance to use. An instance is created using
* the validator factory if necessary and thereafter reused by the * the validator factory if necessary and thereafter reused by the
* {@link BeanValidationValidator} instance.
* {@link BeanValidator} instance.
* *
* @return the JSR-303 {@link javax.validation.Validator} to use * @return the JSR-303 {@link javax.validation.Validator} to use
*/ */

+ 13
- 15
tests/server-side/com/vaadin/tests/server/validation/TestBeanValidation.java View File

import org.junit.Test; import org.junit.Test;


import com.vaadin.data.Validator.InvalidValueException; import com.vaadin.data.Validator.InvalidValueException;
import com.vaadin.data.validator.BeanValidationValidator;
import com.vaadin.data.validator.BeanValidator;
import com.vaadin.tests.data.bean.BeanToValidate; import com.vaadin.tests.data.bean.BeanToValidate;


public class TestBeanValidation { public class TestBeanValidation {
@Test(expected = InvalidValueException.class) @Test(expected = InvalidValueException.class)
public void testBeanValidationNull() { public void testBeanValidationNull() {
BeanValidationValidator validator = new BeanValidationValidator(
BeanToValidate.class, "firstname");
BeanValidator validator = new BeanValidator(BeanToValidate.class,
"firstname");
validator.validate(null); validator.validate(null);
} }


@Test(expected = InvalidValueException.class) @Test(expected = InvalidValueException.class)
public void testBeanValidationStringTooShort() { public void testBeanValidationStringTooShort() {
BeanValidationValidator validator = new BeanValidationValidator(
BeanToValidate.class, "firstname");
BeanValidator validator = new BeanValidator(BeanToValidate.class,
"firstname");
validator.validate("aa"); validator.validate("aa");
} }


@Test @Test
public void testBeanValidationStringOk() { public void testBeanValidationStringOk() {
BeanValidationValidator validator = new BeanValidationValidator(
BeanToValidate.class, "firstname");
BeanValidator validator = new BeanValidator(BeanToValidate.class,
"firstname");
validator.validate("aaa"); validator.validate("aaa");
} }


@Test(expected = InvalidValueException.class) @Test(expected = InvalidValueException.class)
public void testBeanValidationIntegerTooSmall() { public void testBeanValidationIntegerTooSmall() {
BeanValidationValidator validator = new BeanValidationValidator(
BeanToValidate.class, "age");
BeanValidator validator = new BeanValidator(BeanToValidate.class, "age");
validator.validate(17); validator.validate(17);
} }


@Test @Test
public void testBeanValidationIntegerOk() { public void testBeanValidationIntegerOk() {
BeanValidationValidator validator = new BeanValidationValidator(
BeanToValidate.class, "age");
BeanValidator validator = new BeanValidator(BeanToValidate.class, "age");
validator.validate(18); validator.validate(18);
} }


@Test(expected = InvalidValueException.class) @Test(expected = InvalidValueException.class)
public void testBeanValidationTooManyDigits() { public void testBeanValidationTooManyDigits() {
BeanValidationValidator validator = new BeanValidationValidator(
BeanToValidate.class, "decimals");
BeanValidator validator = new BeanValidator(BeanToValidate.class,
"decimals");
validator.validate("1234.567"); validator.validate("1234.567");
} }


@Test @Test
public void testBeanValidationDigitsOk() { public void testBeanValidationDigitsOk() {
BeanValidationValidator validator = new BeanValidationValidator(
BeanToValidate.class, "decimals");
BeanValidator validator = new BeanValidator(BeanToValidate.class,
"decimals");
validator.validate("123.45"); validator.validate("123.45");
} }



Loading…
Cancel
Save