Move Validator and Validatable into legacy package.

Change-Id: I7f8e9b1f7dff40ca76933cdf1978e3749f390142
vaadin · Aug 9, 2016 · fd651d7 · fd651d7
1 parent d41411e
commit fd651d7
Show file tree

Hide file tree

Showing 43 changed files with 61 additions and 59 deletions.
diff --git a/server/src/main/java/com/vaadin/data/Buffered.java b/server/src/main/java/com/vaadin/data/Buffered.java
@@ -18,7 +18,7 @@
 
 import java.io.Serializable;
 
-import com.vaadin.data.Validator.InvalidValueException;
+import com.vaadin.legacy.data.Validator.InvalidValueException;
 
 /**
  * <p>

diff --git a/server/src/main/java/com/vaadin/data/BufferedValidatable.java b/server/src/main/java/com/vaadin/data/BufferedValidatable.java
@@ -18,6 +18,8 @@
 
 import java.io.Serializable;
 
+import com.vaadin.legacy.data.Validatable;
+
 /**
  * <p>
  * This interface defines the combination of <code>Validatable</code> and

diff --git a/server/src/main/java/com/vaadin/data/fieldgroup/FieldGroup.java b/server/src/main/java/com/vaadin/data/fieldgroup/FieldGroup.java
@@ -27,9 +27,9 @@
 
 import com.vaadin.data.Item;
 import com.vaadin.data.Property;
-import com.vaadin.data.Validator.InvalidValueException;
 import com.vaadin.data.util.TransactionalPropertyWrapper;
 import com.vaadin.legacy.ui.LegacyField;
+import com.vaadin.legacy.data.Validator.InvalidValueException;
 import com.vaadin.legacy.ui.LegacyAbstractField;
 import com.vaadin.ui.DefaultFieldFactory;
 import com.vaadin.ui.Form;

diff --git a/server/src/main/java/com/vaadin/data/validator/AbstractValidator.java b/server/src/main/java/com/vaadin/data/validator/AbstractValidator.java
@@ -15,10 +15,10 @@
  */
 package com.vaadin.data.validator;
 
