Move old validators to legacy package (pre-#87).

Change-Id: If6212ff2b7da0e87b3c68a3372b5f0b5a2a55b1a

42 files changed, 187 insertions, 187 deletions

diff --git a/server/src/main/java/com/vaadin/data/fieldgroup/BeanFieldGroup.java b/server/src/main/java/com/vaadin/data/fieldgroup/BeanFieldGroup.java
index 62eb51b811..67ff285647 100644
--- a/server/src/main/java/com/vaadin/data/fieldgroup/BeanFieldGroup.java
+++ b/server/src/main/java/com/vaadin/data/fieldgroup/BeanFieldGroup.java
@@ -23,7 +23,7 @@ import java.util.Map;
 import com.vaadin.data.Item;
 import com.vaadin.data.util.BeanItem;
 import com.vaadin.data.util.BeanUtil;
-import com.vaadin.data.validator.BeanValidator;
+import com.vaadin.legacy.data.validator.LegacyBeanValidator;
 import com.vaadin.legacy.ui.LegacyField;
 
 public class BeanFieldGroup<T> extends FieldGroup {
@@ -31,11 +31,11 @@ public class BeanFieldGroup<T> extends FieldGroup {
     private final Class<T> beanType;
 
     private static Boolean beanValidationImplementationAvailable = null;
-    private final Map<LegacyField<?>, BeanValidator> defaultValidators;
+    private final Map<LegacyField<?>, LegacyBeanValidator> defaultValidators;
 
     public BeanFieldGroup(Class<T> beanType) {
         this.beanType = beanType;
-        this.defaultValidators = new HashMap<LegacyField<?>, BeanValidator>();
+        this.defaultValidators = new HashMap<LegacyField<?>, LegacyBeanValidator>();
     }
 
     @Override
@@ -165,7 +165,7 @@ public class BeanFieldGroup<T> extends FieldGroup {
     public void unbind(LegacyField<?> field) throws BindException {
         super.unbind(field);
 
-        BeanValidator removed = defaultValidators.remove(field);
+        LegacyBeanValidator removed = defaultValidators.remove(field);
         if (removed != null) {
             field.removeValidator(removed);
         }
@@ -177,7 +177,7 @@ public class BeanFieldGroup<T> extends FieldGroup {
         // Add Bean validators if there are annotations
         if (isBeanValidationImplementationAvailable()
                 && !defaultValidators.containsKey(field)) {
-            BeanValidator validator = new BeanValidator(beanType,
+            LegacyBeanValidator validator = new LegacyBeanValidator(beanType,
                     getPropertyId(field).toString());
             field.addValidator(validator);
             if (field.getLocale() != null) {
diff --git a/server/src/main/java/com/vaadin/data/validator/AbstractStringValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyAbstractStringValidator.java
index 70227afa67..3610a01dec 100644
--- a/server/src/main/java/com/vaadin/data/validator/AbstractStringValidator.java
+++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyAbstractStringValidator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.validator;
+package com.vaadin.legacy.data.validator;
 
 /**
  * Validator base class for validating strings.
@@ -28,7 +28,7 @@ package com.vaadin.data.validator;
  * @since 5.4
  */
 @SuppressWarnings("serial")
-public abstract class AbstractStringValidator extends AbstractValidator<String> {
+public abstract class LegacyAbstractStringValidator extends LegacyAbstractValidator<String> {
 
     /**
      * Constructs a validator for strings.
@@ -42,7 +42,7 @@ public abstract class AbstractStringValidator extends AbstractValidator<String>
      *            the message to be included in an {@link InvalidValueException}
      *            (with "{0}" replaced by the value that failed validation).
      * */
-    public AbstractStringValidator(String errorMessage) {
+    public LegacyAbstractStringValidator(String errorMessage) {
         super(errorMessage);
     }
 
diff --git a/server/src/main/java/com/vaadin/data/validator/AbstractValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyAbstractValidator.java
index 8831ac46ce..a496e96663 100644
--- a/server/src/main/java/com/vaadin/data/validator/AbstractValidator.java
+++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyAbstractValidator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.validator;
+package com.vaadin.legacy.data.validator;
 
 import com.vaadin.legacy.data.Validator;
 
@@ -44,7 +44,7 @@ import com.vaadin.legacy.data.Validator;
  * @author Vaadin Ltd.
  * @since 5.4
  */
-public abstract class AbstractValidator<T> implements Validator {
+public abstract class LegacyAbstractValidator<T> implements Validator {
 
     /**
      * Error message that is included in an {@link InvalidValueException} if
@@ -59,7 +59,7 @@ public abstract class AbstractValidator<T> implements Validator {
      *            the message to be included in an {@link InvalidValueException}
      *            (with "{0}" replaced by the value that failed validation).
      */
-    public AbstractValidator(String errorMessage) {
+    public LegacyAbstractValidator(String errorMessage) {
         this.errorMessage = errorMessage;
     }
 
diff --git a/server/src/main/java/com/vaadin/data/validator/BeanValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyBeanValidator.java
index 2e9a20bc53..823001a419 100644
--- a/server/src/main/java/com/vaadin/data/validator/BeanValidator.java
+++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyBeanValidator.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.data.validator;
+package com.vaadin.legacy.data.validator;
 
 import java.io.Serializable;
 import java.util.Locale;
@@ -44,7 +44,7 @@ import com.vaadin.legacy.data.Validator;
  * @author Petri Hakala
  * @author Henri Sara
  */
-public class BeanValidator implements Validator {
+public class LegacyBeanValidator implements Validator {
 
     private static final long serialVersionUID = 1L;
     private static ValidatorFactory factory;
@@ -97,7 +97,7 @@ public class BeanValidator implements Validator {
      * @param propertyName
      *            property to validate
      */
-    public BeanValidator(Class<?> beanClass, String propertyName) {
+    public LegacyBeanValidator(Class<?> beanClass, String propertyName) {
         this.beanClass = beanClass;
         this.propertyName = propertyName;
         locale = Locale.getDefault();
@@ -168,7 +168,7 @@ public class BeanValidator 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 BeanValidator} instance.
+     * {@link LegacyBeanValidator} instance.
      * 
      * @return the JSR-303 {@link javax.validation.Validator} to use
      */
diff --git a/server/src/main/java/com/vaadin/data/validator/BigDecimalRangeValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyBigDecimalRangeValidator.java
index 1363d230f6..46d8c99437 100644
--- a/server/src/main/java/com/vaadin/data/validator/BigDecimalRangeValidator.java
+++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyBigDecimalRangeValidator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.validator;
+package com.vaadin.legacy.data.validator;
 
 import java.math.BigDecimal;
 
@@ -24,7 +24,7 @@ import java.math.BigDecimal;
  * @since 7.4
  */
 @SuppressWarnings("serial")
-public class BigDecimalRangeValidator extends RangeValidator<BigDecimal> {
+public class LegacyBigDecimalRangeValidator extends LegacyRangeValidator<BigDecimal> {
 
     /**
      * Creates a validator for checking that an BigDecimal is within a given
@@ -42,7 +42,7 @@ public class BigDecimalRangeValidator extends RangeValidator<BigDecimal> {
      * @param maxValue
      *            The maximum value to accept or null for no limit
      */
-    public BigDecimalRangeValidator(String errorMessage, BigDecimal minValue,
+    public LegacyBigDecimalRangeValidator(String errorMessage, BigDecimal minValue,
             BigDecimal maxValue) {
         super(errorMessage, BigDecimal.class, minValue, maxValue);
     }
diff --git a/server/src/main/java/com/vaadin/data/validator/BigIntegerRangeValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyBigIntegerRangeValidator.java
index ecf1990192..4e11a65c78 100644
--- a/server/src/main/java/com/vaadin/data/validator/BigIntegerRangeValidator.java
+++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyBigIntegerRangeValidator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.validator;
+package com.vaadin.legacy.data.validator;
 
 import java.math.BigInteger;
 
@@ -24,7 +24,7 @@ import java.math.BigInteger;
  * @since 7.4
  */
 @SuppressWarnings("serial")
-public class BigIntegerRangeValidator extends RangeValidator<BigInteger> {
+public class LegacyBigIntegerRangeValidator extends LegacyRangeValidator<BigInteger> {
 
     /**
      * Creates a validator for checking that an BigInteger is within a given
@@ -42,7 +42,7 @@ public class BigIntegerRangeValidator extends RangeValidator<BigInteger> {
      * @param maxValue
      *            The maximum value to accept or null for no limit
      */
-    public BigIntegerRangeValidator(String errorMessage, BigInteger minValue,
+    public LegacyBigIntegerRangeValidator(String errorMessage, BigInteger minValue,
             BigInteger maxValue) {
         super(errorMessage, BigInteger.class, minValue, maxValue);
     }
diff --git a/server/src/main/java/com/vaadin/data/validator/ByteRangeValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyByteRangeValidator.java
index b147212c06..1f795d1e42 100644
--- a/server/src/main/java/com/vaadin/data/validator/ByteRangeValidator.java
+++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyByteRangeValidator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.validator;
+package com.vaadin.legacy.data.validator;
 
 /**
  * Validator for validating that an {@link Byte} is inside a given range.
@@ -22,7 +22,7 @@ package com.vaadin.data.validator;
  * @since 7.4
  */
 @SuppressWarnings("serial")
-public class ByteRangeValidator extends RangeValidator<Byte> {
+public class LegacyByteRangeValidator extends LegacyRangeValidator<Byte> {
 
     /**
      * Creates a validator for checking that an Byte is within a given range.
@@ -39,7 +39,7 @@ public class ByteRangeValidator extends RangeValidator<Byte> {
      * @param maxValue
      *            The maximum value to accept or null for no limit
      */
-    public ByteRangeValidator(String errorMessage, Byte minValue, Byte maxValue) {
+    public LegacyByteRangeValidator(String errorMessage, Byte minValue, Byte maxValue) {
         super(errorMessage, Byte.class, minValue, maxValue);
     }
 
diff --git a/server/src/main/java/com/vaadin/data/validator/CompositeValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyCompositeValidator.java
index bd2a8b72b1..04d6045396 100644
--- a/server/src/main/java/com/vaadin/data/validator/CompositeValidator.java
+++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyCompositeValidator.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.data.validator;
+package com.vaadin.legacy.data.validator;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -34,7 +34,7 @@ import com.vaadin.legacy.data.Validator;
  * @since 3.0
  */
 @SuppressWarnings("serial")
-public class CompositeValidator implements Validator {
+public class LegacyCompositeValidator implements Validator {
 
     public enum CombinationMode {
         /**
@@ -78,7 +78,7 @@ public class CompositeValidator implements Validator {
      * Construct a composite validator in <code>AND</code> mode without error
      * message.
      */
-    public CompositeValidator() {
+    public LegacyCompositeValidator() {
         this(CombinationMode.AND, "");
     }
 
@@ -88,7 +88,7 @@ public class CompositeValidator implements Validator {
      * @param mode
      * @param errorMessage
      */
-    public CompositeValidator(CombinationMode mode, String errorMessage) {
+    public LegacyCompositeValidator(CombinationMode mode, String errorMessage) {
         setErrorMessage(errorMessage);
         setMode(mode);
     }
@@ -243,9 +243,9 @@ public class CompositeValidator implements Validator {
             if (validatorType.isAssignableFrom(v.getClass())) {
                 found.add(v);
             }
-            if (v instanceof CompositeValidator
-                    && ((CompositeValidator) v).getMode() == MODE_AND) {
-                final Collection<Validator> c = ((CompositeValidator) v)
+            if (v instanceof LegacyCompositeValidator
+                    && ((LegacyCompositeValidator) v).getMode() == MODE_AND) {
+                final Collection<Validator> c = ((LegacyCompositeValidator) v)
                         .getSubValidators(validatorType);
                 if (c != null) {
                     found.addAll(c);
diff --git a/server/src/main/java/com/vaadin/data/validator/DateRangeValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyDateRangeValidator.java
index 3add69c207..ad44353435 100644
--- a/server/src/main/java/com/vaadin/data/validator/DateRangeValidator.java
+++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyDateRangeValidator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.validator;
+package com.vaadin.legacy.data.validator;
 
 import java.util.Date;
 
@@ -31,7 +31,7 @@ import com.vaadin.shared.ui.datefield.Resolution;
  * @author Vaadin Ltd.
  * @since 7.0
  */
-public class DateRangeValidator extends RangeValidator<Date> {
+public class LegacyDateRangeValidator extends LegacyRangeValidator<Date> {
 
     /**
      * Creates a validator for checking that an Date is within a given range.
@@ -53,7 +53,7 @@ public class DateRangeValidator extends RangeValidator<Date> {
      * @param maxValue
      *            The maximum value to accept or null for no limit
      */
-    public DateRangeValidator(String errorMessage, Date minValue,
+    public LegacyDateRangeValidator(String errorMessage, Date minValue,
             Date maxValue, Resolution resolution) {
         super(errorMessage, Date.class, minValue, maxValue);
     }
diff --git a/server/src/main/java/com/vaadin/data/validator/DoubleRangeValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyDoubleRangeValidator.java
index 8992e2644a..0110cbffff 100644
--- a/server/src/main/java/com/vaadin/data/validator/DoubleRangeValidator.java
+++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyDoubleRangeValidator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.validator;
+package com.vaadin.legacy.data.validator;
 
 /**
  * Validator for validating that a {@link Double} is inside a given range.
@@ -22,7 +22,7 @@ package com.vaadin.data.validator;
  * @since 7.0
  */
 @SuppressWarnings("serial")
-public class DoubleRangeValidator extends RangeValidator<Double> {
+public class LegacyDoubleRangeValidator extends LegacyRangeValidator<Double> {
 
     /**
      * Creates a validator for checking that an Double is within a given range.
@@ -39,7 +39,7 @@ public class DoubleRangeValidator extends RangeValidator<Double> {
      * @param maxValue
      *            The maximum value to accept or null for no limit
      */
-    public DoubleRangeValidator(String errorMessage, Double minValue,
+    public LegacyDoubleRangeValidator(String errorMessage, Double minValue,
             Double maxValue) {
         super(errorMessage, Double.class, minValue, maxValue);
     }
diff --git a/server/src/main/java/com/vaadin/data/validator/DoubleValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyDoubleValidator.java
index e40cf3eecf..0c804e7247 100644
--- a/server/src/main/java/com/vaadin/data/validator/DoubleValidator.java
+++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyDoubleValidator.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.validator;
+package com.vaadin.legacy.data.validator;
 
 import com.vaadin.data.Property;
 import com.vaadin.data.util.converter.StringToDoubleConverter;
 
 /**
  * String validator for a double precision floating point number. See
- * {@link com.vaadin.data.validator.AbstractStringValidator} for more
+ * {@link com.vaadin.legacy.data.validator.LegacyAbstractStringValidator} for more
  * information.
  * 
  * @author Vaadin Ltd.
@@ -31,7 +31,7 @@ import com.vaadin.data.util.converter.StringToDoubleConverter;
  */
 @Deprecated
 @SuppressWarnings("serial")
-public class DoubleValidator extends AbstractStringValidator {
+public class LegacyDoubleValidator extends LegacyAbstractStringValidator {
 
     /**
      * Creates a validator for checking that a string can be parsed as an
@@ -40,11 +40,11 @@ public class DoubleValidator extends AbstractStringValidator {
      * @param errorMessage
      *            the message to display in case the value does not validate.
      * @deprecated As of 7.0. Use a Double converter on the field instead and/or
-     *             use a {@link DoubleRangeValidator} for validating that the
+     *             use a {@link LegacyDoubleRangeValidator} for validating that the
      *             value is inside a given range.
      */
     @Deprecated
-    public DoubleValidator(String errorMessage) {
+    public LegacyDoubleValidator(String errorMessage) {
         super(errorMessage);
     }
 
diff --git a/server/src/main/java/com/vaadin/data/validator/EmailValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyEmailValidator.java
index 853c855a37..d6a7cdd485 100644
--- a/server/src/main/java/com/vaadin/data/validator/EmailValidator.java
+++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyEmailValidator.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.validator;
+package com.vaadin.legacy.data.validator;
 
 /**
  * String validator for e-mail addresses. The e-mail address syntax is not
  * complete according to RFC 822 but handles the vast majority of valid e-mail
  * addresses correctly.
  * 
- * See {@link com.vaadin.data.validator.AbstractStringValidator} for more
+ * See {@link com.vaadin.legacy.data.validator.LegacyAbstractStringValidator} for more
  * information.
  * 
  * <p>
@@ -33,7 +33,7 @@ package com.vaadin.data.validator;
  * @since 5.4
  */
 @SuppressWarnings("serial")
-public class EmailValidator extends RegexpValidator {
+public class LegacyEmailValidator extends LegacyRegexpValidator {
 
     /**
      * Creates a validator for checking that a string is a syntactically valid
@@ -42,7 +42,7 @@ public class EmailValidator extends RegexpValidator {
      * @param errorMessage
      *            the message to display in case the value does not validate.
      */
-    public EmailValidator(String errorMessage) {
+    public LegacyEmailValidator(String errorMessage) {
         super(
                 "^([a-zA-Z0-9_\\.\\-+])+@(([a-zA-Z0-9-])+\\.)+([a-zA-Z0-9]{2,4})+$",
                 true, errorMessage);
diff --git a/server/src/main/java/com/vaadin/data/validator/FloatRangeValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyFloatRangeValidator.java
index ee29cf16b1..6bd5a53778 100644
--- a/server/src/main/java/com/vaadin/data/validator/FloatRangeValidator.java
+++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyFloatRangeValidator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.validator;
+package com.vaadin.legacy.data.validator;
 
 /**
  * Validator for validating that a {@link Float} is inside a given range.
@@ -22,7 +22,7 @@ package com.vaadin.data.validator;
  * @since 7.4
  */
 @SuppressWarnings("serial")
-public class FloatRangeValidator extends RangeValidator<Float> {
+public class LegacyFloatRangeValidator extends LegacyRangeValidator<Float> {
 
     /**
      * Creates a validator for checking that an Float is within a given range.
@@ -39,7 +39,7 @@ public class FloatRangeValidator extends RangeValidator<Float> {
      * @param maxValue
      *            The maximum value to accept or null for no limit
      */
-    public FloatRangeValidator(String errorMessage, Float minValue,
+    public LegacyFloatRangeValidator(String errorMessage, Float minValue,
             Float maxValue) {
         super(errorMessage, Float.class, minValue, maxValue);
     }
diff --git a/server/src/main/java/com/vaadin/data/validator/IntegerRangeValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyIntegerRangeValidator.java
index 6ef848bed3..272c1bd40a 100644
--- a/server/src/main/java/com/vaadin/data/validator/IntegerRangeValidator.java
+++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyIntegerRangeValidator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.validator;
+package com.vaadin.legacy.data.validator;
 
 /**
  * Validator for validating that an {@link Integer} is inside a given range.
@@ -22,7 +22,7 @@ package com.vaadin.data.validator;
  * @since 5.4
  */
 @SuppressWarnings("serial")
-public class IntegerRangeValidator extends RangeValidator<Integer> {
+public class LegacyIntegerRangeValidator extends LegacyRangeValidator<Integer> {
 
     /**
      * Creates a validator for checking that an Integer is within a given range.
@@ -39,7 +39,7 @@ public class IntegerRangeValidator extends RangeValidator<Integer> {
      * @param maxValue
      *            The maximum value to accept or null for no limit
      */
-    public IntegerRangeValidator(String errorMessage, Integer minValue,
+    public LegacyIntegerRangeValidator(String errorMessage, Integer minValue,
             Integer maxValue) {
         super(errorMessage, Integer.class, minValue, maxValue);
     }
diff --git a/server/src/main/java/com/vaadin/data/validator/IntegerValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyIntegerValidator.java
index f52ba0ab3a..e6c2bae815 100644
--- a/server/src/main/java/com/vaadin/data/validator/IntegerValidator.java
+++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyIntegerValidator.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.validator;
+package com.vaadin.legacy.data.validator;
 
 import com.vaadin.data.Property;
 import com.vaadin.data.util.converter.StringToIntegerConverter;
 
 /**
  * String validator for integers. See
- * {@link com.vaadin.data.validator.AbstractStringValidator} for more
+ * {@link com.vaadin.legacy.data.validator.LegacyAbstractStringValidator} for more
  * information.
  * 
  * @author Vaadin Ltd.
@@ -31,7 +31,7 @@ import com.vaadin.data.util.converter.StringToIntegerConverter;
  */
 @SuppressWarnings("serial")
 @Deprecated
-public class IntegerValidator extends AbstractStringValidator {
+public class LegacyIntegerValidator extends LegacyAbstractStringValidator {
 
     /**
      * Creates a validator for checking that a string can be parsed as an
@@ -40,11 +40,11 @@ public class IntegerValidator extends AbstractStringValidator {
      * @param errorMessage
      *            the message to display in case the value does not validate.
      * @deprecated As of 7.0. Use an Integer converter on the field instead
-     *             and/or use an {@link IntegerRangeValidator} for validating
+     *             and/or use an {@link LegacyIntegerRangeValidator} for validating
      *             that the value is inside a given range.
      */
     @Deprecated
-    public IntegerValidator(String errorMessage) {
+    public LegacyIntegerValidator(String errorMessage) {
         super(errorMessage);
 
     }
diff --git a/server/src/main/java/com/vaadin/data/validator/LongRangeValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyLongRangeValidator.java
index c4d8a9c9ca..4fb38de459 100644
--- a/server/src/main/java/com/vaadin/data/validator/LongRangeValidator.java
+++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyLongRangeValidator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.validator;
+package com.vaadin.legacy.data.validator;
 
 /**
  * Validator for validating that an {@link Long} is inside a given range.
@@ -22,7 +22,7 @@ package com.vaadin.data.validator;
  * @since 7.4
  */
 @SuppressWarnings("serial")
-public class LongRangeValidator extends RangeValidator<Long> {
+public class LegacyLongRangeValidator extends LegacyRangeValidator<Long> {
 
     /**
      * Creates a validator for checking that an Long is within a given range.
@@ -39,7 +39,7 @@ public class LongRangeValidator extends RangeValidator<Long> {
      * @param maxValue
      *            The maximum value to accept or null for no limit
      */
-    public LongRangeValidator(String errorMessage, Long minValue, Long maxValue) {
+    public LegacyLongRangeValidator(String errorMessage, Long minValue, Long maxValue) {
         super(errorMessage, Long.class, minValue, maxValue);
     }
 
diff --git a/server/src/main/java/com/vaadin/data/validator/NullValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyNullValidator.java
index 16655ab2bb..0df18cb461 100644
--- a/server/src/main/java/com/vaadin/data/validator/NullValidator.java
+++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyNullValidator.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.data.validator;
+package com.vaadin.legacy.data.validator;
 
 import com.vaadin.legacy.data.Validator;
 
@@ -26,7 +26,7 @@ import com.vaadin.legacy.data.Validator;
  * @since 3.0
  */
 @SuppressWarnings("serial")
-public class NullValidator implements Validator {
+public class LegacyNullValidator implements Validator {
 
     private boolean onlyNullAllowed;
 
@@ -40,7 +40,7 @@ public class NullValidator implements Validator {
      * @param onlyNullAllowed
      *            Are only nulls allowed?
      */
-    public NullValidator(String errorMessage, boolean onlyNullAllowed) {
+    public LegacyNullValidator(String errorMessage, boolean onlyNullAllowed) {
         setErrorMessage(errorMessage);
         setNullAllowed(onlyNullAllowed);
     }
diff --git a/server/src/main/java/com/vaadin/data/validator/RangeValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyRangeValidator.java
index 5ba3aef363..d9106e9bc6 100644
--- a/server/src/main/java/com/vaadin/data/validator/RangeValidator.java
+++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyRangeValidator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.validator;
+package com.vaadin.legacy.data.validator;
 
 /**
  * An base implementation for validating any objects that implement
@@ -21,10 +21,10 @@ package com.vaadin.data.validator;
  * 
  * Verifies that the value is of the given type and within the (optionally)
  * given limits. Typically you want to use a sub class of this like
- * {@link IntegerRangeValidator}, {@link DoubleRangeValidator} or
- * {@link DateRangeValidator} in applications.
+ * {@link LegacyIntegerRangeValidator}, {@link LegacyDoubleRangeValidator} or
+ * {@link LegacyDateRangeValidator} in applications.
  * <p>
- * Note that {@link RangeValidator} always accept null values. Make a field
+ * Note that {@link LegacyRangeValidator} always accept null values. Make a field
  * required to ensure that no empty values are accepted or override
  * {@link #isValidValue(Comparable)}.
  * </p>
@@ -35,7 +35,7 @@ package com.vaadin.data.validator;
  * @author Vaadin Ltd.
  * @since 7.0
  */
-public class RangeValidator<T extends Comparable> extends AbstractValidator<T> {
+public class LegacyRangeValidator<T extends Comparable> extends LegacyAbstractValidator<T> {
 
     private T minValue = null;
     private boolean minValueIncluded = true;
@@ -55,7 +55,7 @@ public class RangeValidator<T extends Comparable> extends AbstractValidator<T> {
      * @param maxValue
      *            The maximum value that should be accepted or null for no limit
      */
-    public RangeValidator(String errorMessage, Class<T> type, T minValue,
+    public LegacyRangeValidator(String errorMessage, Class<T> type, T minValue,
             T maxValue) {
         super(errorMessage);
         this.type = type;
diff --git a/server/src/main/java/com/vaadin/data/validator/RegexpValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyRegexpValidator.java
index 74e1f89253..0bc93f44b2 100644
--- a/server/src/main/java/com/vaadin/data/validator/RegexpValidator.java
+++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyRegexpValidator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.validator;
+package com.vaadin.legacy.data.validator;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -27,7 +27,7 @@ import java.util.regex.Pattern;
  * {@link java.util.regex.Pattern#sum}
  * </p>
  * <p>
- * See {@link com.vaadin.data.validator.AbstractStringValidator} for more
+ * See {@link com.vaadin.legacy.data.validator.LegacyAbstractStringValidator} for more
  * information.
  * </p>
  * <p>
@@ -40,7 +40,7 @@ import java.util.regex.Pattern;
  * @since 5.4
  */
 @SuppressWarnings("serial")
-public class RegexpValidator extends AbstractStringValidator {
+public class LegacyRegexpValidator extends LegacyAbstractStringValidator {
 
     private Pattern pattern;
     private boolean complete;
@@ -55,7 +55,7 @@ public class RegexpValidator extends AbstractStringValidator {
      * @param errorMessage
      *            the message to display in case the value does not validate.
      */
-    public RegexpValidator(String regexp, String errorMessage) {
+    public LegacyRegexpValidator(String regexp, String errorMessage) {
         this(regexp, true, errorMessage);
     }
 
@@ -71,7 +71,7 @@ public class RegexpValidator extends AbstractStringValidator {
      * @param errorMessage
      *            the message to display in case the value does not validate.
      */
-    public RegexpValidator(String regexp, boolean complete, String errorMessage) {
+    public LegacyRegexpValidator(String regexp, boolean complete, String errorMessage) {
         super(errorMessage);
         pattern = Pattern.compile(regexp);
         this.complete = complete;
diff --git a/server/src/main/java/com/vaadin/data/validator/ShortRangeValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyShortRangeValidator.java
index a8b0d3aeb4..26bca9d78c 100644
--- a/server/src/main/java/com/vaadin/data/validator/ShortRangeValidator.java
+++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyShortRangeValidator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.validator;
+package com.vaadin.legacy.data.validator;
 
 /**
  * Validator for validating that an {@link Short} is inside a given range.
@@ -22,7 +22,7 @@ package com.vaadin.data.validator;
  * @since 7.4
  */
 @SuppressWarnings("serial")
-public class ShortRangeValidator extends RangeValidator<Short> {
+public class LegacyShortRangeValidator extends LegacyRangeValidator<Short> {
 
     /**
      * Creates a validator for checking that an Short is within a given range.
@@ -39,7 +39,7 @@ public class ShortRangeValidator extends RangeValidator<Short> {
      * @param maxValue
      *            The maximum value to accept or null for no limit
      */
-    public ShortRangeValidator(String errorMessage, Short minValue,
+    public LegacyShortRangeValidator(String errorMessage, Short minValue,
             Short maxValue) {
         super(errorMessage, Short.class, minValue, maxValue);
     }
diff --git a/server/src/main/java/com/vaadin/data/validator/StringLengthValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyStringLengthValidator.java
index efb551c614..6d7a1d63e8 100644
--- a/server/src/main/java/com/vaadin/data/validator/StringLengthValidator.java
+++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyStringLengthValidator.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.data.validator;
+package com.vaadin.legacy.data.validator;
 
 /**
  * This <code>StringLengthValidator</code> is used to validate the length of
@@ -24,7 +24,7 @@ package com.vaadin.data.validator;
  * @since 3.0
  */
 @SuppressWarnings("serial")
-public class StringLengthValidator extends AbstractStringValidator {
+public class LegacyStringLengthValidator extends LegacyAbstractStringValidator {
 
     private Integer minLength = null;
 
@@ -38,7 +38,7 @@ public class StringLengthValidator extends AbstractStringValidator {
      * @param errorMessage
      *            the message to display in case the value does not validate.
      */
-    public StringLengthValidator(String errorMessage) {
+    public LegacyStringLengthValidator(String errorMessage) {
         super(errorMessage);
     }
 
@@ -60,7 +60,7 @@ public class StringLengthValidator extends AbstractStringValidator {
      *            Are null strings permissible? This can be handled better by
      *            setting a field as required or not.
      */
-    public StringLengthValidator(String errorMessage, Integer minLength,
+    public LegacyStringLengthValidator(String errorMessage, Integer minLength,
             Integer maxLength, boolean allowNull) {
         this(errorMessage);
         setMinLength(minLength);
diff --git a/server/src/main/java/com/vaadin/ui/DateField.java b/server/src/main/java/com/vaadin/ui/DateField.java
index 23533be3f4..f5a582f571 100644
--- a/server/src/main/java/com/vaadin/ui/DateField.java
+++ b/server/src/main/java/com/vaadin/ui/DateField.java
@@ -30,7 +30,6 @@ import org.jsoup.nodes.Element;
 
 import com.vaadin.data.Property;
 import com.vaadin.data.util.converter.Converter;
-import com.vaadin.data.validator.DateRangeValidator;
 import com.vaadin.event.FieldEvents;
 import com.vaadin.event.FieldEvents.BlurEvent;
 import com.vaadin.event.FieldEvents.BlurListener;
@@ -38,6 +37,7 @@ import com.vaadin.event.FieldEvents.FocusEvent;
 import com.vaadin.event.FieldEvents.FocusListener;
 import com.vaadin.legacy.data.Validator;
 import com.vaadin.legacy.data.Validator.InvalidValueException;
+import com.vaadin.legacy.data.validator.LegacyDateRangeValidator;
 import com.vaadin.legacy.ui.LegacyAbstractField;
 import com.vaadin.legacy.ui.LegacyField;
 import com.vaadin.server.PaintException;
@@ -158,7 +158,7 @@ public class DateField extends LegacyAbstractField<Date> implements
 
     private String dateOutOfRangeMessage = "Date is out of allowed range";
 
-    private DateRangeValidator currentRangeValidator;
+    private LegacyDateRangeValidator currentRangeValidator;
 
     /**
      * Determines whether the ValueChangeEvent should be fired. Used to prevent
@@ -421,7 +421,7 @@ public class DateField extends LegacyAbstractField<Date> implements
             currentRangeValidator = null;
         }
         if (getRangeStart() != null || getRangeEnd() != null) {
-            currentRangeValidator = new DateRangeValidator(
+            currentRangeValidator = new LegacyDateRangeValidator(
                     dateOutOfRangeMessage, getRangeStart(resolution),
                     getRangeEnd(resolution), null);
             addValidator(currentRangeValidator);
diff --git a/server/src/test/java/com/vaadin/tests/data/validator/BigDecimalRangeValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/BigDecimalRangeValidatorTest.java
index abffae9c9e..3821e7c587 100644
--- a/server/src/test/java/com/vaadin/tests/data/validator/BigDecimalRangeValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/validator/BigDecimalRangeValidatorTest.java
@@ -5,17 +5,17 @@ import java.math.BigDecimal;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.data.validator.BigDecimalRangeValidator;
+import com.vaadin.legacy.data.validator.LegacyBigDecimalRangeValidator;
 
 public class BigDecimalRangeValidatorTest {
 
-    private BigDecimalRangeValidator cleanValidator = new BigDecimalRangeValidator(
+    private LegacyBigDecimalRangeValidator cleanValidator = new LegacyBigDecimalRangeValidator(
             "no values", null, null);
-    private BigDecimalRangeValidator minValidator = new BigDecimalRangeValidator(
+    private LegacyBigDecimalRangeValidator minValidator = new LegacyBigDecimalRangeValidator(
             "no values", new BigDecimal(10.1), null);
-    private BigDecimalRangeValidator maxValidator = new BigDecimalRangeValidator(
+    private LegacyBigDecimalRangeValidator maxValidator = new LegacyBigDecimalRangeValidator(
             "no values", null, new BigDecimal(100.1));
-    private BigDecimalRangeValidator minMaxValidator = new BigDecimalRangeValidator(
+    private LegacyBigDecimalRangeValidator minMaxValidator = new LegacyBigDecimalRangeValidator(
             "no values", new BigDecimal(10.5), new BigDecimal(100.5));
 
     @Test
diff --git a/server/src/test/java/com/vaadin/tests/data/validator/BigIntegerRangeValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/BigIntegerRangeValidatorTest.java
index 5f15a63f59..66d45d31ee 100644
--- a/server/src/test/java/com/vaadin/tests/data/validator/BigIntegerRangeValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/validator/BigIntegerRangeValidatorTest.java
@@ -5,17 +5,17 @@ import java.math.BigInteger;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.data.validator.BigIntegerRangeValidator;
+import com.vaadin.legacy.data.validator.LegacyBigIntegerRangeValidator;
 
 public class BigIntegerRangeValidatorTest {
 
-    private BigIntegerRangeValidator cleanValidator = new BigIntegerRangeValidator(
+    private LegacyBigIntegerRangeValidator cleanValidator = new LegacyBigIntegerRangeValidator(
             "no values", null, null);
-    private BigIntegerRangeValidator minValidator = new BigIntegerRangeValidator(
+    private LegacyBigIntegerRangeValidator minValidator = new LegacyBigIntegerRangeValidator(
             "no values", BigInteger.valueOf(10), null);
-    private BigIntegerRangeValidator maxValidator = new BigIntegerRangeValidator(
+    private LegacyBigIntegerRangeValidator maxValidator = new LegacyBigIntegerRangeValidator(
             "no values", null, BigInteger.valueOf(100));
-    private BigIntegerRangeValidator minMaxValidator = new BigIntegerRangeValidator(
+    private LegacyBigIntegerRangeValidator minMaxValidator = new LegacyBigIntegerRangeValidator(
             "no values", BigInteger.valueOf(10), BigInteger.valueOf(100));
 
     @Test
diff --git a/server/src/test/java/com/vaadin/tests/data/validator/ByteRangeValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/ByteRangeValidatorTest.java
index 203c7847e9..2d5b5eafe4 100644
--- a/server/src/test/java/com/vaadin/tests/data/validator/ByteRangeValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/validator/ByteRangeValidatorTest.java
@@ -5,17 +5,17 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-import com.vaadin.data.validator.ByteRangeValidator;
+import com.vaadin.legacy.data.validator.LegacyByteRangeValidator;
 
 public class ByteRangeValidatorTest {
 
-    private ByteRangeValidator cleanValidator = new ByteRangeValidator(
+    private LegacyByteRangeValidator cleanValidator = new LegacyByteRangeValidator(
             "no values", null, null);
-    private ByteRangeValidator minValidator = new ByteRangeValidator(
+    private LegacyByteRangeValidator minValidator = new LegacyByteRangeValidator(
             "no values", (byte) 10, null);
-    private ByteRangeValidator maxValidator = new ByteRangeValidator(
+    private LegacyByteRangeValidator maxValidator = new LegacyByteRangeValidator(
             "no values", null, (byte) 100);
-    private ByteRangeValidator minMaxValidator = new ByteRangeValidator(
+    private LegacyByteRangeValidator minMaxValidator = new LegacyByteRangeValidator(
             "no values", (byte) 10, (byte) 100);
 
     @Test
diff --git a/server/src/test/java/com/vaadin/tests/data/validator/CompositeValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/CompositeValidatorTest.java
index 87234d8317..6a02fd2714 100644
--- a/server/src/test/java/com/vaadin/tests/data/validator/CompositeValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/validator/CompositeValidatorTest.java
@@ -8,20 +8,20 @@ import static org.junit.Assert.fail;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.data.validator.CompositeValidator;
-import com.vaadin.data.validator.CompositeValidator.CombinationMode;
 import com.vaadin.legacy.data.Validator;
-import com.vaadin.data.validator.EmailValidator;
-import com.vaadin.data.validator.RegexpValidator;
+import com.vaadin.legacy.data.validator.LegacyCompositeValidator;
+import com.vaadin.legacy.data.validator.LegacyEmailValidator;
+import com.vaadin.legacy.data.validator.LegacyRegexpValidator;
+import com.vaadin.legacy.data.validator.LegacyCompositeValidator.CombinationMode;
 
 public class CompositeValidatorTest {
 
-    CompositeValidator and = new CompositeValidator(CombinationMode.AND,
+    LegacyCompositeValidator and = new LegacyCompositeValidator(CombinationMode.AND,
             "One validator not valid");
-    CompositeValidator or = new CompositeValidator(CombinationMode.OR,
+    LegacyCompositeValidator or = new LegacyCompositeValidator(CombinationMode.OR,
             "No validators are valid");
-    EmailValidator email = new EmailValidator("Faulty email");
-    RegexpValidator regex = new RegexpValidator("@mail.com", false,
+    LegacyEmailValidator email = new LegacyEmailValidator("Faulty email");
+    LegacyRegexpValidator regex = new LegacyRegexpValidator("@mail.com", false,
             "Partial match validator error");
 
     @Before
diff --git a/server/src/test/java/com/vaadin/tests/data/validator/DateRangeValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/DateRangeValidatorTest.java
index 4beea35905..0a21a0311b 100644
--- a/server/src/test/java/com/vaadin/tests/data/validator/DateRangeValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/validator/DateRangeValidatorTest.java
@@ -11,7 +11,7 @@ import java.util.TimeZone;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.data.validator.DateRangeValidator;
+import com.vaadin.legacy.data.validator.LegacyDateRangeValidator;
 import com.vaadin.shared.ui.datefield.Resolution;
 
 public class DateRangeValidatorTest {
@@ -20,23 +20,23 @@ public class DateRangeValidatorTest {
     Calendar endDate = new GregorianCalendar(TimeZone.getTimeZone("GMT"),
             Locale.ENGLISH);
 
-    private DateRangeValidator cleanValidator;
-    private DateRangeValidator minValidator;
-    private DateRangeValidator maxValidator;
-    private DateRangeValidator minMaxValidator;
+    private LegacyDateRangeValidator cleanValidator;
+    private LegacyDateRangeValidator minValidator;
+    private LegacyDateRangeValidator maxValidator;
+    private LegacyDateRangeValidator minMaxValidator;
 
     @Before
     public void setUp() {
         startDate.set(2000, Calendar.JANUARY, 1, 12, 0, 0);
         endDate.set(2000, Calendar.FEBRUARY, 20, 12, 0, 0);
 
-        cleanValidator = new DateRangeValidator("Given date outside range",
+        cleanValidator = new LegacyDateRangeValidator("Given date outside range",
                 null, null, Resolution.DAY);
-        minValidator = new DateRangeValidator("Given date before startDate",
+        minValidator = new LegacyDateRangeValidator("Given date before startDate",
                 startDate.getTime(), null, Resolution.DAY);
-        maxValidator = new DateRangeValidator("Given date after endDate", null,
+        maxValidator = new LegacyDateRangeValidator("Given date after endDate", null,
                 endDate.getTime(), Resolution.DAY);
-        minMaxValidator = new DateRangeValidator("Given date outside range",
+        minMaxValidator = new LegacyDateRangeValidator("Given date outside range",
                 startDate.getTime(), endDate.getTime(), Resolution.DAY);
     }
 
diff --git a/server/src/test/java/com/vaadin/tests/data/validator/DoubleRangeValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/DoubleRangeValidatorTest.java
index 81fb9b0ac6..bab8c6bbad 100644
--- a/server/src/test/java/com/vaadin/tests/data/validator/DoubleRangeValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/validator/DoubleRangeValidatorTest.java
@@ -5,17 +5,17 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-import com.vaadin.data.validator.DoubleRangeValidator;
+import com.vaadin.legacy.data.validator.LegacyDoubleRangeValidator;
 
 public class DoubleRangeValidatorTest {
 
-    private DoubleRangeValidator cleanValidator = new DoubleRangeValidator(
+    private LegacyDoubleRangeValidator cleanValidator = new LegacyDoubleRangeValidator(
             "no values", null, null);
-    private DoubleRangeValidator minValidator = new DoubleRangeValidator(
+    private LegacyDoubleRangeValidator minValidator = new LegacyDoubleRangeValidator(
             "no values", 10.1, null);
-    private DoubleRangeValidator maxValidator = new DoubleRangeValidator(
+    private LegacyDoubleRangeValidator maxValidator = new LegacyDoubleRangeValidator(
             "no values", null, 100.1);
-    private DoubleRangeValidator minMaxValidator = new DoubleRangeValidator(
+    private LegacyDoubleRangeValidator minMaxValidator = new LegacyDoubleRangeValidator(
             "no values", 10.5, 100.5);
 
     @Test
diff --git a/server/src/test/java/com/vaadin/tests/data/validator/EmailValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/EmailValidatorTest.java
index 97d304d7df..9c810449dc 100644
--- a/server/src/test/java/com/vaadin/tests/data/validator/EmailValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/validator/EmailValidatorTest.java
@@ -3,11 +3,11 @@ package com.vaadin.tests.data.validator;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.data.validator.EmailValidator;
+import com.vaadin.legacy.data.validator.LegacyEmailValidator;
 
 public class EmailValidatorTest {
 
-    private EmailValidator validator = new EmailValidator("Error");
+    private LegacyEmailValidator validator = new LegacyEmailValidator("Error");
 
     @Test
     public void testEmailValidatorWithNull() {
diff --git a/server/src/test/java/com/vaadin/tests/data/validator/FloatRangeValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/FloatRangeValidatorTest.java
index db4b73fd1b..07d19434cf 100644
--- a/server/src/test/java/com/vaadin/tests/data/validator/FloatRangeValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/validator/FloatRangeValidatorTest.java
@@ -5,17 +5,17 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-import com.vaadin.data.validator.FloatRangeValidator;
+import com.vaadin.legacy.data.validator.LegacyFloatRangeValidator;
 
 public class FloatRangeValidatorTest {
 
-    private FloatRangeValidator cleanValidator = new FloatRangeValidator(
+    private LegacyFloatRangeValidator cleanValidator = new LegacyFloatRangeValidator(
             "no values", null, null);
-    private FloatRangeValidator minValidator = new FloatRangeValidator(
+    private LegacyFloatRangeValidator minValidator = new LegacyFloatRangeValidator(
             "no values", 10.1f, null);
-    private FloatRangeValidator maxValidator = new FloatRangeValidator(
+    private LegacyFloatRangeValidator maxValidator = new LegacyFloatRangeValidator(
             "no values", null, 100.1f);
-    private FloatRangeValidator minMaxValidator = new FloatRangeValidator(
+    private LegacyFloatRangeValidator minMaxValidator = new LegacyFloatRangeValidator(
             "no values", 10.5f, 100.5f);
 
     @Test
diff --git a/server/src/test/java/com/vaadin/tests/data/validator/IntegerRangeValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/IntegerRangeValidatorTest.java
index 8a572cb327..5d5869289a 100644
--- a/server/src/test/java/com/vaadin/tests/data/validator/IntegerRangeValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/validator/IntegerRangeValidatorTest.java
@@ -5,17 +5,17 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-import com.vaadin.data.validator.IntegerRangeValidator;
+import com.vaadin.legacy.data.validator.LegacyIntegerRangeValidator;
 
 public class IntegerRangeValidatorTest {
 
-    private IntegerRangeValidator cleanValidator = new IntegerRangeValidator(
+    private LegacyIntegerRangeValidator cleanValidator = new LegacyIntegerRangeValidator(
             "no values", null, null);
-    private IntegerRangeValidator minValidator = new IntegerRangeValidator(
+    private LegacyIntegerRangeValidator minValidator = new LegacyIntegerRangeValidator(
             "no values", 10, null);
-    private IntegerRangeValidator maxValidator = new IntegerRangeValidator(
+    private LegacyIntegerRangeValidator maxValidator = new LegacyIntegerRangeValidator(
             "no values", null, 100);
-    private IntegerRangeValidator minMaxValidator = new IntegerRangeValidator(
+    private LegacyIntegerRangeValidator minMaxValidator = new LegacyIntegerRangeValidator(
             "no values", 10, 100);
 
     @Test
diff --git a/server/src/test/java/com/vaadin/tests/data/validator/LongRangeValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/LongRangeValidatorTest.java
index 436e3224a4..c61cab98ff 100644
--- a/server/src/test/java/com/vaadin/tests/data/validator/LongRangeValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/validator/LongRangeValidatorTest.java
@@ -5,17 +5,17 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-import com.vaadin.data.validator.LongRangeValidator;
+import com.vaadin.legacy.data.validator.LegacyLongRangeValidator;
 
 public class LongRangeValidatorTest {
 
-    private LongRangeValidator cleanValidator = new LongRangeValidator(
+    private LegacyLongRangeValidator cleanValidator = new LegacyLongRangeValidator(
             "no values", null, null);
-    private LongRangeValidator minValidator = new LongRangeValidator(
+    private LegacyLongRangeValidator minValidator = new LegacyLongRangeValidator(
             "no values", 10l, null);
-    private LongRangeValidator maxValidator = new LongRangeValidator(
+    private LegacyLongRangeValidator maxValidator = new LegacyLongRangeValidator(
             "no values", null, 100l);
-    private LongRangeValidator minMaxValidator = new LongRangeValidator(
+    private LegacyLongRangeValidator minMaxValidator = new LegacyLongRangeValidator(
             "no values", 10l, 100l);
 
     @Test
diff --git a/server/src/test/java/com/vaadin/tests/data/validator/NullValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/NullValidatorTest.java
index d38bad9b62..b73d5059b3 100644
--- a/server/src/test/java/com/vaadin/tests/data/validator/NullValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/validator/NullValidatorTest.java
@@ -5,13 +5,13 @@ import static org.junit.Assert.fail;
 
 import org.junit.Test;
 
-import com.vaadin.data.validator.NullValidator;
 import com.vaadin.legacy.data.Validator;
+import com.vaadin.legacy.data.validator.LegacyNullValidator;
 
 public class NullValidatorTest {
 
-    NullValidator notNull = new NullValidator("Null not accepted", false);
-    NullValidator onlyNull = new NullValidator("Only null accepted", true);
+    LegacyNullValidator notNull = new LegacyNullValidator("Null not accepted", false);
+    LegacyNullValidator onlyNull = new LegacyNullValidator("Only null accepted", true);
 
     @Test
     public void testNullValue() {
diff --git a/server/src/test/java/com/vaadin/tests/data/validator/RegexpValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/RegexpValidatorTest.java
index 7776d89293..aa23c8e3dc 100644
--- a/server/src/test/java/com/vaadin/tests/data/validator/RegexpValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/validator/RegexpValidatorTest.java
@@ -5,13 +5,13 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-import com.vaadin.data.validator.RegexpValidator;
+import com.vaadin.legacy.data.validator.LegacyRegexpValidator;
 
 public class RegexpValidatorTest {
 
-    private RegexpValidator completeValidator = new RegexpValidator("pattern",
+    private LegacyRegexpValidator completeValidator = new LegacyRegexpValidator("pattern",
             true, "Complete match validator error");
-    private RegexpValidator partialValidator = new RegexpValidator("pattern",
+    private LegacyRegexpValidator partialValidator = new LegacyRegexpValidator("pattern",
             false, "Partial match validator error");
 
     @Test
diff --git a/server/src/test/java/com/vaadin/tests/data/validator/ShortRangeValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/ShortRangeValidatorTest.java
index d3534ebe97..c502236dfd 100644
--- a/server/src/test/java/com/vaadin/tests/data/validator/ShortRangeValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/validator/ShortRangeValidatorTest.java
@@ -5,17 +5,17 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-import com.vaadin.data.validator.ShortRangeValidator;
+import com.vaadin.legacy.data.validator.LegacyShortRangeValidator;
 
 public class ShortRangeValidatorTest {
 
-    private ShortRangeValidator cleanValidator = new ShortRangeValidator(
+    private LegacyShortRangeValidator cleanValidator = new LegacyShortRangeValidator(
             "no values", null, null);
-    private ShortRangeValidator minValidator = new ShortRangeValidator(
+    private LegacyShortRangeValidator minValidator = new LegacyShortRangeValidator(
             "no values", (short) 10, null);
-    private ShortRangeValidator maxValidator = new ShortRangeValidator(
+    private LegacyShortRangeValidator maxValidator = new LegacyShortRangeValidator(
             "no values", null, (short) 100);
-    private ShortRangeValidator minMaxValidator = new ShortRangeValidator(
+    private LegacyShortRangeValidator minMaxValidator = new LegacyShortRangeValidator(
             "no values", (short) 10, (short) 100);
 
     @Test
diff --git a/server/src/test/java/com/vaadin/tests/data/validator/StringLengthValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/StringLengthValidatorTest.java
index de925f479f..cb6730776c 100644
--- a/server/src/test/java/com/vaadin/tests/data/validator/StringLengthValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/validator/StringLengthValidatorTest.java
@@ -5,16 +5,16 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-import com.vaadin.data.validator.StringLengthValidator;
+import com.vaadin.legacy.data.validator.LegacyStringLengthValidator;
 
 public class StringLengthValidatorTest {
 
-    private StringLengthValidator validator = new StringLengthValidator("Error");
-    private StringLengthValidator validatorNoNull = new StringLengthValidator(
+    private LegacyStringLengthValidator validator = new LegacyStringLengthValidator("Error");
+    private LegacyStringLengthValidator validatorNoNull = new LegacyStringLengthValidator(
             "Error", 1, 5, false);
-    private StringLengthValidator validatorMinValue = new StringLengthValidator(
+    private LegacyStringLengthValidator validatorMinValue = new LegacyStringLengthValidator(
             "Error", 5, null, true);
-    private StringLengthValidator validatorMaxValue = new StringLengthValidator(
+    private LegacyStringLengthValidator validatorMaxValue = new LegacyStringLengthValidator(
             "Error", null, 15, true);
 
     @Test
diff --git a/server/src/test/java/com/vaadin/tests/server/SerializationTest.java b/server/src/test/java/com/vaadin/tests/server/SerializationTest.java
index 349a2c525e..995781f9bc 100644
--- a/server/src/test/java/com/vaadin/tests/server/SerializationTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/SerializationTest.java
@@ -15,7 +15,7 @@ import com.vaadin.data.Item;
 import com.vaadin.data.Property;
 import com.vaadin.data.util.IndexedContainer;
 import com.vaadin.data.util.MethodProperty;
-import com.vaadin.data.validator.RegexpValidator;
+import com.vaadin.legacy.data.validator.LegacyRegexpValidator;
 import com.vaadin.server.VaadinSession;
 import com.vaadin.ui.Form;
 
@@ -23,9 +23,9 @@ public class SerializationTest {
 
     @Test
     public void testValidators() throws Exception {
-        RegexpValidator validator = new RegexpValidator(".*", "Error");
+        LegacyRegexpValidator validator = new LegacyRegexpValidator(".*", "Error");
         validator.validate("aaa");
-        RegexpValidator validator2 = serializeAndDeserialize(validator);
+        LegacyRegexpValidator validator2 = serializeAndDeserialize(validator);
         validator2.validate("aaa");
     }
 
diff --git a/server/src/test/java/com/vaadin/tests/server/component/textfield/TextFieldWithConverterAndValidatorTest.java b/server/src/test/java/com/vaadin/tests/server/component/textfield/TextFieldWithConverterAndValidatorTest.java
index 76cd1c7a39..3c417fe4ce 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/textfield/TextFieldWithConverterAndValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/textfield/TextFieldWithConverterAndValidatorTest.java
@@ -4,7 +4,7 @@ import org.junit.Before;
 import org.junit.Test;
 
 import com.vaadin.data.util.ObjectProperty;
-import com.vaadin.data.validator.RangeValidator;
+import com.vaadin.legacy.data.validator.LegacyRangeValidator;
 import com.vaadin.tests.data.converter.ConverterFactoryTest.ConvertTo42;
 import com.vaadin.ui.TextField;
 
@@ -25,7 +25,7 @@ public class TextFieldWithConverterAndValidatorTest {
         field.setConverter(new ConvertTo42());
         field.setPropertyDataSource(property);
 
-        field.addValidator(new RangeValidator<Integer>("Incorrect value",
+        field.addValidator(new LegacyRangeValidator<Integer>("Incorrect value",
                 Integer.class, 42, 42));
 
         // succeeds
diff --git a/server/src/test/java/com/vaadin/tests/server/component/textfield/TextFieldWithValidatorTest.java b/server/src/test/java/com/vaadin/tests/server/component/textfield/TextFieldWithValidatorTest.java
index fb18ed0e06..2f3430e2dc 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/textfield/TextFieldWithValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/textfield/TextFieldWithValidatorTest.java
@@ -6,11 +6,11 @@ import org.junit.Before;
 import org.junit.Test;
 
 import com.vaadin.data.util.ObjectProperty;
-import com.vaadin.data.validator.EmailValidator;
-import com.vaadin.data.validator.RegexpValidator;
-import com.vaadin.data.validator.StringLengthValidator;
 import com.vaadin.legacy.data.Validator;
 import com.vaadin.legacy.data.Validator.InvalidValueException;
+import com.vaadin.legacy.data.validator.LegacyEmailValidator;
+import com.vaadin.legacy.data.validator.LegacyRegexpValidator;
+import com.vaadin.legacy.data.validator.LegacyStringLengthValidator;
 import com.vaadin.ui.TextField;
 
 public class TextFieldWithValidatorTest {
@@ -29,9 +29,9 @@ public class TextFieldWithValidatorTest {
 
     @Test
     public void testMultipleValidators() {
-        field.addValidator(new StringLengthValidator(
+        field.addValidator(new LegacyStringLengthValidator(
                 "Length not between 1 and 3", 1, 3, false));
-        field.addValidator(new StringLengthValidator(
+        field.addValidator(new LegacyStringLengthValidator(
                 "Length not between 2 and 4", 2, 4, false));
 
         // fails
@@ -54,9 +54,9 @@ public class TextFieldWithValidatorTest {
 
     @Test
     public void testRemoveValidator() {
-        Validator validator1 = new StringLengthValidator(
+        Validator validator1 = new LegacyStringLengthValidator(
                 "Length not between 1 and 3", 1, 3, false);
-        Validator validator2 = new StringLengthValidator(
+        Validator validator2 = new LegacyStringLengthValidator(
                 "Length not between 2 and 4", 2, 4, false);
 
         field.addValidator(validator1);
@@ -78,9 +78,9 @@ public class TextFieldWithValidatorTest {
 
     @Test
     public void testRemoveAllValidators() {
-        Validator validator1 = new StringLengthValidator(
+        Validator validator1 = new LegacyStringLengthValidator(
                 "Length not between 1 and 3", 1, 3, false);
-        Validator validator2 = new StringLengthValidator(
+        Validator validator2 = new LegacyStringLengthValidator(
                 "Length not between 2 and 4", 2, 4, false);
 
         field.addValidator(validator1);
@@ -95,7 +95,7 @@ public class TextFieldWithValidatorTest {
 
     @Test
     public void testEmailValidator() {
-        field.addValidator(new EmailValidator("Invalid e-mail address"));
+        field.addValidator(new LegacyEmailValidator("Invalid e-mail address"));
 
         // not required
 
@@ -152,7 +152,7 @@ public class TextFieldWithValidatorTest {
 
     @Test
     public void testRegexpValidator() {
-        field.addValidator(new RegexpValidator("pattern", true,
+        field.addValidator(new LegacyRegexpValidator("pattern", true,
                 "Validation failed"));
         field.setRequired(false);
 
diff --git a/server/src/test/java/com/vaadin/tests/server/validation/BeanValidationTest.java b/server/src/test/java/com/vaadin/tests/server/validation/BeanValidationTest.java
index eb4cbd37a4..70727f1690 100644
--- a/server/src/test/java/com/vaadin/tests/server/validation/BeanValidationTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/validation/BeanValidationTest.java
@@ -4,55 +4,55 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.data.fieldgroup.BeanFieldGroup;
-import com.vaadin.data.validator.BeanValidator;
 import com.vaadin.legacy.data.Validator.InvalidValueException;
+import com.vaadin.legacy.data.validator.LegacyBeanValidator;
 import com.vaadin.legacy.ui.LegacyField;
 import com.vaadin.tests.data.bean.BeanToValidate;
 
 public class BeanValidationTest {
     @Test(expected = InvalidValueException.class)
     public void testBeanValidationNull() {
-        BeanValidator validator = new BeanValidator(BeanToValidate.class,
+        LegacyBeanValidator validator = new LegacyBeanValidator(BeanToValidate.class,
                 "firstname");
         validator.validate(null);
     }
 
     @Test(expected = InvalidValueException.class)
     public void testBeanValidationStringTooShort() {
-        BeanValidator validator = new BeanValidator(BeanToValidate.class,
+        LegacyBeanValidator validator = new LegacyBeanValidator(BeanToValidate.class,
                 "firstname");
         validator.validate("aa");
     }
 
     @Test
     public void testBeanValidationStringOk() {
-        BeanValidator validator = new BeanValidator(BeanToValidate.class,
+        LegacyBeanValidator validator = new LegacyBeanValidator(BeanToValidate.class,
                 "firstname");
         validator.validate("aaa");
     }
 
     @Test(expected = InvalidValueException.class)
     public void testBeanValidationIntegerTooSmall() {
-        BeanValidator validator = new BeanValidator(BeanToValidate.class, "age");
+        LegacyBeanValidator validator = new LegacyBeanValidator(BeanToValidate.class, "age");
         validator.validate(17);
     }
 
     @Test
     public void testBeanValidationIntegerOk() {
-        BeanValidator validator = new BeanValidator(BeanToValidate.class, "age");
+        LegacyBeanValidator validator = new LegacyBeanValidator(BeanToValidate.class, "age");
         validator.validate(18);
     }
 
     @Test(expected = InvalidValueException.class)
     public void testBeanValidationTooManyDigits() {
-        BeanValidator validator = new BeanValidator(BeanToValidate.class,
+        LegacyBeanValidator validator = new LegacyBeanValidator(BeanToValidate.class,
                 "decimals");
         validator.validate("1234.567");
     }
 
     @Test
     public void testBeanValidationDigitsOk() {
-        BeanValidator validator = new BeanValidator(BeanToValidate.class,
+        LegacyBeanValidator validator = new LegacyBeanValidator(BeanToValidate.class,
                 "decimals");
         validator.validate("123.45");
     }
@@ -60,7 +60,7 @@ public class BeanValidationTest {
     @Test
     public void testBeanValidationException_OneValidationError() {
         InvalidValueException[] causes = null;
-        BeanValidator validator = new BeanValidator(BeanToValidate.class,
+        LegacyBeanValidator validator = new LegacyBeanValidator(BeanToValidate.class,
                 "lastname");
         try {
             validator.validate(null);
@@ -74,7 +74,7 @@ public class BeanValidationTest {
     @Test
     public void testBeanValidationsException_TwoValidationErrors() {
         InvalidValueException[] causes = null;
-        BeanValidator validator = new BeanValidator(BeanToValidate.class,
+        LegacyBeanValidator validator = new LegacyBeanValidator(BeanToValidate.class,
                 "nickname");
         try {
             validator.validate("A");
diff --git a/server/src/test/java/com/vaadin/tests/server/validation/RangeValidatorTest.java b/server/src/test/java/com/vaadin/tests/server/validation/RangeValidatorTest.java
index 86c1083269..dfd157c8bb 100644
--- a/server/src/test/java/com/vaadin/tests/server/validation/RangeValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/validation/RangeValidatorTest.java
@@ -5,7 +5,7 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-import com.vaadin.data.validator.IntegerRangeValidator;
+import com.vaadin.legacy.data.validator.LegacyIntegerRangeValidator;
 
 public class RangeValidatorTest {
 
@@ -14,7 +14,7 @@ public class RangeValidatorTest {
     // RangeValidator
     @Test
     public void testMinValueNonInclusive() {
-        IntegerRangeValidator iv = new IntegerRangeValidator("Failed", 0, 10);
+        LegacyIntegerRangeValidator iv = new LegacyIntegerRangeValidator("Failed", 0, 10);
         iv.setMinValueIncluded(false);
         assertFalse(iv.isValid(0));
         assertTrue(iv.isValid(10));
@@ -24,7 +24,7 @@ public class RangeValidatorTest {
 
     @Test
     public void testMinMaxValuesInclusive() {
-        IntegerRangeValidator iv = new IntegerRangeValidator("Failed", 0, 10);
+        LegacyIntegerRangeValidator iv = new LegacyIntegerRangeValidator("Failed", 0, 10);
         assertTrue(iv.isValid(0));
         assertTrue(iv.isValid(1));
         assertTrue(iv.isValid(10));
@@ -34,7 +34,7 @@ public class RangeValidatorTest {
 
     @Test
     public void testMaxValueNonInclusive() {
-        IntegerRangeValidator iv = new IntegerRangeValidator("Failed", 0, 10);
+        LegacyIntegerRangeValidator iv = new LegacyIntegerRangeValidator("Failed", 0, 10);
         iv.setMaxValueIncluded(false);
         assertTrue(iv.isValid(0));
         assertTrue(iv.isValid(9));
@@ -45,7 +45,7 @@ public class RangeValidatorTest {
 
     @Test
     public void testMinMaxValuesNonInclusive() {
-        IntegerRangeValidator iv = new IntegerRangeValidator("Failed", 0, 10);
+        LegacyIntegerRangeValidator iv = new LegacyIntegerRangeValidator("Failed", 0, 10);
         iv.setMinValueIncluded(false);
         iv.setMaxValueIncluded(false);
 
diff --git a/server/src/test/java/com/vaadin/tests/server/validation/ReadOnlyValidationTest.java b/server/src/test/java/com/vaadin/tests/server/validation/ReadOnlyValidationTest.java
index 661236e597..6533f92ad8 100644
--- a/server/src/test/java/com/vaadin/tests/server/validation/ReadOnlyValidationTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/validation/ReadOnlyValidationTest.java
@@ -2,7 +2,7 @@ package com.vaadin.tests.server.validation;
 
 import org.junit.Test;
 
-import com.vaadin.data.validator.IntegerValidator;
+import com.vaadin.legacy.data.validator.LegacyIntegerValidator;
 import com.vaadin.ui.TextField;
 
 public class ReadOnlyValidationTest {
@@ -10,7 +10,7 @@ public class ReadOnlyValidationTest {
     @Test
     public void testIntegerValidation() {
         TextField field = new TextField();
-        field.addValidator(new IntegerValidator("Enter a Valid Number"));
+        field.addValidator(new LegacyIntegerValidator("Enter a Valid Number"));
         field.setValue(String.valueOf(10));
         field.validate();
     }