From 66e7b3df3d96c221933618d06a3e25360db1b6b7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pekka=20Hyv=C3=B6nen?= Date: Wed, 14 Dec 2016 17:00:11 +0200 Subject: [PATCH] Rename com.vaadin.data.util.converter to com.vaadin.data.converter --- server/src/main/java/com/vaadin/data/BeanBinder.java | 1 - server/src/main/java/com/vaadin/data/Binder.java | 4 +--- .../vaadin/data/{util/converter => }/Converter.java | 4 +--- .../java/com/vaadin/data/ErrorMessageProvider.java | 1 - server/src/main/java/com/vaadin/data/Validator.java | 1 - .../vaadin/data/{util/converter => }/ValueContext.java | 2 +- .../converter/AbstractStringToNumberConverter.java | 4 +++- .../data/{util => }/converter/DateToLongConverter.java | 4 +++- .../{util => }/converter/DateToSqlDateConverter.java | 4 +++- .../converter/StringToBigDecimalConverter.java | 3 ++- .../converter/StringToBigIntegerConverter.java | 3 ++- .../{util => }/converter/StringToBooleanConverter.java | 4 +++- .../{util => }/converter/StringToDateConverter.java | 4 +++- .../{util => }/converter/StringToDoubleConverter.java | 3 ++- .../{util => }/converter/StringToFloatConverter.java | 3 ++- .../{util => }/converter/StringToIntegerConverter.java | 3 ++- .../{util => }/converter/StringToLongConverter.java | 3 ++- .../java/com/vaadin/data/validator/BeanValidator.java | 2 +- .../java/com/vaadin/data/validator/RangeValidator.java | 2 +- .../com/vaadin/data/validator/RegexpValidator.java | 2 +- .../vaadin/data/validator/StringLengthValidator.java | 2 +- .../src/main/java/com/vaadin/ui/AbstractDateField.java | 2 +- .../vaadin/ui/declarative/DesignAttributeHandler.java | 4 ++-- .../com/vaadin/ui/declarative/DesignFormatter.java | 10 +++++----- .../ui/declarative/converters/DesignDateConverter.java | 4 ++-- .../ui/declarative/converters/DesignEnumConverter.java | 4 ++-- .../converters/DesignLocalDateConverter.java | 4 ++-- .../declarative/converters/DesignObjectConverter.java | 4 ++-- .../converters/DesignResourceConverter.java | 4 ++-- .../converters/DesignShortcutActionConverter.java | 4 ++-- .../converters/DesignTimeZoneConverter.java | 4 ++-- .../converters/DesignToStringConverter.java | 4 ++-- .../com/vaadin/data/BeanBinderInstanceFieldTest.java | 2 +- .../java/com/vaadin/data/BinderBookOfVaadinTest.java | 4 +--- .../com/vaadin/data/BinderConverterValidatorTest.java | 3 +-- .../java/com/vaadin/data/BinderMultiSelectTest.java | 2 -- .../java/com/vaadin/data/BinderStatusChangeTest.java | 2 +- server/src/test/java/com/vaadin/data/BinderTest.java | 2 +- .../src/test/java/com/vaadin/data/BinderTestBase.java | 1 - .../com/vaadin/data/GridAsMultiSelectInBinderTest.java | 2 -- .../src/test/java/com/vaadin/data/ValidatorTest.java | 1 - .../test/java/com/vaadin/data/ValueContextTest.java | 1 - .../com/vaadin/data/validator/NotEmptyValidator.java | 2 +- .../vaadin/data/validator/NotEmptyValidatorTest.java | 2 +- .../com/vaadin/data/validator/ValidatorTestBase.java | 2 +- .../tests/data/converter/AbstractConverterTest.java | 4 ++-- .../data/converter/AbstractStringConverterTest.java | 4 ++-- .../com/vaadin/tests/data/converter/ConverterTest.java | 4 ++-- .../tests/data/converter/DateToLongConverterTest.java | 4 ++-- .../data/converter/DateToSqlDateConverterTest.java | 4 ++-- .../converter/StringToBigDecimalConverterTest.java | 4 ++-- .../converter/StringToBigIntegerConverterTest.java | 4 ++-- .../data/converter/StringToBooleanConverterTest.java | 4 ++-- .../data/converter/StringToDateConverterTest.java | 4 ++-- .../data/converter/StringToDoubleConverterTest.java | 4 ++-- .../data/converter/StringToFloatConverterTest.java | 4 ++-- .../data/converter/StringToIntegerConverterTest.java | 4 ++-- .../data/converter/StringToLongConverterTest.java | 4 ++-- .../tests/components/grid/basics/GridBasics.java | 2 +- 59 files changed, 93 insertions(+), 94 deletions(-) rename server/src/main/java/com/vaadin/data/{util/converter => }/Converter.java (98%) rename server/src/main/java/com/vaadin/data/{util/converter => }/ValueContext.java (98%) rename server/src/main/java/com/vaadin/data/{util => }/converter/AbstractStringToNumberConverter.java (97%) rename server/src/main/java/com/vaadin/data/{util => }/converter/DateToLongConverter.java (92%) rename server/src/main/java/com/vaadin/data/{util => }/converter/DateToSqlDateConverter.java (93%) rename server/src/main/java/com/vaadin/data/{util => }/converter/StringToBigDecimalConverter.java (96%) rename server/src/main/java/com/vaadin/data/{util => }/converter/StringToBigIntegerConverter.java (96%) rename server/src/main/java/com/vaadin/data/{util => }/converter/StringToBooleanConverter.java (97%) rename server/src/main/java/com/vaadin/data/{util => }/converter/StringToDateConverter.java (96%) rename server/src/main/java/com/vaadin/data/{util => }/converter/StringToDoubleConverter.java (96%) rename server/src/main/java/com/vaadin/data/{util => }/converter/StringToFloatConverter.java (96%) rename server/src/main/java/com/vaadin/data/{util => }/converter/StringToIntegerConverter.java (97%) rename server/src/main/java/com/vaadin/data/{util => }/converter/StringToLongConverter.java (96%) diff --git a/server/src/main/java/com/vaadin/data/BeanBinder.java b/server/src/main/java/com/vaadin/data/BeanBinder.java index 64beee5264..690c2eb849 100644 --- a/server/src/main/java/com/vaadin/data/BeanBinder.java +++ b/server/src/main/java/com/vaadin/data/BeanBinder.java @@ -35,7 +35,6 @@ import java.util.function.BiConsumer; import com.googlecode.gentyref.GenericTypeReflector; import com.vaadin.annotations.PropertyId; import com.vaadin.data.util.BeanUtil; -import com.vaadin.data.util.converter.Converter; import com.vaadin.data.validator.BeanValidator; import com.vaadin.server.SerializableBiConsumer; import com.vaadin.server.SerializableFunction; diff --git a/server/src/main/java/com/vaadin/data/Binder.java b/server/src/main/java/com/vaadin/data/Binder.java index c419caf7b0..2d0ec613e0 100644 --- a/server/src/main/java/com/vaadin/data/Binder.java +++ b/server/src/main/java/com/vaadin/data/Binder.java @@ -31,9 +31,7 @@ import java.util.Set; import java.util.stream.Collectors; import com.vaadin.data.HasValue.ValueChangeEvent; -import com.vaadin.data.util.converter.Converter; -import com.vaadin.data.util.converter.StringToIntegerConverter; -import com.vaadin.data.util.converter.ValueContext; +import com.vaadin.data.converter.StringToIntegerConverter; import com.vaadin.event.EventRouter; import com.vaadin.server.ErrorMessage; import com.vaadin.server.SerializableBiConsumer; diff --git a/server/src/main/java/com/vaadin/data/util/converter/Converter.java b/server/src/main/java/com/vaadin/data/Converter.java similarity index 98% rename from server/src/main/java/com/vaadin/data/util/converter/Converter.java rename to server/src/main/java/com/vaadin/data/Converter.java index 6d58e54613..cf59a0fc0c 100644 --- a/server/src/main/java/com/vaadin/data/util/converter/Converter.java +++ b/server/src/main/java/com/vaadin/data/Converter.java @@ -14,13 +14,11 @@ * the License. */ -package com.vaadin.data.util.converter; +package com.vaadin.data; import java.io.Serializable; import java.util.function.Function; -import com.vaadin.data.Binder.BindingBuilder; -import com.vaadin.data.Result; import com.vaadin.server.SerializableFunction; /** diff --git a/server/src/main/java/com/vaadin/data/ErrorMessageProvider.java b/server/src/main/java/com/vaadin/data/ErrorMessageProvider.java index 71a6723634..0c65f0f8c2 100644 --- a/server/src/main/java/com/vaadin/data/ErrorMessageProvider.java +++ b/server/src/main/java/com/vaadin/data/ErrorMessageProvider.java @@ -15,7 +15,6 @@ */ package com.vaadin.data; -import com.vaadin.data.util.converter.ValueContext; import com.vaadin.server.SerializableFunction; /** diff --git a/server/src/main/java/com/vaadin/data/Validator.java b/server/src/main/java/com/vaadin/data/Validator.java index 33da20b945..8fc5b0785e 100644 --- a/server/src/main/java/com/vaadin/data/Validator.java +++ b/server/src/main/java/com/vaadin/data/Validator.java @@ -20,7 +20,6 @@ import java.io.Serializable; import java.util.Objects; import java.util.function.BiFunction; -import com.vaadin.data.util.converter.ValueContext; import com.vaadin.server.SerializablePredicate; /** diff --git a/server/src/main/java/com/vaadin/data/util/converter/ValueContext.java b/server/src/main/java/com/vaadin/data/ValueContext.java similarity index 98% rename from server/src/main/java/com/vaadin/data/util/converter/ValueContext.java rename to server/src/main/java/com/vaadin/data/ValueContext.java index d478692b4f..d333db6995 100644 --- a/server/src/main/java/com/vaadin/data/util/converter/ValueContext.java +++ b/server/src/main/java/com/vaadin/data/ValueContext.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util.converter; +package com.vaadin.data; import java.io.Serializable; import java.util.Locale; diff --git a/server/src/main/java/com/vaadin/data/util/converter/AbstractStringToNumberConverter.java b/server/src/main/java/com/vaadin/data/converter/AbstractStringToNumberConverter.java similarity index 97% rename from server/src/main/java/com/vaadin/data/util/converter/AbstractStringToNumberConverter.java rename to server/src/main/java/com/vaadin/data/converter/AbstractStringToNumberConverter.java index e7f4476f66..2aefb43567 100644 --- a/server/src/main/java/com/vaadin/data/util/converter/AbstractStringToNumberConverter.java +++ b/server/src/main/java/com/vaadin/data/converter/AbstractStringToNumberConverter.java @@ -14,13 +14,15 @@ * the License. */ -package com.vaadin.data.util.converter; +package com.vaadin.data.converter; import java.text.NumberFormat; import java.text.ParsePosition; import java.util.Locale; +import com.vaadin.data.Converter; import com.vaadin.data.Result; +import com.vaadin.data.ValueContext; /** * A converter that converts from the number type T to {@link String} and back. diff --git a/server/src/main/java/com/vaadin/data/util/converter/DateToLongConverter.java b/server/src/main/java/com/vaadin/data/converter/DateToLongConverter.java similarity index 92% rename from server/src/main/java/com/vaadin/data/util/converter/DateToLongConverter.java rename to server/src/main/java/com/vaadin/data/converter/DateToLongConverter.java index bd51181f5e..cdb40ecfa9 100644 --- a/server/src/main/java/com/vaadin/data/util/converter/DateToLongConverter.java +++ b/server/src/main/java/com/vaadin/data/converter/DateToLongConverter.java @@ -14,11 +14,13 @@ * the License. */ -package com.vaadin.data.util.converter; +package com.vaadin.data.converter; import java.util.Date; +import com.vaadin.data.Converter; import com.vaadin.data.Result; +import com.vaadin.data.ValueContext; /** * A converter that converts from {@link Long} to {@link Date} and back. diff --git a/server/src/main/java/com/vaadin/data/util/converter/DateToSqlDateConverter.java b/server/src/main/java/com/vaadin/data/converter/DateToSqlDateConverter.java similarity index 93% rename from server/src/main/java/com/vaadin/data/util/converter/DateToSqlDateConverter.java rename to server/src/main/java/com/vaadin/data/converter/DateToSqlDateConverter.java index 1fb7584e90..7e899a19ab 100644 --- a/server/src/main/java/com/vaadin/data/util/converter/DateToSqlDateConverter.java +++ b/server/src/main/java/com/vaadin/data/converter/DateToSqlDateConverter.java @@ -17,11 +17,13 @@ /** * */ -package com.vaadin.data.util.converter; +package com.vaadin.data.converter; import java.util.Date; +import com.vaadin.data.Converter; import com.vaadin.data.Result; +import com.vaadin.data.ValueContext; /** * Converter for handling conversion between {@link java.util.Date} and diff --git a/server/src/main/java/com/vaadin/data/util/converter/StringToBigDecimalConverter.java b/server/src/main/java/com/vaadin/data/converter/StringToBigDecimalConverter.java similarity index 96% rename from server/src/main/java/com/vaadin/data/util/converter/StringToBigDecimalConverter.java rename to server/src/main/java/com/vaadin/data/converter/StringToBigDecimalConverter.java index d30540d120..c07db5ebdb 100644 --- a/server/src/main/java/com/vaadin/data/util/converter/StringToBigDecimalConverter.java +++ b/server/src/main/java/com/vaadin/data/converter/StringToBigDecimalConverter.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util.converter; +package com.vaadin.data.converter; import java.math.BigDecimal; import java.text.DecimalFormat; @@ -21,6 +21,7 @@ import java.text.NumberFormat; import java.util.Locale; import com.vaadin.data.Result; +import com.vaadin.data.ValueContext; /** * A converter that converts from {@link String} to {@link BigDecimal} and back. diff --git a/server/src/main/java/com/vaadin/data/util/converter/StringToBigIntegerConverter.java b/server/src/main/java/com/vaadin/data/converter/StringToBigIntegerConverter.java similarity index 96% rename from server/src/main/java/com/vaadin/data/util/converter/StringToBigIntegerConverter.java rename to server/src/main/java/com/vaadin/data/converter/StringToBigIntegerConverter.java index 186beb9d4b..51895ca8c8 100644 --- a/server/src/main/java/com/vaadin/data/util/converter/StringToBigIntegerConverter.java +++ b/server/src/main/java/com/vaadin/data/converter/StringToBigIntegerConverter.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util.converter; +package com.vaadin.data.converter; import java.math.BigDecimal; import java.math.BigInteger; @@ -22,6 +22,7 @@ import java.text.NumberFormat; import java.util.Locale; import com.vaadin.data.Result; +import com.vaadin.data.ValueContext; /** * A converter that converts from {@link String} to {@link BigInteger} and back. diff --git a/server/src/main/java/com/vaadin/data/util/converter/StringToBooleanConverter.java b/server/src/main/java/com/vaadin/data/converter/StringToBooleanConverter.java similarity index 97% rename from server/src/main/java/com/vaadin/data/util/converter/StringToBooleanConverter.java rename to server/src/main/java/com/vaadin/data/converter/StringToBooleanConverter.java index 38b27f8b50..67dca5c558 100644 --- a/server/src/main/java/com/vaadin/data/util/converter/StringToBooleanConverter.java +++ b/server/src/main/java/com/vaadin/data/converter/StringToBooleanConverter.java @@ -14,11 +14,13 @@ * the License. */ -package com.vaadin.data.util.converter; +package com.vaadin.data.converter; import java.util.Locale; +import com.vaadin.data.Converter; import com.vaadin.data.Result; +import com.vaadin.data.ValueContext; /** * A converter that converts from {@link String} to {@link Boolean} and back. diff --git a/server/src/main/java/com/vaadin/data/util/converter/StringToDateConverter.java b/server/src/main/java/com/vaadin/data/converter/StringToDateConverter.java similarity index 96% rename from server/src/main/java/com/vaadin/data/util/converter/StringToDateConverter.java rename to server/src/main/java/com/vaadin/data/converter/StringToDateConverter.java index d8a036c002..790d3cb762 100644 --- a/server/src/main/java/com/vaadin/data/util/converter/StringToDateConverter.java +++ b/server/src/main/java/com/vaadin/data/converter/StringToDateConverter.java @@ -14,14 +14,16 @@ * the License. */ -package com.vaadin.data.util.converter; +package com.vaadin.data.converter; import java.text.DateFormat; import java.text.ParsePosition; import java.util.Date; import java.util.Locale; +import com.vaadin.data.Converter; import com.vaadin.data.Result; +import com.vaadin.data.ValueContext; /** * A converter that converts from {@link Date} to {@link String} and back. Uses diff --git a/server/src/main/java/com/vaadin/data/util/converter/StringToDoubleConverter.java b/server/src/main/java/com/vaadin/data/converter/StringToDoubleConverter.java similarity index 96% rename from server/src/main/java/com/vaadin/data/util/converter/StringToDoubleConverter.java rename to server/src/main/java/com/vaadin/data/converter/StringToDoubleConverter.java index 52bf9509c9..a14e33bc71 100644 --- a/server/src/main/java/com/vaadin/data/util/converter/StringToDoubleConverter.java +++ b/server/src/main/java/com/vaadin/data/converter/StringToDoubleConverter.java @@ -14,12 +14,13 @@ * the License. */ -package com.vaadin.data.util.converter; +package com.vaadin.data.converter; import java.text.NumberFormat; import java.util.Locale; import com.vaadin.data.Result; +import com.vaadin.data.ValueContext; /** * A converter that converts from {@link String} to {@link Double} and back. diff --git a/server/src/main/java/com/vaadin/data/util/converter/StringToFloatConverter.java b/server/src/main/java/com/vaadin/data/converter/StringToFloatConverter.java similarity index 96% rename from server/src/main/java/com/vaadin/data/util/converter/StringToFloatConverter.java rename to server/src/main/java/com/vaadin/data/converter/StringToFloatConverter.java index aeeeffcb8b..2db265475c 100644 --- a/server/src/main/java/com/vaadin/data/util/converter/StringToFloatConverter.java +++ b/server/src/main/java/com/vaadin/data/converter/StringToFloatConverter.java @@ -14,12 +14,13 @@ * the License. */ -package com.vaadin.data.util.converter; +package com.vaadin.data.converter; import java.text.NumberFormat; import java.util.Locale; import com.vaadin.data.Result; +import com.vaadin.data.ValueContext; /** * A converter that converts from {@link String} to {@link Float} and back. Uses diff --git a/server/src/main/java/com/vaadin/data/util/converter/StringToIntegerConverter.java b/server/src/main/java/com/vaadin/data/converter/StringToIntegerConverter.java similarity index 97% rename from server/src/main/java/com/vaadin/data/util/converter/StringToIntegerConverter.java rename to server/src/main/java/com/vaadin/data/converter/StringToIntegerConverter.java index 1c98e54c6e..c54903ef8e 100644 --- a/server/src/main/java/com/vaadin/data/util/converter/StringToIntegerConverter.java +++ b/server/src/main/java/com/vaadin/data/converter/StringToIntegerConverter.java @@ -14,12 +14,13 @@ * the License. */ -package com.vaadin.data.util.converter; +package com.vaadin.data.converter; import java.text.NumberFormat; import java.util.Locale; import com.vaadin.data.Result; +import com.vaadin.data.ValueContext; /** * A converter that converts from {@link String} to {@link Integer} and back. diff --git a/server/src/main/java/com/vaadin/data/util/converter/StringToLongConverter.java b/server/src/main/java/com/vaadin/data/converter/StringToLongConverter.java similarity index 96% rename from server/src/main/java/com/vaadin/data/util/converter/StringToLongConverter.java rename to server/src/main/java/com/vaadin/data/converter/StringToLongConverter.java index 444e7ede8e..8ddacdedfe 100644 --- a/server/src/main/java/com/vaadin/data/util/converter/StringToLongConverter.java +++ b/server/src/main/java/com/vaadin/data/converter/StringToLongConverter.java @@ -14,12 +14,13 @@ * the License. */ -package com.vaadin.data.util.converter; +package com.vaadin.data.converter; import java.text.NumberFormat; import java.util.Locale; import com.vaadin.data.Result; +import com.vaadin.data.ValueContext; /** * A converter that converts from {@link String} to {@link Long} and back. Uses diff --git a/server/src/main/java/com/vaadin/data/validator/BeanValidator.java b/server/src/main/java/com/vaadin/data/validator/BeanValidator.java index 2734658f8f..3d7baa05a0 100644 --- a/server/src/main/java/com/vaadin/data/validator/BeanValidator.java +++ b/server/src/main/java/com/vaadin/data/validator/BeanValidator.java @@ -30,8 +30,8 @@ import javax.validation.metadata.ConstraintDescriptor; import com.vaadin.data.ValidationResult; import com.vaadin.data.Validator; +import com.vaadin.data.ValueContext; import com.vaadin.data.util.BeanUtil; -import com.vaadin.data.util.converter.ValueContext; /** * A {@code Validator} using the JSR-303 (javax.validation) annotation-based diff --git a/server/src/main/java/com/vaadin/data/validator/RangeValidator.java b/server/src/main/java/com/vaadin/data/validator/RangeValidator.java index 2f966f81ee..7462a22d46 100644 --- a/server/src/main/java/com/vaadin/data/validator/RangeValidator.java +++ b/server/src/main/java/com/vaadin/data/validator/RangeValidator.java @@ -19,7 +19,7 @@ import java.util.Comparator; import java.util.Objects; import com.vaadin.data.ValidationResult; -import com.vaadin.data.util.converter.ValueContext; +import com.vaadin.data.ValueContext; /** * Verifies that a value is within the given range. diff --git a/server/src/main/java/com/vaadin/data/validator/RegexpValidator.java b/server/src/main/java/com/vaadin/data/validator/RegexpValidator.java index 89e4d81a53..21857abed0 100644 --- a/server/src/main/java/com/vaadin/data/validator/RegexpValidator.java +++ b/server/src/main/java/com/vaadin/data/validator/RegexpValidator.java @@ -19,7 +19,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import com.vaadin.data.ValidationResult; -import com.vaadin.data.util.converter.ValueContext; +import com.vaadin.data.ValueContext; /** * A string validator comparing the string against a Java regular expression. diff --git a/server/src/main/java/com/vaadin/data/validator/StringLengthValidator.java b/server/src/main/java/com/vaadin/data/validator/StringLengthValidator.java index f207e618ee..e2b0203821 100644 --- a/server/src/main/java/com/vaadin/data/validator/StringLengthValidator.java +++ b/server/src/main/java/com/vaadin/data/validator/StringLengthValidator.java @@ -17,7 +17,7 @@ package com.vaadin.data.validator; import com.vaadin.data.ValidationResult; -import com.vaadin.data.util.converter.ValueContext; +import com.vaadin.data.ValueContext; /** * Verifies that the length of a string is within the given range. diff --git a/server/src/main/java/com/vaadin/ui/AbstractDateField.java b/server/src/main/java/com/vaadin/ui/AbstractDateField.java index 43d374c392..53415f45a6 100644 --- a/server/src/main/java/com/vaadin/ui/AbstractDateField.java +++ b/server/src/main/java/com/vaadin/ui/AbstractDateField.java @@ -31,7 +31,7 @@ import org.jsoup.nodes.Element; import com.vaadin.data.Result; import com.vaadin.data.ValidationResult; -import com.vaadin.data.util.converter.ValueContext; +import com.vaadin.data.ValueContext; import com.vaadin.data.validator.DateRangeValidator; import com.vaadin.event.FieldEvents.BlurEvent; import com.vaadin.event.FieldEvents.BlurListener; diff --git a/server/src/main/java/com/vaadin/ui/declarative/DesignAttributeHandler.java b/server/src/main/java/com/vaadin/ui/declarative/DesignAttributeHandler.java index 5b0968bae6..4c7a2da9a8 100644 --- a/server/src/main/java/com/vaadin/ui/declarative/DesignAttributeHandler.java +++ b/server/src/main/java/com/vaadin/ui/declarative/DesignAttributeHandler.java @@ -36,8 +36,8 @@ import org.jsoup.nodes.Attributes; import org.jsoup.nodes.Element; import org.jsoup.nodes.Node; -import com.vaadin.data.util.converter.Converter; -import com.vaadin.data.util.converter.ValueContext; +import com.vaadin.data.Converter; +import com.vaadin.data.ValueContext; import com.vaadin.shared.ui.AlignmentInfo; import com.vaadin.shared.util.SharedUtil; import com.vaadin.ui.Alignment; diff --git a/server/src/main/java/com/vaadin/ui/declarative/DesignFormatter.java b/server/src/main/java/com/vaadin/ui/declarative/DesignFormatter.java index 78c3886dd6..6e9ff8f9bb 100644 --- a/server/src/main/java/com/vaadin/ui/declarative/DesignFormatter.java +++ b/server/src/main/java/com/vaadin/ui/declarative/DesignFormatter.java @@ -31,12 +31,12 @@ import java.util.concurrent.ConcurrentHashMap; import org.jsoup.parser.Parser; +import com.vaadin.data.Converter; import com.vaadin.data.Result; -import com.vaadin.data.util.converter.Converter; -import com.vaadin.data.util.converter.StringToBigDecimalConverter; -import com.vaadin.data.util.converter.StringToDoubleConverter; -import com.vaadin.data.util.converter.StringToFloatConverter; -import com.vaadin.data.util.converter.ValueContext; +import com.vaadin.data.ValueContext; +import com.vaadin.data.converter.StringToBigDecimalConverter; +import com.vaadin.data.converter.StringToDoubleConverter; +import com.vaadin.data.converter.StringToFloatConverter; import com.vaadin.event.ShortcutAction; import com.vaadin.server.Resource; import com.vaadin.ui.declarative.converters.DesignDateConverter; diff --git a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignDateConverter.java b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignDateConverter.java index 9ccdea4ba3..2d0bd2680f 100644 --- a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignDateConverter.java +++ b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignDateConverter.java @@ -19,9 +19,9 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; +import com.vaadin.data.Converter; import com.vaadin.data.Result; -import com.vaadin.data.util.converter.Converter; -import com.vaadin.data.util.converter.ValueContext; +import com.vaadin.data.ValueContext; import com.vaadin.ui.declarative.DesignAttributeHandler; /** diff --git a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignEnumConverter.java b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignEnumConverter.java index a32c68998f..de7f5ad5b7 100644 --- a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignEnumConverter.java +++ b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignEnumConverter.java @@ -17,9 +17,9 @@ package com.vaadin.ui.declarative.converters; import java.util.Locale; +import com.vaadin.data.Converter; import com.vaadin.data.Result; -import com.vaadin.data.util.converter.Converter; -import com.vaadin.data.util.converter.ValueContext; +import com.vaadin.data.ValueContext; import com.vaadin.ui.declarative.DesignAttributeHandler; /** diff --git a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignLocalDateConverter.java b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignLocalDateConverter.java index 59301ef386..3d0dd7cb2b 100644 --- a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignLocalDateConverter.java +++ b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignLocalDateConverter.java @@ -20,9 +20,9 @@ import java.time.format.DateTimeFormatter; import java.time.format.DateTimeParseException; import java.util.Locale; +import com.vaadin.data.Converter; import com.vaadin.data.Result; -import com.vaadin.data.util.converter.Converter; -import com.vaadin.data.util.converter.ValueContext; +import com.vaadin.data.ValueContext; import com.vaadin.ui.declarative.DesignAttributeHandler; /** diff --git a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignObjectConverter.java b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignObjectConverter.java index cf1c1ef69a..b32ba3fcf8 100644 --- a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignObjectConverter.java +++ b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignObjectConverter.java @@ -15,9 +15,9 @@ */ package com.vaadin.ui.declarative.converters; +import com.vaadin.data.Converter; import com.vaadin.data.Result; -import com.vaadin.data.util.converter.Converter; -import com.vaadin.data.util.converter.ValueContext; +import com.vaadin.data.ValueContext; import com.vaadin.ui.declarative.DesignAttributeHandler; /** diff --git a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignResourceConverter.java b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignResourceConverter.java index c03d3750d1..e1ef5563fe 100644 --- a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignResourceConverter.java +++ b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignResourceConverter.java @@ -21,9 +21,9 @@ import java.util.HashMap; import java.util.Locale; import java.util.Map; +import com.vaadin.data.Converter; import com.vaadin.data.Result; -import com.vaadin.data.util.converter.Converter; -import com.vaadin.data.util.converter.ValueContext; +import com.vaadin.data.ValueContext; import com.vaadin.server.ExternalResource; import com.vaadin.server.FileResource; import com.vaadin.server.FontAwesome; diff --git a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignShortcutActionConverter.java b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignShortcutActionConverter.java index 4856a0db8f..e2214cd9b3 100644 --- a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignShortcutActionConverter.java +++ b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignShortcutActionConverter.java @@ -20,9 +20,9 @@ import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; +import com.vaadin.data.Converter; import com.vaadin.data.Result; -import com.vaadin.data.util.converter.Converter; -import com.vaadin.data.util.converter.ValueContext; +import com.vaadin.data.ValueContext; import com.vaadin.event.ShortcutAction; import com.vaadin.event.ShortcutAction.KeyCode; import com.vaadin.event.ShortcutAction.ModifierKey; diff --git a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignTimeZoneConverter.java b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignTimeZoneConverter.java index 3fe034e5fd..074fde525a 100644 --- a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignTimeZoneConverter.java +++ b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignTimeZoneConverter.java @@ -17,9 +17,9 @@ package com.vaadin.ui.declarative.converters; import java.util.TimeZone; +import com.vaadin.data.Converter; import com.vaadin.data.Result; -import com.vaadin.data.util.converter.Converter; -import com.vaadin.data.util.converter.ValueContext; +import com.vaadin.data.ValueContext; import com.vaadin.ui.declarative.DesignAttributeHandler; /** diff --git a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignToStringConverter.java b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignToStringConverter.java index fa81b36bb7..96d87a3f8b 100644 --- a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignToStringConverter.java +++ b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignToStringConverter.java @@ -17,9 +17,9 @@ package com.vaadin.ui.declarative.converters; import java.lang.reflect.InvocationTargetException; +import com.vaadin.data.Converter; import com.vaadin.data.Result; -import com.vaadin.data.util.converter.Converter; -import com.vaadin.data.util.converter.ValueContext; +import com.vaadin.data.ValueContext; import com.vaadin.ui.declarative.DesignAttributeHandler; /** diff --git a/server/src/test/java/com/vaadin/data/BeanBinderInstanceFieldTest.java b/server/src/test/java/com/vaadin/data/BeanBinderInstanceFieldTest.java index d04789f353..e0f6e2eaa5 100644 --- a/server/src/test/java/com/vaadin/data/BeanBinderInstanceFieldTest.java +++ b/server/src/test/java/com/vaadin/data/BeanBinderInstanceFieldTest.java @@ -21,7 +21,7 @@ import org.junit.Assert; import org.junit.Test; import com.vaadin.annotations.PropertyId; -import com.vaadin.data.util.converter.StringToIntegerConverter; +import com.vaadin.data.converter.StringToIntegerConverter; import com.vaadin.data.validator.StringLengthValidator; import com.vaadin.tests.data.bean.Person; import com.vaadin.ui.AbstractField; diff --git a/server/src/test/java/com/vaadin/data/BinderBookOfVaadinTest.java b/server/src/test/java/com/vaadin/data/BinderBookOfVaadinTest.java index 493842b63c..f1d226bf20 100644 --- a/server/src/test/java/com/vaadin/data/BinderBookOfVaadinTest.java +++ b/server/src/test/java/com/vaadin/data/BinderBookOfVaadinTest.java @@ -28,9 +28,7 @@ import org.junit.Test; import com.vaadin.data.Binder.Binding; import com.vaadin.data.Binder.BindingBuilder; import com.vaadin.data.BindingValidationStatus.Status; -import com.vaadin.data.util.converter.Converter; -import com.vaadin.data.util.converter.StringToIntegerConverter; -import com.vaadin.data.util.converter.ValueContext; +import com.vaadin.data.converter.StringToIntegerConverter; import com.vaadin.data.validator.EmailValidator; import com.vaadin.data.validator.StringLengthValidator; import com.vaadin.server.AbstractErrorMessage; diff --git a/server/src/test/java/com/vaadin/data/BinderConverterValidatorTest.java b/server/src/test/java/com/vaadin/data/BinderConverterValidatorTest.java index d86a9d04cc..bc46395d08 100644 --- a/server/src/test/java/com/vaadin/data/BinderConverterValidatorTest.java +++ b/server/src/test/java/com/vaadin/data/BinderConverterValidatorTest.java @@ -30,8 +30,7 @@ import org.junit.Test; import com.vaadin.data.Binder.Binding; import com.vaadin.data.Binder.BindingBuilder; -import com.vaadin.data.util.converter.StringToIntegerConverter; -import com.vaadin.data.util.converter.ValueContext; +import com.vaadin.data.converter.StringToIntegerConverter; import com.vaadin.data.validator.NotEmptyValidator; import com.vaadin.server.AbstractErrorMessage; import com.vaadin.server.ErrorMessage; diff --git a/server/src/test/java/com/vaadin/data/BinderMultiSelectTest.java b/server/src/test/java/com/vaadin/data/BinderMultiSelectTest.java index f59c89e1d8..820447172e 100644 --- a/server/src/test/java/com/vaadin/data/BinderMultiSelectTest.java +++ b/server/src/test/java/com/vaadin/data/BinderMultiSelectTest.java @@ -28,8 +28,6 @@ import java.util.stream.Stream; import org.junit.Before; import org.junit.Test; -import com.vaadin.data.util.converter.Converter; -import com.vaadin.data.util.converter.ValueContext; import com.vaadin.tests.data.bean.BeanWithEnums; import com.vaadin.tests.data.bean.TestEnum; import com.vaadin.ui.CheckBoxGroup; diff --git a/server/src/test/java/com/vaadin/data/BinderStatusChangeTest.java b/server/src/test/java/com/vaadin/data/BinderStatusChangeTest.java index 4f46a78a5b..1ab39ee46f 100644 --- a/server/src/test/java/com/vaadin/data/BinderStatusChangeTest.java +++ b/server/src/test/java/com/vaadin/data/BinderStatusChangeTest.java @@ -23,7 +23,7 @@ import org.junit.Test; import com.vaadin.data.Binder.Binding; import com.vaadin.data.Binder.BindingBuilder; -import com.vaadin.data.util.converter.StringToIntegerConverter; +import com.vaadin.data.converter.StringToIntegerConverter; import com.vaadin.tests.data.bean.Person; /** diff --git a/server/src/test/java/com/vaadin/data/BinderTest.java b/server/src/test/java/com/vaadin/data/BinderTest.java index b0d16bd9e7..6fe139b7ad 100644 --- a/server/src/test/java/com/vaadin/data/BinderTest.java +++ b/server/src/test/java/com/vaadin/data/BinderTest.java @@ -14,7 +14,7 @@ import org.junit.Before; import org.junit.Test; import com.vaadin.data.Binder.BindingBuilder; -import com.vaadin.data.util.converter.StringToIntegerConverter; +import com.vaadin.data.converter.StringToIntegerConverter; import com.vaadin.data.validator.NotEmptyValidator; import com.vaadin.server.ErrorMessage; import com.vaadin.tests.data.bean.Person; diff --git a/server/src/test/java/com/vaadin/data/BinderTestBase.java b/server/src/test/java/com/vaadin/data/BinderTestBase.java index b5a1c3a2be..7a238ac7ce 100644 --- a/server/src/test/java/com/vaadin/data/BinderTestBase.java +++ b/server/src/test/java/com/vaadin/data/BinderTestBase.java @@ -17,7 +17,6 @@ package com.vaadin.data; import org.junit.Before; -import com.vaadin.data.util.converter.Converter; import com.vaadin.ui.TextField; /** diff --git a/server/src/test/java/com/vaadin/data/GridAsMultiSelectInBinderTest.java b/server/src/test/java/com/vaadin/data/GridAsMultiSelectInBinderTest.java index c3921ff5fc..398af7c1b1 100644 --- a/server/src/test/java/com/vaadin/data/GridAsMultiSelectInBinderTest.java +++ b/server/src/test/java/com/vaadin/data/GridAsMultiSelectInBinderTest.java @@ -18,8 +18,6 @@ import java.util.stream.Stream; import org.junit.Before; import org.junit.Test; -import com.vaadin.data.util.converter.Converter; -import com.vaadin.data.util.converter.ValueContext; import com.vaadin.tests.data.bean.BeanWithEnums; import com.vaadin.tests.data.bean.Sex; import com.vaadin.tests.data.bean.TestEnum; diff --git a/server/src/test/java/com/vaadin/data/ValidatorTest.java b/server/src/test/java/com/vaadin/data/ValidatorTest.java index 9640550d95..75ac1fcf5a 100644 --- a/server/src/test/java/com/vaadin/data/ValidatorTest.java +++ b/server/src/test/java/com/vaadin/data/ValidatorTest.java @@ -21,7 +21,6 @@ import java.util.Objects; import org.junit.Assert; import org.junit.Test; -import com.vaadin.data.util.converter.ValueContext; import com.vaadin.data.validator.ValidatorTestBase; /** diff --git a/server/src/test/java/com/vaadin/data/ValueContextTest.java b/server/src/test/java/com/vaadin/data/ValueContextTest.java index 9fce2996d9..2f13a71dbb 100644 --- a/server/src/test/java/com/vaadin/data/ValueContextTest.java +++ b/server/src/test/java/com/vaadin/data/ValueContextTest.java @@ -7,7 +7,6 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.vaadin.data.util.converter.ValueContext; import com.vaadin.server.VaadinRequest; import com.vaadin.ui.TextField; import com.vaadin.ui.UI; diff --git a/server/src/test/java/com/vaadin/data/validator/NotEmptyValidator.java b/server/src/test/java/com/vaadin/data/validator/NotEmptyValidator.java index faa37367b0..57709ff5e2 100644 --- a/server/src/test/java/com/vaadin/data/validator/NotEmptyValidator.java +++ b/server/src/test/java/com/vaadin/data/validator/NotEmptyValidator.java @@ -21,7 +21,7 @@ import com.vaadin.data.Binder.BindingBuilder; import com.vaadin.data.HasValue; import com.vaadin.data.ValidationResult; import com.vaadin.data.Validator; -import com.vaadin.data.util.converter.ValueContext; +import com.vaadin.data.ValueContext; /** * Simple validator to check against {@code null} value and empty {@link String} diff --git a/server/src/test/java/com/vaadin/data/validator/NotEmptyValidatorTest.java b/server/src/test/java/com/vaadin/data/validator/NotEmptyValidatorTest.java index ae1bb4fe17..edd500a8a1 100644 --- a/server/src/test/java/com/vaadin/data/validator/NotEmptyValidatorTest.java +++ b/server/src/test/java/com/vaadin/data/validator/NotEmptyValidatorTest.java @@ -19,7 +19,7 @@ import org.junit.Assert; import org.junit.Test; import com.vaadin.data.ValidationResult; -import com.vaadin.data.util.converter.ValueContext; +import com.vaadin.data.ValueContext; /** * @author Vaadin Ltd diff --git a/server/src/test/java/com/vaadin/data/validator/ValidatorTestBase.java b/server/src/test/java/com/vaadin/data/validator/ValidatorTestBase.java index c8432324ad..599d7440db 100644 --- a/server/src/test/java/com/vaadin/data/validator/ValidatorTestBase.java +++ b/server/src/test/java/com/vaadin/data/validator/ValidatorTestBase.java @@ -7,7 +7,7 @@ import org.junit.Before; import com.vaadin.data.ValidationResult; import com.vaadin.data.Validator; -import com.vaadin.data.util.converter.ValueContext; +import com.vaadin.data.ValueContext; import com.vaadin.ui.Label; public class ValidatorTestBase { diff --git a/server/src/test/java/com/vaadin/tests/data/converter/AbstractConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/AbstractConverterTest.java index 6b25f0a4e7..9c6a5a27f9 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/AbstractConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/AbstractConverterTest.java @@ -3,9 +3,9 @@ package com.vaadin.tests.data.converter; import org.junit.Assert; import org.junit.Test; +import com.vaadin.data.Converter; import com.vaadin.data.Result; -import com.vaadin.data.util.converter.Converter; -import com.vaadin.data.util.converter.ValueContext; +import com.vaadin.data.ValueContext; public abstract class AbstractConverterTest { diff --git a/server/src/test/java/com/vaadin/tests/data/converter/AbstractStringConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/AbstractStringConverterTest.java index b4cffaf325..123ef80de2 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/AbstractStringConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/AbstractStringConverterTest.java @@ -3,9 +3,9 @@ package com.vaadin.tests.data.converter; import org.junit.Assert; import org.junit.Test; +import com.vaadin.data.Converter; import com.vaadin.data.Result; -import com.vaadin.data.util.converter.Converter; -import com.vaadin.data.util.converter.ValueContext; +import com.vaadin.data.ValueContext; public abstract class AbstractStringConverterTest extends AbstractConverterTest { diff --git a/server/src/test/java/com/vaadin/tests/data/converter/ConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/ConverterTest.java index 6d653bb932..3ba3c28882 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/ConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/ConverterTest.java @@ -3,9 +3,9 @@ package com.vaadin.tests.data.converter; import org.junit.Assert; import org.junit.Test; +import com.vaadin.data.Converter; import com.vaadin.data.Result; -import com.vaadin.data.util.converter.Converter; -import com.vaadin.data.util.converter.ValueContext; +import com.vaadin.data.ValueContext; import com.vaadin.server.SerializableFunction; public class ConverterTest { diff --git a/server/src/test/java/com/vaadin/tests/data/converter/DateToLongConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/DateToLongConverterTest.java index 75fc42dbb7..8bfe3cf122 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/DateToLongConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/DateToLongConverterTest.java @@ -4,8 +4,8 @@ import java.util.Date; import org.junit.Test; -import com.vaadin.data.util.converter.DateToLongConverter; -import com.vaadin.data.util.converter.ValueContext; +import com.vaadin.data.ValueContext; +import com.vaadin.data.converter.DateToLongConverter; public class DateToLongConverterTest extends AbstractConverterTest { diff --git a/server/src/test/java/com/vaadin/tests/data/converter/DateToSqlDateConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/DateToSqlDateConverterTest.java index c1ecf4657b..70219761f9 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/DateToSqlDateConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/DateToSqlDateConverterTest.java @@ -5,8 +5,8 @@ import java.util.Locale; import org.junit.Test; -import com.vaadin.data.util.converter.DateToSqlDateConverter; -import com.vaadin.data.util.converter.ValueContext; +import com.vaadin.data.ValueContext; +import com.vaadin.data.converter.DateToSqlDateConverter; public class DateToSqlDateConverterTest extends AbstractConverterTest { diff --git a/server/src/test/java/com/vaadin/tests/data/converter/StringToBigDecimalConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToBigDecimalConverterTest.java index 2178cc561e..9837257f64 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/StringToBigDecimalConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToBigDecimalConverterTest.java @@ -22,8 +22,8 @@ import org.junit.Assert; import org.junit.Test; import com.vaadin.data.Result; -import com.vaadin.data.util.converter.StringToBigDecimalConverter; -import com.vaadin.data.util.converter.ValueContext; +import com.vaadin.data.ValueContext; +import com.vaadin.data.converter.StringToBigDecimalConverter; public class StringToBigDecimalConverterTest extends AbstractStringConverterTest { diff --git a/server/src/test/java/com/vaadin/tests/data/converter/StringToBigIntegerConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToBigIntegerConverterTest.java index 3e7afd4f55..cc33185efd 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/StringToBigIntegerConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToBigIntegerConverterTest.java @@ -22,8 +22,8 @@ import org.junit.Assert; import org.junit.Test; import com.vaadin.data.Result; -import com.vaadin.data.util.converter.StringToBigIntegerConverter; -import com.vaadin.data.util.converter.ValueContext; +import com.vaadin.data.ValueContext; +import com.vaadin.data.converter.StringToBigIntegerConverter; public class StringToBigIntegerConverterTest extends AbstractStringConverterTest { diff --git a/server/src/test/java/com/vaadin/tests/data/converter/StringToBooleanConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToBooleanConverterTest.java index d3d539ae8f..5c265fe31c 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/StringToBooleanConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToBooleanConverterTest.java @@ -7,8 +7,8 @@ import java.util.Locale; import org.junit.Assert; import org.junit.Test; -import com.vaadin.data.util.converter.StringToBooleanConverter; -import com.vaadin.data.util.converter.ValueContext; +import com.vaadin.data.ValueContext; +import com.vaadin.data.converter.StringToBooleanConverter; public class StringToBooleanConverterTest extends AbstractStringConverterTest { diff --git a/server/src/test/java/com/vaadin/tests/data/converter/StringToDateConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToDateConverterTest.java index 5319813c00..048c6e5205 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/StringToDateConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToDateConverterTest.java @@ -5,8 +5,8 @@ import java.util.Locale; import org.junit.Test; -import com.vaadin.data.util.converter.StringToDateConverter; -import com.vaadin.data.util.converter.ValueContext; +import com.vaadin.data.ValueContext; +import com.vaadin.data.converter.StringToDateConverter; public class StringToDateConverterTest extends AbstractConverterTest { diff --git a/server/src/test/java/com/vaadin/tests/data/converter/StringToDoubleConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToDoubleConverterTest.java index ba807e5782..acadc6b458 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/StringToDoubleConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToDoubleConverterTest.java @@ -4,8 +4,8 @@ import org.junit.Assert; import org.junit.Test; import com.vaadin.data.Result; -import com.vaadin.data.util.converter.StringToDoubleConverter; -import com.vaadin.data.util.converter.ValueContext; +import com.vaadin.data.ValueContext; +import com.vaadin.data.converter.StringToDoubleConverter; public class StringToDoubleConverterTest extends AbstractConverterTest { diff --git a/server/src/test/java/com/vaadin/tests/data/converter/StringToFloatConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToFloatConverterTest.java index 8bdf651ede..89a9c25068 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/StringToFloatConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToFloatConverterTest.java @@ -2,8 +2,8 @@ package com.vaadin.tests.data.converter; import org.junit.Test; -import com.vaadin.data.util.converter.StringToFloatConverter; -import com.vaadin.data.util.converter.ValueContext; +import com.vaadin.data.ValueContext; +import com.vaadin.data.converter.StringToFloatConverter; public class StringToFloatConverterTest extends AbstractStringConverterTest { diff --git a/server/src/test/java/com/vaadin/tests/data/converter/StringToIntegerConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToIntegerConverterTest.java index 62fe699395..06c22a2064 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/StringToIntegerConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToIntegerConverterTest.java @@ -4,8 +4,8 @@ import org.junit.Assert; import org.junit.Test; import com.vaadin.data.Result; -import com.vaadin.data.util.converter.StringToIntegerConverter; -import com.vaadin.data.util.converter.ValueContext; +import com.vaadin.data.ValueContext; +import com.vaadin.data.converter.StringToIntegerConverter; public class StringToIntegerConverterTest extends AbstractConverterTest { diff --git a/server/src/test/java/com/vaadin/tests/data/converter/StringToLongConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToLongConverterTest.java index 0acd463a26..29fe1d8243 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/StringToLongConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToLongConverterTest.java @@ -3,8 +3,8 @@ package com.vaadin.tests.data.converter; import org.junit.Test; import com.vaadin.data.Result; -import com.vaadin.data.util.converter.StringToLongConverter; -import com.vaadin.data.util.converter.ValueContext; +import com.vaadin.data.ValueContext; +import com.vaadin.data.converter.StringToLongConverter; public class StringToLongConverterTest extends AbstractStringConverterTest { diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/basics/GridBasics.java b/uitest/src/main/java/com/vaadin/tests/components/grid/basics/GridBasics.java index 2d0c893ddf..ed82395c88 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/basics/GridBasics.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/basics/GridBasics.java @@ -16,7 +16,7 @@ import java.util.stream.Stream; import com.vaadin.annotations.Theme; import com.vaadin.annotations.Widgetset; import com.vaadin.data.Binder; -import com.vaadin.data.util.converter.StringToIntegerConverter; +import com.vaadin.data.converter.StringToIntegerConverter; import com.vaadin.event.selection.MultiSelectionEvent; import com.vaadin.event.selection.SingleSelectionEvent; import com.vaadin.server.VaadinRequest; -- 2.39.5