From 29d701264725864662cabe39ea8ff8eee17a0830 Mon Sep 17 00:00:00 2001 From: Henri Sara Date: Thu, 22 Dec 2011 12:56:51 +0200 Subject: [PATCH] Rename BeanValidationValidator to BeanValidator based on review. --- .../data/fieldbinder/BeanFieldGroup.java | 4 +-- ...ationValidator.java => BeanValidator.java} | 6 ++-- .../server/validation/TestBeanValidation.java | 28 +++++++++---------- 3 files changed, 18 insertions(+), 20 deletions(-) rename src/com/vaadin/data/validator/{BeanValidationValidator.java => BeanValidator.java} (93%) diff --git a/src/com/vaadin/data/fieldbinder/BeanFieldGroup.java b/src/com/vaadin/data/fieldbinder/BeanFieldGroup.java index ab1e1a5ab2..3cb295bb2a 100644 --- a/src/com/vaadin/data/fieldbinder/BeanFieldGroup.java +++ b/src/com/vaadin/data/fieldbinder/BeanFieldGroup.java @@ -7,7 +7,7 @@ import java.lang.reflect.Method; import com.vaadin.data.Item; import com.vaadin.data.util.BeanItem; -import com.vaadin.data.validator.BeanValidationValidator; +import com.vaadin.data.validator.BeanValidator; import com.vaadin.ui.Field; public class BeanFieldGroup extends FieldGroup { @@ -120,7 +120,7 @@ public class BeanFieldGroup extends FieldGroup { super.configureField(field); // Add Bean validators if there are annotations if (isBeanValidationImplementationAvailable()) { - BeanValidationValidator validator = new BeanValidationValidator( + BeanValidator validator = new BeanValidator( beanType, getPropertyId(field).toString()); field.addValidator(validator); if (field.getLocale() != null) { diff --git a/src/com/vaadin/data/validator/BeanValidationValidator.java b/src/com/vaadin/data/validator/BeanValidator.java similarity index 93% rename from src/com/vaadin/data/validator/BeanValidationValidator.java rename to src/com/vaadin/data/validator/BeanValidator.java index 90f330c11d..939fd2e9c4 100644 --- a/src/com/vaadin/data/validator/BeanValidationValidator.java +++ b/src/com/vaadin/data/validator/BeanValidator.java @@ -34,7 +34,7 @@ import com.vaadin.data.Validator; * @author Petri Hakala * @author Henri Sara */ -public class BeanValidationValidator implements Validator { +public class BeanValidator implements Validator { private static final long serialVersionUID = 1L; private static ValidatorFactory factory; @@ -85,7 +85,7 @@ public class BeanValidationValidator implements Validator { * @param propertyName * property to validate */ - public BeanValidationValidator(Class beanClass, String propertyName) { + public BeanValidator(Class beanClass, String propertyName) { this.beanClass = beanClass; this.propertyName = propertyName; locale = Locale.getDefault(); @@ -158,7 +158,7 @@ public class BeanValidationValidator implements Validator { /** * Returns a shared Validator instance to use. An instance is created using * 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 */ diff --git a/tests/server-side/com/vaadin/tests/server/validation/TestBeanValidation.java b/tests/server-side/com/vaadin/tests/server/validation/TestBeanValidation.java index 9111ab9a4b..8f6928fc35 100644 --- a/tests/server-side/com/vaadin/tests/server/validation/TestBeanValidation.java +++ b/tests/server-side/com/vaadin/tests/server/validation/TestBeanValidation.java @@ -3,56 +3,54 @@ package com.vaadin.tests.server.validation; import org.junit.Test; 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; public class TestBeanValidation { @Test(expected = InvalidValueException.class) public void testBeanValidationNull() { - BeanValidationValidator validator = new BeanValidationValidator( - BeanToValidate.class, "firstname"); + BeanValidator validator = new BeanValidator(BeanToValidate.class, + "firstname"); validator.validate(null); } @Test(expected = InvalidValueException.class) public void testBeanValidationStringTooShort() { - BeanValidationValidator validator = new BeanValidationValidator( - BeanToValidate.class, "firstname"); + BeanValidator validator = new BeanValidator(BeanToValidate.class, + "firstname"); validator.validate("aa"); } @Test public void testBeanValidationStringOk() { - BeanValidationValidator validator = new BeanValidationValidator( - BeanToValidate.class, "firstname"); + BeanValidator validator = new BeanValidator(BeanToValidate.class, + "firstname"); validator.validate("aaa"); } @Test(expected = InvalidValueException.class) public void testBeanValidationIntegerTooSmall() { - BeanValidationValidator validator = new BeanValidationValidator( - BeanToValidate.class, "age"); + BeanValidator validator = new BeanValidator(BeanToValidate.class, "age"); validator.validate(17); } @Test public void testBeanValidationIntegerOk() { - BeanValidationValidator validator = new BeanValidationValidator( - BeanToValidate.class, "age"); + BeanValidator validator = new BeanValidator(BeanToValidate.class, "age"); validator.validate(18); } @Test(expected = InvalidValueException.class) public void testBeanValidationTooManyDigits() { - BeanValidationValidator validator = new BeanValidationValidator( - BeanToValidate.class, "decimals"); + BeanValidator validator = new BeanValidator(BeanToValidate.class, + "decimals"); validator.validate("1234.567"); } @Test public void testBeanValidationDigitsOk() { - BeanValidationValidator validator = new BeanValidationValidator( - BeanToValidate.class, "decimals"); + BeanValidator validator = new BeanValidator(BeanToValidate.class, + "decimals"); validator.validate("123.45"); } -- 2.39.5