-import com.vaadin.data.Validator;
+import com.vaadin.legacy.data.Validator;
 
 /**
- * Abstract {@link com.vaadin.data.Validator Validator} implementation that
+ * Abstract {@link com.vaadin.legacy.data.Validator Validator} implementation that
  * provides a basic Validator implementation except the
  * {@link #isValidValue(Object)} method.
  * <p>

diff --git a/server/src/main/java/com/vaadin/data/validator/BeanValidator.java b/server/src/main/java/com/vaadin/data/validator/BeanValidator.java
@@ -26,7 +26,7 @@
 import javax.validation.ValidatorFactory;
 import javax.validation.metadata.ConstraintDescriptor;
 
-import com.vaadin.data.Validator;
+import com.vaadin.legacy.data.Validator;
 
 /**
  * Vaadin {@link Validator} using the JSR-303 (javax.validation)

diff --git a/server/src/main/java/com/vaadin/data/validator/CompositeValidator.java b/server/src/main/java/com/vaadin/data/validator/CompositeValidator.java
@@ -21,7 +21,7 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import com.vaadin.data.Validator;
+import com.vaadin.legacy.data.Validator;
 
 /**
  * The <code>CompositeValidator</code> allows you to chain (compose) many

diff --git a/server/src/main/java/com/vaadin/data/validator/NullValidator.java b/server/src/main/java/com/vaadin/data/validator/NullValidator.java
@@ -16,7 +16,7 @@
 
 package com.vaadin.data.validator;
 
-import com.vaadin.data.Validator;
+import com.vaadin.legacy.data.Validator;
 
 /**
  * This validator is used for validating properties that do or do not allow null

diff --git a/...ain/java/com/vaadin/data/Validatable.java → ...a/com/vaadin/legacy/data/Validatable.java b/...ain/java/com/vaadin/data/Validatable.java → ...a/com/vaadin/legacy/data/Validatable.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.data;
+package com.vaadin.legacy.data;
 
 import java.io.Serializable;
 import java.util.Collection;
@@ -28,7 +28,7 @@
  * 
  * @author Vaadin Ltd.
  * @since 3.0
- * @see com.vaadin.data.Validator
+ * @see com.vaadin.legacy.data.Validator
  */
 public interface Validatable extends Serializable {
 

diff --git a/.../main/java/com/vaadin/data/Validator.java → ...ava/com/vaadin/legacy/data/Validator.java b/.../main/java/com/vaadin/data/Validator.java → ...ava/com/vaadin/legacy/data/Validator.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.data;
+package com.vaadin.legacy.data;
 
 import java.io.Serializable;
 
@@ -25,7 +25,7 @@
  * valid or not.
  * <p>
  * Implementors of this class can be added to any
- * {@link com.vaadin.data.Validatable Validatable} implementor to verify its
+ * {@link com.vaadin.legacy.data.Validatable Validatable} implementor to verify its
  * value.
  * </p>
  * <p>

diff --git a/server/src/main/java/com/vaadin/legacy/ui/LegacyAbstractField.java b/server/src/main/java/com/vaadin/legacy/ui/LegacyAbstractField.java
@@ -32,16 +32,16 @@
 
 import com.vaadin.data.Buffered;
 import com.vaadin.data.Property;
-import com.vaadin.data.Validatable;
-import com.vaadin.data.Validator;
-import com.vaadin.data.Validator.InvalidValueException;
 import com.vaadin.data.util.LegacyPropertyHelper;
 import com.vaadin.data.util.converter.Converter;
 import com.vaadin.data.util.converter.Converter.ConversionException;
 import com.vaadin.data.util.converter.ConverterUtil;
 import com.vaadin.event.Action;
 import com.vaadin.event.ShortcutAction;
 import com.vaadin.event.ShortcutListener;
+import com.vaadin.legacy.data.Validatable;
+import com.vaadin.legacy.data.Validator;
+import com.vaadin.legacy.data.Validator.InvalidValueException;
 import com.vaadin.server.AbstractErrorMessage;
 import com.vaadin.server.CompositeErrorMessage;
 import com.vaadin.server.ErrorMessage;
@@ -69,7 +69,7 @@
  * </p>
  * 
  * <p>
- * The class also supports {@link com.vaadin.data.Validator validators} to make
+ * The class also supports {@link com.vaadin.legacy.data.Validator validators} to make
  * sure the value contained in the field is valid.
  * </p>
  * 
@@ -962,7 +962,7 @@ public boolean isValid() {
      * is required and empty this method throws an EmptyValueException with the
      * error message set using {@link #setRequiredError(String)}.
      * 
-     * @see com.vaadin.data.Validatable#validate()
+     * @see com.vaadin.legacy.data.Validatable#validate()
      */
     @Override
     public void validate() throws Validator.InvalidValueException {
@@ -1035,7 +1035,7 @@ protected void validate(T fieldValue)
      * because the field otherwise visually forget the user input immediately.
      * 
      * @return true iff the invalid values are allowed.
-     * @see com.vaadin.data.Validatable#isInvalidAllowed()
+     * @see com.vaadin.legacy.data.Validatable#isInvalidAllowed()
      */
     @Override
     public boolean isInvalidAllowed() {
@@ -1053,7 +1053,7 @@ public boolean isInvalidAllowed() {
      * datasource is set.
      * </p>
      * 
-     * @see com.vaadin.data.Validatable#setInvalidAllowed(boolean)
+     * @see com.vaadin.legacy.data.Validatable#setInvalidAllowed(boolean)
      */
     @Override
     public void setInvalidAllowed(boolean invalidAllowed)

diff --git a/server/src/main/java/com/vaadin/server/AbstractErrorMessage.java b/server/src/main/java/com/vaadin/server/AbstractErrorMessage.java
@@ -22,7 +22,7 @@
 import java.util.List;
 
 import com.vaadin.data.Buffered;
-import com.vaadin.data.Validator;
+import com.vaadin.legacy.data.Validator;
 
 /**
  * Base class for component error messages.

diff --git a/server/src/main/java/com/vaadin/ui/AbstractSelect.java b/server/src/main/java/com/vaadin/ui/AbstractSelect.java
@@ -34,7 +34,6 @@
 import com.vaadin.data.Container;
 import com.vaadin.data.Item;
 import com.vaadin.data.Property;
-import com.vaadin.data.Validator.InvalidValueException;
 import com.vaadin.data.util.IndexedContainer;
 import com.vaadin.data.util.converter.Converter;
 import com.vaadin.data.util.converter.Converter.ConversionException;
@@ -47,6 +46,7 @@
 import com.vaadin.event.dd.acceptcriteria.ClientSideCriterion;
 import com.vaadin.event.dd.acceptcriteria.ContainsDataFlavor;
 import com.vaadin.event.dd.acceptcriteria.TargetDetailIs;
+import com.vaadin.legacy.data.Validator.InvalidValueException;
 import com.vaadin.legacy.ui.LegacyAbstractField;
 import com.vaadin.server.KeyMapper;
 import com.vaadin.server.PaintException;

diff --git a/server/src/main/java/com/vaadin/ui/DateField.java b/server/src/main/java/com/vaadin/ui/DateField.java
@@ -29,15 +29,15 @@
 import org.jsoup.nodes.Element;
 
 import com.vaadin.data.Property;
-import com.vaadin.data.Validator;
-import com.vaadin.data.Validator.InvalidValueException;
 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;
 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.ui.LegacyAbstractField;
 import com.vaadin.legacy.ui.LegacyField;
 import com.vaadin.server.PaintException;

diff --git a/server/src/main/java/com/vaadin/ui/Form.java b/server/src/main/java/com/vaadin/ui/Form.java
@@ -27,15 +27,15 @@
 import com.vaadin.data.Buffered;
 import com.vaadin.data.Item;
 import com.vaadin.data.Property;
-import com.vaadin.data.Validatable;
-import com.vaadin.data.Validator;
-import com.vaadin.data.Validator.InvalidValueException;
 import com.vaadin.data.fieldgroup.FieldGroup;
 import com.vaadin.data.util.BeanItem;
 import com.vaadin.event.Action;
 import com.vaadin.event.Action.Handler;
 import com.vaadin.event.Action.ShortcutNotifier;
 import com.vaadin.event.ActionManager;
+import com.vaadin.legacy.data.Validatable;
+import com.vaadin.legacy.data.Validator;
+import com.vaadin.legacy.data.Validator.InvalidValueException;
 import com.vaadin.legacy.ui.LegacyAbstractField;
 import com.vaadin.legacy.ui.LegacyField;
 import com.vaadin.server.AbstractErrorMessage;
@@ -959,7 +959,7 @@ public AbstractSelect replaceWithSelect(Object propertyId, Object[] values,
     /**
      * Checks the validity of the Form and all of its fields.
      * 
-     * @see com.vaadin.data.Validatable#validate()
+     * @see com.vaadin.legacy.data.Validatable#validate()
      */
     @Override
     public void validate() throws InvalidValueException {
@@ -972,7 +972,7 @@ public void validate() throws InvalidValueException {
     /**
      * Checks the validabtable object accept invalid values.
      * 
-     * @see com.vaadin.data.Validatable#isInvalidAllowed()
+     * @see com.vaadin.legacy.data.Validatable#isInvalidAllowed()
      */
     @Override
     public boolean isInvalidAllowed() {
@@ -982,7 +982,7 @@ public boolean isInvalidAllowed() {
     /**
      * Should the validabtable object accept invalid values.
      * 
-     * @see com.vaadin.data.Validatable#setInvalidAllowed(boolean)
+     * @see com.vaadin.legacy.data.Validatable#setInvalidAllowed(boolean)
      */
     @Override
     public void setInvalidAllowed(boolean invalidValueAllowed)

diff --git a/server/src/main/java/com/vaadin/ui/Grid.java b/server/src/main/java/com/vaadin/ui/Grid.java
@@ -53,7 +53,6 @@
 import com.vaadin.data.Container.Sortable;
 import com.vaadin.data.Item;
 import com.vaadin.data.Property;
-import com.vaadin.data.Validator.InvalidValueException;
 import com.vaadin.data.fieldgroup.DefaultFieldGroupFieldFactory;
 import com.vaadin.data.fieldgroup.FieldGroup;
 import com.vaadin.data.fieldgroup.FieldGroup.CommitException;
@@ -73,6 +72,7 @@
 import com.vaadin.event.SortEvent;
 import com.vaadin.event.SortEvent.SortListener;
 import com.vaadin.event.SortEvent.SortNotifier;
+import com.vaadin.legacy.data.Validator.InvalidValueException;
 import com.vaadin.legacy.ui.LegacyField;
 import com.vaadin.server.AbstractClientConnector;
 import com.vaadin.server.AbstractExtension;

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
@@ -8,9 +8,9 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.data.Validator;
 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;
 

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
@@ -5,8 +5,8 @@
 
 import org.junit.Test;
 
-import com.vaadin.data.Validator;
 import com.vaadin.data.validator.NullValidator;
+import com.vaadin.legacy.data.Validator;
 
 public class NullValidatorTest {
 

diff --git a/...src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValidatorsTest.java b/...src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValidatorsTest.java
@@ -8,7 +8,7 @@
 import org.easymock.EasyMock;
 import org.junit.Test;
 
-import com.vaadin.data.Validator;
+import com.vaadin.legacy.data.Validator;
 import com.vaadin.legacy.ui.LegacyAbstractField;
 
 public class AbsFieldValidatorsTest {

diff --git a/...ava/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionErrorTest.java b/...ava/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionErrorTest.java
@@ -5,9 +5,9 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.data.Validator.InvalidValueException;
 import com.vaadin.data.util.MethodProperty;
 import com.vaadin.data.util.converter.Converter.ConversionException;
+import com.vaadin.legacy.data.Validator.InvalidValueException;
 import com.vaadin.data.util.converter.StringToIntegerConverter;
 import com.vaadin.tests.data.bean.Address;
 import com.vaadin.tests.data.bean.Country;

diff --git a/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldGroupTest.java b/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldGroupTest.java
@@ -27,10 +27,10 @@
 
 import com.vaadin.data.Item;
 import com.vaadin.data.Property;
-import com.vaadin.data.Validator.InvalidValueException;
 import com.vaadin.data.fieldgroup.FieldGroup;
 import com.vaadin.data.fieldgroup.FieldGroup.CommitException;
 import com.vaadin.data.util.AbstractProperty;
+import com.vaadin.legacy.data.Validator.InvalidValueException;
 import com.vaadin.legacy.ui.LegacyField;
 import com.vaadin.ui.TextField;
 

diff --git a/...src/test/java/com/vaadin/tests/server/component/textfield/TextFieldWithValidatorTest.java b/...src/test/java/com/vaadin/tests/server/component/textfield/TextFieldWithValidatorTest.java
@@ -5,12 +5,12 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.data.Validator;
-import com.vaadin.data.Validator.InvalidValueException;
 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.ui.TextField;
 
 public class TextFieldWithValidatorTest {

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
@@ -3,9 +3,9 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.data.Validator.InvalidValueException;
 import com.vaadin.data.fieldgroup.BeanFieldGroup;
 import com.vaadin.data.validator.BeanValidator;
+import com.vaadin.legacy.data.Validator.InvalidValueException;
 import com.vaadin.legacy.ui.LegacyField;
 import com.vaadin.tests.data.bean.BeanToValidate;
 

diff --git a/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxNullValue.java b/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxNullValue.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.checkbox;
 
-import com.vaadin.data.Validator.InvalidValueException;
+import com.vaadin.legacy.data.Validator.InvalidValueException;
 import com.vaadin.server.AbstractErrorMessage;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;

diff --git a/uitest/src/main/java/com/vaadin/tests/components/customfield/AddressField.java b/uitest/src/main/java/com/vaadin/tests/components/customfield/AddressField.java
@@ -4,8 +4,8 @@
 import java.util.List;
 
 import com.vaadin.data.Buffered;
-import com.vaadin.data.Validator.InvalidValueException;
 import com.vaadin.data.util.BeanItem;
+import com.vaadin.legacy.data.Validator.InvalidValueException;
 import com.vaadin.tests.util.Address;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.CustomField;

diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/CommitInvalid.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/CommitInvalid.java
@@ -4,8 +4,8 @@
 import java.util.Date;
 import java.util.Locale;
 
-import com.vaadin.data.Validator.InvalidValueException;
 import com.vaadin.data.util.ObjectProperty;
+import com.vaadin.legacy.data.Validator.InvalidValueException;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.Log;
 import com.vaadin.ui.Button;

diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/RequiredInvalidDateField.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/RequiredInvalidDateField.java
@@ -4,9 +4,9 @@
 import java.util.Locale;
 
 import com.vaadin.data.Property;
-import com.vaadin.data.Validator;
 import com.vaadin.data.util.ObjectProperty;
 import com.vaadin.data.validator.AbstractValidator;
+import com.vaadin.legacy.data.Validator;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.DateField;
 

diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridWithLabelEditor.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridWithLabelEditor.java
@@ -17,8 +17,8 @@
 
 import java.util.Collection;
 
-import com.vaadin.data.Validator;
-import com.vaadin.data.Validator.InvalidValueException;
+import com.vaadin.legacy.data.Validator;
+import com.vaadin.legacy.data.Validator.InvalidValueException;
 import com.vaadin.legacy.ui.LegacyField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;