Rename com.vaadin.data.util.converter to com.vaadin.data.converter

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;

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;

server/src/main/java/com/vaadin/data/util/converter/Converter.java → 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;
 
 /**

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;
 
 /**

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;
 
 /**

server/src/main/java/com/vaadin/data/util/converter/ValueContext.java → 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;

server/src/main/java/com/vaadin/data/util/converter/AbstractStringToNumberConverter.java → 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.

server/src/main/java/com/vaadin/data/util/converter/DateToLongConverter.java → 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.

server/src/main/java/com/vaadin/data/util/converter/DateToSqlDateConverter.java → 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

server/src/main/java/com/vaadin/data/util/converter/StringToBigDecimalConverter.java → 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.

server/src/main/java/com/vaadin/data/util/converter/StringToBigIntegerConverter.java → 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.

server/src/main/java/com/vaadin/data/util/converter/StringToBooleanConverter.java → 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.

server/src/main/java/com/vaadin/data/util/converter/StringToDateConverter.java → 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

server/src/main/java/com/vaadin/data/util/converter/StringToDoubleConverter.java → 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.

server/src/main/java/com/vaadin/data/util/converter/StringToFloatConverter.java → 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

server/src/main/java/com/vaadin/data/util/converter/StringToIntegerConverter.java → 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.

server/src/main/java/com/vaadin/data/util/converter/StringToLongConverter.java → 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

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

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.

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.

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.

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;

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;

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;

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;
 
 /**

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;
 
 /**

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;
 
 /**

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;
 
 /**

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;

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;

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;
 
 /**

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;
 
 /**

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;

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;

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;

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;

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;
 
 /**

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;

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;
 
 /**

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;

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;
 
 /**

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;

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}

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

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 {

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 {
 

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 {

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 {

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 {
 

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 {
 

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 {

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 {

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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;