Removed static helper for BeanValidationValidator as it incorrectly

mixes @NotNull with field required. Based on API review meeting.

src/com/vaadin/data/fieldbinder/BeanFieldBinder.java

@@ -116,8 +116,9 @@ public class BeanFieldBinder<T> extends FieldBinder {
         super.configureField(field);
         // Add Bean validators if there are annotations
         if (BeanValidationValidator.isImplementationAvailable()) {
-            BeanValidationValidator validator = BeanValidationValidator
-                    .addValidator(field, getPropertyIdForField(field), beanType);
+            BeanValidationValidator validator = new BeanValidationValidator(
+                    beanType, getPropertyIdForField(field).toString());
+            field.addValidator(validator);
             if (field.getLocale() != null) {
                 validator.setLocale(field.getLocale());
             }

src/com/vaadin/data/validator/BeanValidationValidator.java

@@ -5,10 +5,7 @@
 package com.vaadin.data.validator;
 
 import java.io.Serializable;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Set;
@@ -17,13 +14,9 @@ import javax.validation.ConstraintViolation;
 import javax.validation.MessageInterpolator.Context;
 import javax.validation.Validation;
 import javax.validation.ValidatorFactory;
-import javax.validation.constraints.NotNull;
-import javax.validation.metadata.BeanDescriptor;
 import javax.validation.metadata.ConstraintDescriptor;
-import javax.validation.metadata.PropertyDescriptor;
 
 import com.vaadin.data.Validator;
-import com.vaadin.ui.Field;
 
 /**
  * Vaadin {@link Validator} using the JSR-303 (javax.validation)
@@ -99,102 +92,11 @@ public class BeanValidationValidator implements Validator {
         locale = Locale.getDefault();
     }
 
-    /**
-     * Apply a bean validation validator to a field based on a bean class and
-     * the identifier of the property the field displays. The field is also
-     * marked as required if the bean field has the {@link NotNull} annotation.
-     * <p>
-     * No actual Vaadin validator is added in case no or only {@link NotNull}
-     * validation is used (required is practically same as NotNull validation).
-     * 
-     * @param field
-     *            the {@link Field} component to which to add a validator
-     * @param objectPropertyId
-     *            the property ID of the field of the bean that this field
-     *            displays
-     * @param beanClass
-     *            the class of the bean with the bean validation annotations
-     * @return the created validator
-     */
-    public static BeanValidationValidator addValidator(Field<?> field,
-            Object objectPropertyId, Class<?> beanClass) {
-        if (objectPropertyId == null || !(objectPropertyId instanceof String)) {
-            throw new IllegalArgumentException(
-                    "Property id must be a non-null String");
-        }
-
-        String propertyId = (String) objectPropertyId;
-        BeanValidationValidator validator = new BeanValidationValidator(
-                beanClass, propertyId);
-        PropertyDescriptor constraintsForProperty = validator
-                .getJavaxBeanValidator().getConstraintsForClass(beanClass)
-                .getConstraintsForProperty(propertyId);
-        if (constraintsForProperty != null) {
-            int nonNotNullValidators = constraintsForProperty
-                    .getConstraintDescriptors().size();
-            if (validator.isRequired()) {
-                field.setRequired(true);
-                field.setRequiredError(validator.getRequiredMessage());
-                nonNotNullValidators--;
-            }
-            if (nonNotNullValidators > 0) {
-                field.addValidator(validator);
-            }
-        }
-        return validator;
-    }
-
-    /**
-     * Check the validity of a value. Normally, {@link #validate(Object)} should
-     * be used instead of this method to also get the validation error message.
+    /*
+     * (non-Javadoc)
      * 
-     * @param value
-     * @return true if the value is valid
+     * @see com.vaadin.data.Validator#validate(java.lang.Object)
      */
-    public boolean isValid(Object value) {
-        try {
-            validate(value);
-            return true;
-        } catch (Exception e) {
-            return false;
-        }
-    }
-
-    /**
-     * Checks if the property has been marked as required (has the
-     * {@link NotNull} annotation.
-     * 
-     * @return true if the field is marked as not null
-     */
-    public boolean isRequired() {
-        PropertyDescriptor desc = getJavaxBeanValidator()
-                .getConstraintsForClass(beanClass).getConstraintsForProperty(
-                        propertyName);
-        if (desc != null) {
-            Iterator<ConstraintDescriptor<?>> it = desc
-                    .getConstraintDescriptors().iterator();
-            while (it.hasNext()) {
-                final ConstraintDescriptor<?> d = it.next();
-                Annotation a = d.getAnnotation();
-                if (a instanceof NotNull) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Returns the message to show if a value is required but missing. The
-     * message that of the {@link NotNull} annotation.
-     * 
-     * @return error message to show for missing required value
-     */
-    @SuppressWarnings("unchecked")
-    public String getRequiredMessage() {
-        return getErrorMessage(null, NotNull.class);
-    }
-
     public void validate(final Object value) throws InvalidValueException {
         Set<?> violations = getJavaxBeanValidator().validateValue(beanClass,
                 propertyName, value);
@@ -220,60 +122,6 @@ public class BeanValidationValidator implements Validator {
         }
     }
 
-    private String getErrorMessage(final Object value,
-            Class<? extends Annotation>... an) {
-        BeanDescriptor beanDesc = getJavaxBeanValidator()
-                .getConstraintsForClass(beanClass);
-        PropertyDescriptor desc = beanDesc
-                .getConstraintsForProperty(propertyName);
-        if (desc == null) {
-            // validate() reports a conversion error in this case
-            return null;
-        }
-        Iterator<ConstraintDescriptor<?>> it = desc.getConstraintDescriptors()
-                .iterator();
-        List<String> exceptions = new ArrayList<String>();
-        while (it.hasNext()) {
-            final ConstraintDescriptor<?> d = it.next();
-            Annotation a = d.getAnnotation();
-            boolean skip = false;
-            if (an != null && an.length > 0) {
-                skip = true;
-                for (Class<? extends Annotation> t : an) {
-                    if (t == a.annotationType()) {
-                        skip = false;
-                        break;
-                    }
-                }
-            }
-            if (!skip) {
-                String messageTemplate = null;
-                try {
-                    Method m = a.getClass().getMethod("message");
-                    messageTemplate = (String) m.invoke(a);
-                } catch (Exception ex) {
-                    throw new InvalidValueException(
-                            "Annotation must have message attribute");
-                }
-                String msg = getJavaxBeanValidatorFactory()
-                        .getMessageInterpolator().interpolate(messageTemplate,
-                                new SimpleContext(value, d), locale);
-                exceptions.add(msg);
-            }
-        }
-        if (exceptions.size() > 0) {
-            StringBuilder b = new StringBuilder();
-            for (int i = 0; i < exceptions.size(); i++) {
-                if (i != 0) {
-                    b.append("<br/>");
-                }
-                b.append(exceptions.get(i));
-            }
-            return b.toString();
-        }
-        return null;
-    }
-
     /**
      * Sets the locale used for validation error messages.
      * 
@@ -340,4 +188,5 @@ public class BeanValidationValidator implements Validator {
         }
         return implementationAvailable;
     }
+
 }