diff options
58 files changed, 111 insertions, 106 deletions
diff --git a/client/src/main/java/com/vaadin/client/connectors/data/DataCommunicatorConnector.java b/client/src/main/java/com/vaadin/client/connectors/data/DataCommunicatorConnector.java index cceedf9bf9..cf3c3c10d8 100644 --- a/client/src/main/java/com/vaadin/client/connectors/data/DataCommunicatorConnector.java +++ b/client/src/main/java/com/vaadin/client/connectors/data/DataCommunicatorConnector.java @@ -24,7 +24,7 @@ import com.vaadin.client.ServerConnector; import com.vaadin.client.data.AbstractRemoteDataSource; import com.vaadin.client.data.DataSource; import com.vaadin.client.extensions.AbstractExtensionConnector; -import com.vaadin.server.data.DataCommunicator; +import com.vaadin.data.provider.DataCommunicator; import com.vaadin.shared.data.DataCommunicatorClientRpc; import com.vaadin.shared.data.DataCommunicatorConstants; import com.vaadin.shared.data.DataRequestRpc; diff --git a/server/src/main/java/com/vaadin/data/Listing.java b/server/src/main/java/com/vaadin/data/Listing.java index 0ecc13b3fb..680e05db8a 100644 --- a/server/src/main/java/com/vaadin/data/Listing.java +++ b/server/src/main/java/com/vaadin/data/Listing.java @@ -19,8 +19,8 @@ import java.io.Serializable; import java.util.Collection; import java.util.stream.Stream; -import com.vaadin.server.data.BackEndDataProvider; -import com.vaadin.server.data.DataProvider; +import com.vaadin.data.provider.BackEndDataProvider; +import com.vaadin.data.provider.DataProvider; /** * A generic interface for components that show a list of data. diff --git a/server/src/main/java/com/vaadin/server/data/AbstractDataProvider.java b/server/src/main/java/com/vaadin/data/provider/AbstractDataProvider.java index 1ab21a3125..3319bfb382 100644 --- a/server/src/main/java/com/vaadin/server/data/AbstractDataProvider.java +++ b/server/src/main/java/com/vaadin/data/provider/AbstractDataProvider.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.server.data; +package com.vaadin.data.provider; import java.lang.reflect.Method; import java.util.EventObject; diff --git a/server/src/main/java/com/vaadin/server/data/AppendableFilterDataProvider.java b/server/src/main/java/com/vaadin/data/provider/AppendableFilterDataProvider.java index c6e20acbe4..37cc484d64 100644 --- a/server/src/main/java/com/vaadin/server/data/AppendableFilterDataProvider.java +++ b/server/src/main/java/com/vaadin/data/provider/AppendableFilterDataProvider.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.server.data; +package com.vaadin.data.provider; import java.util.Objects; diff --git a/server/src/main/java/com/vaadin/server/data/BackEndDataProvider.java b/server/src/main/java/com/vaadin/data/provider/BackEndDataProvider.java index 50e104adc1..2ceebc995a 100644 --- a/server/src/main/java/com/vaadin/server/data/BackEndDataProvider.java +++ b/server/src/main/java/com/vaadin/data/provider/BackEndDataProvider.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.server.data; +package com.vaadin.data.provider; import java.util.ArrayList; import java.util.List; diff --git a/server/src/main/java/com/vaadin/server/data/DataChangeEvent.java b/server/src/main/java/com/vaadin/data/provider/DataChangeEvent.java index 6d7d2e8bfb..86ad9235a6 100644 --- a/server/src/main/java/com/vaadin/server/data/DataChangeEvent.java +++ b/server/src/main/java/com/vaadin/data/provider/DataChangeEvent.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.server.data; +package com.vaadin.data.provider; import java.util.EventObject; diff --git a/server/src/main/java/com/vaadin/server/data/DataCommunicator.java b/server/src/main/java/com/vaadin/data/provider/DataCommunicator.java index 9d84b1bcc9..40bf9e0880 100644 --- a/server/src/main/java/com/vaadin/server/data/DataCommunicator.java +++ b/server/src/main/java/com/vaadin/data/provider/DataCommunicator.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.server.data; +package com.vaadin.data.provider; import java.io.Serializable; import java.util.ArrayList; diff --git a/server/src/main/java/com/vaadin/server/data/DataGenerator.java b/server/src/main/java/com/vaadin/data/provider/DataGenerator.java index f062e9b80a..32c41473ed 100644 --- a/server/src/main/java/com/vaadin/server/data/DataGenerator.java +++ b/server/src/main/java/com/vaadin/data/provider/DataGenerator.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.server.data; +package com.vaadin.data.provider; import java.io.Serializable; diff --git a/server/src/main/java/com/vaadin/server/data/DataKeyMapper.java b/server/src/main/java/com/vaadin/data/provider/DataKeyMapper.java index 2a279bcd8a..63bd2d92f8 100644 --- a/server/src/main/java/com/vaadin/server/data/DataKeyMapper.java +++ b/server/src/main/java/com/vaadin/data/provider/DataKeyMapper.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.server.data; +package com.vaadin.data.provider; import java.io.Serializable; diff --git a/server/src/main/java/com/vaadin/server/data/DataProvider.java b/server/src/main/java/com/vaadin/data/provider/DataProvider.java index 1a0360318b..8bc4aa3d4b 100644 --- a/server/src/main/java/com/vaadin/server/data/DataProvider.java +++ b/server/src/main/java/com/vaadin/data/provider/DataProvider.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.server.data; +package com.vaadin.data.provider; import java.io.Serializable; import java.util.Arrays; diff --git a/server/src/main/java/com/vaadin/server/data/DataProviderListener.java b/server/src/main/java/com/vaadin/data/provider/DataProviderListener.java index 27bd781c4a..99693a2c1b 100644 --- a/server/src/main/java/com/vaadin/server/data/DataProviderListener.java +++ b/server/src/main/java/com/vaadin/data/provider/DataProviderListener.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.server.data; +package com.vaadin.data.provider; import java.io.Serializable; diff --git a/server/src/main/java/com/vaadin/server/data/DataProviderWrapper.java b/server/src/main/java/com/vaadin/data/provider/DataProviderWrapper.java index ba08ac4ef6..dc12a2cc28 100644 --- a/server/src/main/java/com/vaadin/server/data/DataProviderWrapper.java +++ b/server/src/main/java/com/vaadin/data/provider/DataProviderWrapper.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.server.data; +package com.vaadin.data.provider; import java.util.stream.Stream; diff --git a/server/src/main/java/com/vaadin/server/data/ListDataProvider.java b/server/src/main/java/com/vaadin/data/provider/ListDataProvider.java index 0f9e033bbb..c6860c26cc 100644 --- a/server/src/main/java/com/vaadin/server/data/ListDataProvider.java +++ b/server/src/main/java/com/vaadin/data/provider/ListDataProvider.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.server.data; +package com.vaadin.data.provider; import java.util.Collection; import java.util.Comparator; diff --git a/server/src/main/java/com/vaadin/server/data/Query.java b/server/src/main/java/com/vaadin/data/provider/Query.java index 6415af0e2d..a4e0197d83 100644 --- a/server/src/main/java/com/vaadin/server/data/Query.java +++ b/server/src/main/java/com/vaadin/data/provider/Query.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.server.data; +package com.vaadin.data.provider; import java.io.Serializable; import java.util.Collections; diff --git a/server/src/main/java/com/vaadin/server/data/Sort.java b/server/src/main/java/com/vaadin/data/provider/Sort.java index 7afa017157..303ee05f74 100644 --- a/server/src/main/java/com/vaadin/server/data/Sort.java +++ b/server/src/main/java/com/vaadin/data/provider/Sort.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.server.data; +package com.vaadin.data.provider; import java.io.Serializable; import java.util.ArrayList; diff --git a/server/src/main/java/com/vaadin/server/data/SortOrder.java b/server/src/main/java/com/vaadin/data/provider/SortOrder.java index d5ce197ccf..34e560e2d1 100644 --- a/server/src/main/java/com/vaadin/server/data/SortOrder.java +++ b/server/src/main/java/com/vaadin/data/provider/SortOrder.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.server.data; +package com.vaadin.data.provider; import java.io.Serializable; diff --git a/server/src/main/java/com/vaadin/server/KeyMapper.java b/server/src/main/java/com/vaadin/server/KeyMapper.java index 760d311631..471fea3e69 100644 --- a/server/src/main/java/com/vaadin/server/KeyMapper.java +++ b/server/src/main/java/com/vaadin/server/KeyMapper.java @@ -19,7 +19,7 @@ package com.vaadin.server; import java.io.Serializable; import java.util.HashMap; -import com.vaadin.server.data.DataKeyMapper; +import com.vaadin.data.provider.DataKeyMapper; /** * <code>KeyMapper</code> is the simple two-way map for generating textual keys diff --git a/server/src/main/java/com/vaadin/ui/AbstractListing.java b/server/src/main/java/com/vaadin/ui/AbstractListing.java index 95ffef6ee8..6800703afd 100644 --- a/server/src/main/java/com/vaadin/ui/AbstractListing.java +++ b/server/src/main/java/com/vaadin/ui/AbstractListing.java @@ -23,12 +23,12 @@ import org.jsoup.nodes.Element; import com.vaadin.data.Listing; import com.vaadin.data.SelectionModel; +import com.vaadin.data.provider.DataCommunicator; +import com.vaadin.data.provider.DataGenerator; +import com.vaadin.data.provider.DataProvider; +import com.vaadin.data.provider.Query; import com.vaadin.server.AbstractExtension; import com.vaadin.server.Resource; -import com.vaadin.server.data.DataCommunicator; -import com.vaadin.server.data.DataGenerator; -import com.vaadin.server.data.DataProvider; -import com.vaadin.server.data.Query; import com.vaadin.shared.extension.abstractlisting.AbstractListingExtensionState; import com.vaadin.shared.ui.abstractlisting.AbstractListingState; import com.vaadin.ui.Component.Focusable; diff --git a/server/src/main/java/com/vaadin/ui/AbstractMultiSelect.java b/server/src/main/java/com/vaadin/ui/AbstractMultiSelect.java index b053277cc3..bba3d38fa1 100644 --- a/server/src/main/java/com/vaadin/ui/AbstractMultiSelect.java +++ b/server/src/main/java/com/vaadin/ui/AbstractMultiSelect.java @@ -32,12 +32,12 @@ import org.jsoup.nodes.Element; import com.vaadin.data.HasValue; import com.vaadin.data.SelectionModel; import com.vaadin.data.SelectionModel.Multi; +import com.vaadin.data.provider.DataGenerator; import com.vaadin.event.selection.MultiSelectionEvent; import com.vaadin.event.selection.MultiSelectionListener; import com.vaadin.server.Resource; import com.vaadin.server.ResourceReference; import com.vaadin.server.SerializablePredicate; -import com.vaadin.server.data.DataGenerator; import com.vaadin.shared.Registration; import com.vaadin.shared.data.selection.MultiSelectServerRpc; import com.vaadin.shared.ui.ListingJsonConstants; diff --git a/server/src/main/java/com/vaadin/ui/AbstractSingleSelect.java b/server/src/main/java/com/vaadin/ui/AbstractSingleSelect.java index 6c0d1efc54..538356feaf 100644 --- a/server/src/main/java/com/vaadin/ui/AbstractSingleSelect.java +++ b/server/src/main/java/com/vaadin/ui/AbstractSingleSelect.java @@ -28,9 +28,9 @@ import org.jsoup.nodes.Element; import com.vaadin.data.HasValue; import com.vaadin.data.SelectionModel; import com.vaadin.data.SelectionModel.Single; +import com.vaadin.data.provider.DataCommunicator; import com.vaadin.event.selection.SingleSelectionEvent; import com.vaadin.event.selection.SingleSelectionListener; -import com.vaadin.server.data.DataCommunicator; import com.vaadin.shared.Registration; import com.vaadin.shared.data.selection.SelectionServerRpc; import com.vaadin.shared.ui.AbstractSingleSelectState; diff --git a/server/src/main/java/com/vaadin/ui/CheckBoxGroup.java b/server/src/main/java/com/vaadin/ui/CheckBoxGroup.java index 508d4ed4cc..ddc0945bc3 100644 --- a/server/src/main/java/com/vaadin/ui/CheckBoxGroup.java +++ b/server/src/main/java/com/vaadin/ui/CheckBoxGroup.java @@ -23,6 +23,7 @@ import java.util.Set; import org.jsoup.nodes.Element; import com.vaadin.data.Listing; +import com.vaadin.data.provider.DataProvider; import com.vaadin.event.FieldEvents.BlurEvent; import com.vaadin.event.FieldEvents.BlurListener; import com.vaadin.event.FieldEvents.BlurNotifier; @@ -31,7 +32,6 @@ import com.vaadin.event.FieldEvents.FocusEvent; import com.vaadin.event.FieldEvents.FocusListener; import com.vaadin.event.FieldEvents.FocusNotifier; import com.vaadin.server.SerializablePredicate; -import com.vaadin.server.data.DataProvider; import com.vaadin.shared.Registration; import com.vaadin.shared.ui.optiongroup.CheckBoxGroupState; import com.vaadin.ui.declarative.DesignContext; diff --git a/server/src/main/java/com/vaadin/ui/ComboBox.java b/server/src/main/java/com/vaadin/ui/ComboBox.java index 3bebc78410..2df887016d 100644 --- a/server/src/main/java/com/vaadin/ui/ComboBox.java +++ b/server/src/main/java/com/vaadin/ui/ComboBox.java @@ -32,15 +32,15 @@ import org.jsoup.nodes.Element; import com.vaadin.data.HasValue; import com.vaadin.data.Listing; +import com.vaadin.data.provider.DataCommunicator; +import com.vaadin.data.provider.DataKeyMapper; +import com.vaadin.data.provider.DataProvider; import com.vaadin.event.FieldEvents; import com.vaadin.event.FieldEvents.BlurEvent; import com.vaadin.event.FieldEvents.BlurListener; import com.vaadin.event.FieldEvents.FocusAndBlurServerRpcDecorator; import com.vaadin.event.FieldEvents.FocusEvent; import com.vaadin.event.FieldEvents.FocusListener; -import com.vaadin.server.data.DataCommunicator; -import com.vaadin.server.data.DataKeyMapper; -import com.vaadin.server.data.DataProvider; import com.vaadin.shared.Registration; import com.vaadin.shared.data.DataCommunicatorConstants; import com.vaadin.shared.ui.combobox.ComboBoxConstants; diff --git a/server/src/main/java/com/vaadin/ui/Grid.java b/server/src/main/java/com/vaadin/ui/Grid.java index 1d46b29f99..9f4f00a114 100644 --- a/server/src/main/java/com/vaadin/ui/Grid.java +++ b/server/src/main/java/com/vaadin/ui/Grid.java @@ -48,6 +48,10 @@ import com.vaadin.data.BinderValidationStatus; import com.vaadin.data.Listing; import com.vaadin.data.SelectionModel; import com.vaadin.data.ValueProvider; +import com.vaadin.data.provider.DataCommunicator; +import com.vaadin.data.provider.DataProvider; +import com.vaadin.data.provider.Query; +import com.vaadin.data.provider.SortOrder; import com.vaadin.event.ConnectorEvent; import com.vaadin.event.ContextClickEvent; import com.vaadin.event.SerializableEventListener; @@ -59,10 +63,6 @@ import com.vaadin.server.Extension; import com.vaadin.server.JsonCodec; import com.vaadin.server.SerializableComparator; import com.vaadin.server.SerializableFunction; -import com.vaadin.server.data.DataCommunicator; -import com.vaadin.server.data.DataProvider; -import com.vaadin.server.data.Query; -import com.vaadin.server.data.SortOrder; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.Registration; import com.vaadin.shared.data.DataCommunicatorConstants; diff --git a/server/src/main/java/com/vaadin/ui/ListSelect.java b/server/src/main/java/com/vaadin/ui/ListSelect.java index 8716bc4d05..1d450d78cf 100644 --- a/server/src/main/java/com/vaadin/ui/ListSelect.java +++ b/server/src/main/java/com/vaadin/ui/ListSelect.java @@ -18,7 +18,7 @@ package com.vaadin.ui; import java.util.Collection; import com.vaadin.data.Listing; -import com.vaadin.server.data.DataProvider; +import com.vaadin.data.provider.DataProvider; import com.vaadin.shared.ui.listselect.ListSelectState; /** diff --git a/server/src/main/java/com/vaadin/ui/NativeSelect.java b/server/src/main/java/com/vaadin/ui/NativeSelect.java index e7678b7515..2d0e805d41 100644 --- a/server/src/main/java/com/vaadin/ui/NativeSelect.java +++ b/server/src/main/java/com/vaadin/ui/NativeSelect.java @@ -19,6 +19,7 @@ package com.vaadin.ui; import java.util.Collection; import com.vaadin.data.Listing; +import com.vaadin.data.provider.DataProvider; import com.vaadin.event.FieldEvents.BlurEvent; import com.vaadin.event.FieldEvents.BlurListener; import com.vaadin.event.FieldEvents.BlurNotifier; @@ -26,7 +27,6 @@ import com.vaadin.event.FieldEvents.FocusAndBlurServerRpcDecorator; import com.vaadin.event.FieldEvents.FocusEvent; import com.vaadin.event.FieldEvents.FocusListener; import com.vaadin.event.FieldEvents.FocusNotifier; -import com.vaadin.server.data.DataProvider; import com.vaadin.shared.Registration; import com.vaadin.shared.data.DataCommunicatorConstants; import com.vaadin.shared.ui.nativeselect.NativeSelectState; diff --git a/server/src/main/java/com/vaadin/ui/RadioButtonGroup.java b/server/src/main/java/com/vaadin/ui/RadioButtonGroup.java index 0f3bd43c98..5d4d44d169 100644 --- a/server/src/main/java/com/vaadin/ui/RadioButtonGroup.java +++ b/server/src/main/java/com/vaadin/ui/RadioButtonGroup.java @@ -24,6 +24,8 @@ import java.util.Set; import org.jsoup.nodes.Element; import com.vaadin.data.Listing; +import com.vaadin.data.provider.DataGenerator; +import com.vaadin.data.provider.DataProvider; import com.vaadin.event.FieldEvents.BlurEvent; import com.vaadin.event.FieldEvents.BlurListener; import com.vaadin.event.FieldEvents.BlurNotifier; @@ -34,8 +36,6 @@ import com.vaadin.event.FieldEvents.FocusNotifier; import com.vaadin.server.Resource; import com.vaadin.server.ResourceReference; import com.vaadin.server.SerializablePredicate; -import com.vaadin.server.data.DataGenerator; -import com.vaadin.server.data.DataProvider; import com.vaadin.shared.Registration; import com.vaadin.shared.ui.ListingJsonConstants; import com.vaadin.shared.ui.optiongroup.RadioButtonGroupState; diff --git a/server/src/main/java/com/vaadin/ui/TwinColSelect.java b/server/src/main/java/com/vaadin/ui/TwinColSelect.java index 37b79a6bac..bcc8b52024 100644 --- a/server/src/main/java/com/vaadin/ui/TwinColSelect.java +++ b/server/src/main/java/com/vaadin/ui/TwinColSelect.java @@ -19,7 +19,7 @@ package com.vaadin.ui; import java.util.Collection; import com.vaadin.data.Listing; -import com.vaadin.server.data.DataProvider; +import com.vaadin.data.provider.DataProvider; import com.vaadin.shared.ui.twincolselect.TwinColSelectState; /** diff --git a/server/src/main/java/com/vaadin/ui/components/grid/MultiSelectionModelImpl.java b/server/src/main/java/com/vaadin/ui/components/grid/MultiSelectionModelImpl.java index c3e9f38cb2..764d958dac 100644 --- a/server/src/main/java/com/vaadin/ui/components/grid/MultiSelectionModelImpl.java +++ b/server/src/main/java/com/vaadin/ui/components/grid/MultiSelectionModelImpl.java @@ -24,11 +24,11 @@ import java.util.function.Consumer; import java.util.stream.Collectors; import java.util.stream.Stream; +import com.vaadin.data.provider.DataCommunicator; +import com.vaadin.data.provider.DataProvider; +import com.vaadin.data.provider.Query; import com.vaadin.event.selection.MultiSelectionEvent; import com.vaadin.event.selection.MultiSelectionListener; -import com.vaadin.server.data.DataCommunicator; -import com.vaadin.server.data.DataProvider; -import com.vaadin.server.data.Query; import com.vaadin.shared.Registration; import com.vaadin.shared.data.selection.GridMultiSelectServerRpc; import com.vaadin.shared.ui.grid.MultiSelectionModelState; diff --git a/server/src/test/java/com/vaadin/server/data/HasValueTest.java b/server/src/test/java/com/vaadin/data/HasValueTest.java index cc3815d0e5..f250d6a5b6 100644 --- a/server/src/test/java/com/vaadin/server/data/HasValueTest.java +++ b/server/src/test/java/com/vaadin/data/HasValueTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.server.data; +package com.vaadin.data; import org.junit.Test; import org.mockito.Mockito; diff --git a/server/src/test/java/com/vaadin/server/data/AbstractDataProviderTest.java b/server/src/test/java/com/vaadin/data/provider/AbstractDataProviderTest.java index b6033ad098..58ce4c3f75 100644 --- a/server/src/test/java/com/vaadin/server/data/AbstractDataProviderTest.java +++ b/server/src/test/java/com/vaadin/data/provider/AbstractDataProviderTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.server.data; +package com.vaadin.data.provider; import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Stream; @@ -21,6 +21,9 @@ import java.util.stream.Stream; import org.junit.Assert; import org.junit.Test; +import com.vaadin.data.provider.AbstractDataProvider; +import com.vaadin.data.provider.DataChangeEvent; +import com.vaadin.data.provider.Query; import com.vaadin.shared.Registration; /** diff --git a/server/src/test/java/com/vaadin/server/data/provider/BackendDataProviderTest.java b/server/src/test/java/com/vaadin/data/provider/BackendDataProviderTest.java index 3a70f94b9d..6e9727af3f 100644 --- a/server/src/test/java/com/vaadin/server/data/provider/BackendDataProviderTest.java +++ b/server/src/test/java/com/vaadin/data/provider/BackendDataProviderTest.java @@ -1,4 +1,4 @@ -package com.vaadin.server.data.provider; +package com.vaadin.data.provider; import java.util.Comparator; import java.util.HashMap; @@ -7,9 +7,9 @@ import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; +import com.vaadin.data.provider.BackEndDataProvider; +import com.vaadin.data.provider.SortOrder; import com.vaadin.server.SerializablePredicate; -import com.vaadin.server.data.BackEndDataProvider; -import com.vaadin.server.data.SortOrder; import com.vaadin.shared.data.sort.SortDirection; public class BackendDataProviderTest extends diff --git a/server/src/test/java/com/vaadin/server/data/DataCommunicatorTest.java b/server/src/test/java/com/vaadin/data/provider/DataCommunicatorTest.java index 36238a2bdc..f185d0969e 100644 --- a/server/src/test/java/com/vaadin/server/data/DataCommunicatorTest.java +++ b/server/src/test/java/com/vaadin/data/provider/DataCommunicatorTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.server.data; +package com.vaadin.data.provider; import java.util.Collections; @@ -21,6 +21,9 @@ import org.junit.Assert; import org.junit.Test; import org.mockito.Mockito; +import com.vaadin.data.provider.DataCommunicator; +import com.vaadin.data.provider.DataProviderListener; +import com.vaadin.data.provider.ListDataProvider; import com.vaadin.server.MockVaadinSession; import com.vaadin.server.SerializablePredicate; import com.vaadin.server.VaadinRequest; diff --git a/server/src/test/java/com/vaadin/server/data/provider/DataProviderTestBase.java b/server/src/test/java/com/vaadin/data/provider/DataProviderTestBase.java index b6a6bfa11f..fa7ca2d840 100644 --- a/server/src/test/java/com/vaadin/server/data/provider/DataProviderTestBase.java +++ b/server/src/test/java/com/vaadin/data/provider/DataProviderTestBase.java @@ -1,4 +1,4 @@ -package com.vaadin.server.data.provider; +package com.vaadin.data.provider; import static org.junit.Assert.assertTrue; @@ -12,13 +12,13 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import com.vaadin.data.provider.DataChangeEvent; +import com.vaadin.data.provider.DataProvider; +import com.vaadin.data.provider.DataProviderListener; +import com.vaadin.data.provider.Query; +import com.vaadin.data.provider.Sort; +import com.vaadin.data.provider.SortOrder; import com.vaadin.server.SerializablePredicate; -import com.vaadin.server.data.DataChangeEvent; -import com.vaadin.server.data.DataProvider; -import com.vaadin.server.data.DataProviderListener; -import com.vaadin.server.data.Query; -import com.vaadin.server.data.Sort; -import com.vaadin.server.data.SortOrder; public abstract class DataProviderTestBase<D extends DataProvider<StrBean, SerializablePredicate<StrBean>>> { diff --git a/server/src/test/java/com/vaadin/server/data/provider/ListDataProviderTest.java b/server/src/test/java/com/vaadin/data/provider/ListDataProviderTest.java index 1141675ac1..8cb9c2a4fe 100644 --- a/server/src/test/java/com/vaadin/server/data/provider/ListDataProviderTest.java +++ b/server/src/test/java/com/vaadin/data/provider/ListDataProviderTest.java @@ -1,4 +1,4 @@ -package com.vaadin.server.data.provider; +package com.vaadin.data.provider; import java.util.Comparator; import java.util.List; @@ -6,11 +6,11 @@ import java.util.List; import org.junit.Assert; import org.junit.Test; +import com.vaadin.data.provider.DataProvider; +import com.vaadin.data.provider.ListDataProvider; +import com.vaadin.data.provider.Query; +import com.vaadin.data.provider.SortOrder; import com.vaadin.server.SerializablePredicate; -import com.vaadin.server.data.DataProvider; -import com.vaadin.server.data.ListDataProvider; -import com.vaadin.server.data.Query; -import com.vaadin.server.data.SortOrder; public class ListDataProviderTest extends DataProviderTestBase<ListDataProvider<StrBean>> { diff --git a/server/src/test/java/com/vaadin/server/data/provider/StrBean.java b/server/src/test/java/com/vaadin/data/provider/StrBean.java index b0a346d9c5..29c188b82d 100644 --- a/server/src/test/java/com/vaadin/server/data/provider/StrBean.java +++ b/server/src/test/java/com/vaadin/data/provider/StrBean.java @@ -1,4 +1,4 @@ -package com.vaadin.server.data.provider; +package com.vaadin.data.provider; import java.io.Serializable; import java.util.ArrayList; diff --git a/server/src/test/java/com/vaadin/server/data/provider/bov/DataProviderBoVTest.java b/server/src/test/java/com/vaadin/data/provider/bov/DataProviderBoVTest.java index 2b282a535a..4b9c0bf628 100644 --- a/server/src/test/java/com/vaadin/server/data/provider/bov/DataProviderBoVTest.java +++ b/server/src/test/java/com/vaadin/data/provider/bov/DataProviderBoVTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.server.data.provider.bov; +package com.vaadin.data.provider.bov; import java.util.ArrayList; import java.util.Arrays; @@ -25,9 +25,9 @@ import java.util.stream.Stream; import org.junit.Before; import org.junit.Test; -import com.vaadin.server.data.BackEndDataProvider; -import com.vaadin.server.data.DataProvider; -import com.vaadin.server.data.SortOrder; +import com.vaadin.data.provider.BackEndDataProvider; +import com.vaadin.data.provider.DataProvider; +import com.vaadin.data.provider.SortOrder; import com.vaadin.shared.data.sort.SortDirection; /** diff --git a/server/src/test/java/com/vaadin/server/data/provider/bov/Person.java b/server/src/test/java/com/vaadin/data/provider/bov/Person.java index 8a60510949..40e2b0cb74 100644 --- a/server/src/test/java/com/vaadin/server/data/provider/bov/Person.java +++ b/server/src/test/java/com/vaadin/data/provider/bov/Person.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.server.data.provider.bov; +package com.vaadin.data.provider.bov; import java.io.Serializable; diff --git a/server/src/test/java/com/vaadin/server/data/provider/bov/PersonService.java b/server/src/test/java/com/vaadin/data/provider/bov/PersonService.java index 70c355720e..2bb35c57e5 100644 --- a/server/src/test/java/com/vaadin/server/data/provider/bov/PersonService.java +++ b/server/src/test/java/com/vaadin/data/provider/bov/PersonService.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.server.data.provider.bov; +package com.vaadin.data.provider.bov; import java.io.Serializable; import java.util.Collection; diff --git a/server/src/test/java/com/vaadin/server/RemoveListenersDeprecatedTest.java b/server/src/test/java/com/vaadin/server/RemoveListenersDeprecatedTest.java index e9c97d1b80..d597ab3539 100644 --- a/server/src/test/java/com/vaadin/server/RemoveListenersDeprecatedTest.java +++ b/server/src/test/java/com/vaadin/server/RemoveListenersDeprecatedTest.java @@ -10,9 +10,9 @@ import java.util.regex.Pattern; import org.junit.Assert; import org.junit.Test; +import com.vaadin.data.provider.AbstractDataProvider; import com.vaadin.event.EventRouter; import com.vaadin.event.MethodEventSource; -import com.vaadin.server.data.AbstractDataProvider; import com.vaadin.shared.Registration; import com.vaadin.tests.VaadinClasses; diff --git a/server/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionModelTest.java b/server/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionModelTest.java index e353035c63..21e157c925 100644 --- a/server/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionModelTest.java +++ b/server/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionModelTest.java @@ -24,10 +24,10 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; +import com.vaadin.data.provider.BackEndDataProvider; +import com.vaadin.data.provider.bov.Person; import com.vaadin.event.selection.MultiSelectionEvent; import com.vaadin.event.selection.MultiSelectionListener; -import com.vaadin.server.data.BackEndDataProvider; -import com.vaadin.server.data.provider.bov.Person; import com.vaadin.shared.Registration; import com.vaadin.tests.util.MockUI; import com.vaadin.ui.Grid; diff --git a/server/src/test/java/com/vaadin/tests/components/grid/GridNoSelectionModelTest.java b/server/src/test/java/com/vaadin/tests/components/grid/GridNoSelectionModelTest.java index 8ae829fb56..442b5009ac 100644 --- a/server/src/test/java/com/vaadin/tests/components/grid/GridNoSelectionModelTest.java +++ b/server/src/test/java/com/vaadin/tests/components/grid/GridNoSelectionModelTest.java @@ -8,7 +8,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.vaadin.server.data.provider.bov.Person; +import com.vaadin.data.provider.bov.Person; import com.vaadin.ui.Grid; import com.vaadin.ui.Grid.GridSelectionModel; import com.vaadin.ui.Grid.SelectionMode; diff --git a/server/src/test/java/com/vaadin/tests/components/grid/GridSingleSelectionModelTest.java b/server/src/test/java/com/vaadin/tests/components/grid/GridSingleSelectionModelTest.java index 6bf81982c8..9132ecaa22 100644 --- a/server/src/test/java/com/vaadin/tests/components/grid/GridSingleSelectionModelTest.java +++ b/server/src/test/java/com/vaadin/tests/components/grid/GridSingleSelectionModelTest.java @@ -18,9 +18,9 @@ import org.junit.Test; import org.mockito.Mockito; import com.vaadin.data.HasValue.ValueChangeEvent; +import com.vaadin.data.provider.bov.Person; import com.vaadin.event.selection.SingleSelectionEvent; import com.vaadin.event.selection.SingleSelectionListener; -import com.vaadin.server.data.provider.bov.Person; import com.vaadin.shared.Registration; import com.vaadin.ui.Grid; import com.vaadin.ui.Grid.GridSelectionModel; diff --git a/server/src/test/java/com/vaadin/tests/server/component/combobox/ComboBoxFilteringTest.java b/server/src/test/java/com/vaadin/tests/server/component/combobox/ComboBoxFilteringTest.java index 9719cd43b8..e7a3718756 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/combobox/ComboBoxFilteringTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/combobox/ComboBoxFilteringTest.java @@ -24,9 +24,9 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.vaadin.server.data.DataProvider; -import com.vaadin.server.data.ListDataProvider; -import com.vaadin.server.data.Query; +import com.vaadin.data.provider.DataProvider; +import com.vaadin.data.provider.ListDataProvider; +import com.vaadin.data.provider.Query; import com.vaadin.tests.data.bean.Person; import com.vaadin.tests.data.bean.Sex; import com.vaadin.ui.ComboBox; diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/GridDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/GridDeclarativeTest.java index dabefcc9ac..b4d9dc5f29 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/grid/GridDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/grid/GridDeclarativeTest.java @@ -27,7 +27,7 @@ import org.junit.Test; import com.vaadin.data.SelectionModel.Multi; import com.vaadin.data.SelectionModel.Single; -import com.vaadin.server.data.DataProvider; +import com.vaadin.data.provider.DataProvider; import com.vaadin.shared.ui.grid.HeightMode; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.data.bean.Person; diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/GridTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/GridTest.java index d657fc055a..26eab6c911 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/grid/GridTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/grid/GridTest.java @@ -14,8 +14,8 @@ import org.junit.Before; import org.junit.Test; import com.vaadin.data.ValueProvider; +import com.vaadin.data.provider.SortOrder; import com.vaadin.event.selection.SelectionEvent; -import com.vaadin.server.data.SortOrder; import com.vaadin.shared.data.sort.SortDirection; import com.vaadin.shared.ui.grid.HeightMode; import com.vaadin.ui.Grid; diff --git a/server/src/test/java/com/vaadin/ui/AbstractListingTest.java b/server/src/test/java/com/vaadin/ui/AbstractListingTest.java index 369efd6e89..819ed9feb3 100644 --- a/server/src/test/java/com/vaadin/ui/AbstractListingTest.java +++ b/server/src/test/java/com/vaadin/ui/AbstractListingTest.java @@ -12,10 +12,10 @@ import org.junit.Before; import org.junit.Test; import com.vaadin.data.Listing; -import com.vaadin.server.data.BackEndDataProvider; -import com.vaadin.server.data.DataProvider; -import com.vaadin.server.data.ListDataProvider; -import com.vaadin.server.data.Query; +import com.vaadin.data.provider.BackEndDataProvider; +import com.vaadin.data.provider.DataProvider; +import com.vaadin.data.provider.ListDataProvider; +import com.vaadin.data.provider.Query; import com.vaadin.ui.AbstractListing.AbstractListingExtension; import com.vaadin.ui.declarative.DesignContext; diff --git a/server/src/test/java/com/vaadin/ui/AbstractMultiSelectTest.java b/server/src/test/java/com/vaadin/ui/AbstractMultiSelectTest.java index 93985114be..68461b676f 100644 --- a/server/src/test/java/com/vaadin/ui/AbstractMultiSelectTest.java +++ b/server/src/test/java/com/vaadin/ui/AbstractMultiSelectTest.java @@ -37,10 +37,10 @@ import org.junit.runners.Parameterized.Parameters; import org.mockito.Mockito; import com.vaadin.data.HasValue.ValueChangeEvent; +import com.vaadin.data.provider.DataProvider; import com.vaadin.data.Listing; import com.vaadin.event.selection.MultiSelectionEvent; import com.vaadin.event.selection.MultiSelectionListener; -import com.vaadin.server.data.DataProvider; import com.vaadin.shared.Registration; import com.vaadin.shared.data.selection.MultiSelectServerRpc; diff --git a/server/src/test/java/com/vaadin/ui/AbstractSingleSelectTest.java b/server/src/test/java/com/vaadin/ui/AbstractSingleSelectTest.java index e519612810..51e4fa71e9 100644 --- a/server/src/test/java/com/vaadin/ui/AbstractSingleSelectTest.java +++ b/server/src/test/java/com/vaadin/ui/AbstractSingleSelectTest.java @@ -32,11 +32,11 @@ import org.junit.Test; import org.mockito.Mockito; import com.vaadin.data.HasValue.ValueChangeEvent; +import com.vaadin.data.provider.DataProvider; +import com.vaadin.data.provider.bov.Person; import com.vaadin.data.Listing; import com.vaadin.event.selection.SingleSelectionEvent; import com.vaadin.event.selection.SingleSelectionListener; -import com.vaadin.server.data.DataProvider; -import com.vaadin.server.data.provider.bov.Person; import com.vaadin.shared.Registration; import com.vaadin.shared.data.DataCommunicatorClientRpc; import com.vaadin.ui.declarative.DesignContext; diff --git a/server/src/test/java/com/vaadin/ui/RadioButtonGroupTest.java b/server/src/test/java/com/vaadin/ui/RadioButtonGroupTest.java index 9219ec834e..8dfbc70e56 100644 --- a/server/src/test/java/com/vaadin/ui/RadioButtonGroupTest.java +++ b/server/src/test/java/com/vaadin/ui/RadioButtonGroupTest.java @@ -24,7 +24,7 @@ import org.junit.Before; import org.junit.Test; import com.vaadin.data.SelectionModel.Multi; -import com.vaadin.server.data.DataProvider; +import com.vaadin.data.provider.DataProvider; import com.vaadin.shared.data.selection.SelectionServerRpc; public class RadioButtonGroupTest { diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSelectingWithNewItemsAllowed.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSelectingWithNewItemsAllowed.java index a3e48f3509..71166550e7 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSelectingWithNewItemsAllowed.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSelectingWithNewItemsAllowed.java @@ -15,8 +15,8 @@ */ package com.vaadin.tests.components.combobox; +import com.vaadin.data.provider.Query; import com.vaadin.server.VaadinRequest; -import com.vaadin.server.data.Query; import com.vaadin.ui.Label; public class ComboBoxSelectingWithNewItemsAllowed extends ComboBoxSelecting { diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridApplyFilterWhenScrolledDown.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridApplyFilterWhenScrolledDown.java index a88db04c32..3d110042ee 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridApplyFilterWhenScrolledDown.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridApplyFilterWhenScrolledDown.java @@ -4,8 +4,8 @@ import java.util.ArrayList; import java.util.List; import com.vaadin.data.ValueProvider; +import com.vaadin.data.provider.DataProvider; import com.vaadin.server.VaadinRequest; -import com.vaadin.server.data.DataProvider; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Grid; diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorCustomField.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorCustomField.java index 409147ff9b..40f8695ece 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorCustomField.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorCustomField.java @@ -20,9 +20,9 @@ import java.util.Set; import com.vaadin.annotations.Theme; import com.vaadin.data.Binder; +import com.vaadin.data.provider.ListDataProvider; +import com.vaadin.data.provider.Query; import com.vaadin.server.VaadinRequest; -import com.vaadin.server.data.ListDataProvider; -import com.vaadin.server.data.Query; import com.vaadin.tests.components.AbstractTestUIWithLog; import com.vaadin.tests.fieldgroup.ComplexPerson; import com.vaadin.ui.Button; @@ -79,13 +79,12 @@ public class GridEditorCustomField extends AbstractTestUIWithLog { private Grid<ComplexPerson> createGrid() { Grid<ComplexPerson> grid = new Grid<>(); grid.setWidth("800px"); - grid.addColumn(FIRST_NAME_IDENTIFIER, person -> person.getFirstName()) - .setCaption("First Name"); - grid.addColumn(LAST_NAME_IDENTIFIER, person -> person.getLastName()) - .setCaption("Last Name"); - grid.addColumn(ADDRESS_CITY_IDENTIFIER, - person -> person.getAddress().getCity()) - .setCaption("City Name"); + grid.addColumn(person -> person.getFirstName()) + .setId(FIRST_NAME_IDENTIFIER).setCaption("First Name"); + grid.addColumn(person -> person.getLastName()) + .setId(LAST_NAME_IDENTIFIER).setCaption("Last Name"); + grid.addColumn(person -> person.getAddress().getCity()) + .setId(ADDRESS_CITY_IDENTIFIER).setCaption("City Name"); grid.getEditor().setEnabled(true); return grid; diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/basics/RefreshDataProvider.java b/uitest/src/main/java/com/vaadin/tests/components/grid/basics/RefreshDataProvider.java index d368d1ffd3..68865b98fa 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/basics/RefreshDataProvider.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/basics/RefreshDataProvider.java @@ -17,9 +17,9 @@ package com.vaadin.tests.components.grid.basics; import java.util.List; +import com.vaadin.data.provider.DataProvider; +import com.vaadin.data.provider.ListDataProvider; import com.vaadin.server.VaadinRequest; -import com.vaadin.server.data.DataProvider; -import com.vaadin.server.data.ListDataProvider; import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Grid; diff --git a/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectAddRemoveItems.java b/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectAddRemoveItems.java index fdcb15c1f0..b2a63f49c1 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectAddRemoveItems.java +++ b/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectAddRemoveItems.java @@ -20,9 +20,9 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; +import com.vaadin.data.provider.ListDataProvider; +import com.vaadin.data.provider.Query; import com.vaadin.server.VaadinRequest; -import com.vaadin.server.data.ListDataProvider; -import com.vaadin.server.data.Query; import com.vaadin.tests.components.AbstractTestUIWithLog; import com.vaadin.ui.Button; import com.vaadin.ui.ListSelect; diff --git a/uitest/src/main/java/com/vaadin/tests/data/DummyData.java b/uitest/src/main/java/com/vaadin/tests/data/DummyData.java index f973fde0b9..ed13a2300e 100644 --- a/uitest/src/main/java/com/vaadin/tests/data/DummyData.java +++ b/uitest/src/main/java/com/vaadin/tests/data/DummyData.java @@ -9,10 +9,10 @@ import java.util.stream.Stream; import com.vaadin.annotations.Widgetset; import com.vaadin.data.Listing; +import com.vaadin.data.provider.DataProvider; +import com.vaadin.data.provider.ListDataProvider; +import com.vaadin.data.provider.Query; import com.vaadin.server.VaadinRequest; -import com.vaadin.server.data.DataProvider; -import com.vaadin.server.data.ListDataProvider; -import com.vaadin.server.data.Query; import com.vaadin.shared.data.DataCommunicatorConstants; import com.vaadin.tests.components.AbstractTestUIWithLog; import com.vaadin.tests.widgetset.TestingWidgetSet; diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/ComplexPerson.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/ComplexPerson.java index 8e355484b9..217eaab378 100644 --- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/ComplexPerson.java +++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/ComplexPerson.java @@ -6,8 +6,8 @@ import java.util.Date; import java.util.List; import java.util.Random; -import com.vaadin.server.data.DataProvider; -import com.vaadin.server.data.ListDataProvider; +import com.vaadin.data.provider.DataProvider; +import com.vaadin.data.provider.ListDataProvider; import com.vaadin.tests.util.TestDataGenerator; import com.vaadin.v7.data.util.BeanItemContainer; diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java b/uitest/src/main/java/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java index 2c37d1a0e0..f3b8dea9e9 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import com.vaadin.server.data.Query; +import com.vaadin.data.provider.Query; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.AbsoluteLayout; import com.vaadin.ui.Accordion; diff --git a/uitest/src/main/java/com/vaadin/tests/util/ItemDataProvider.java b/uitest/src/main/java/com/vaadin/tests/util/ItemDataProvider.java index 5f02135591..f7261a5d6d 100644 --- a/uitest/src/main/java/com/vaadin/tests/util/ItemDataProvider.java +++ b/uitest/src/main/java/com/vaadin/tests/util/ItemDataProvider.java @@ -4,8 +4,8 @@ import java.util.Locale; import java.util.stream.IntStream; import java.util.stream.Stream; -import com.vaadin.server.data.BackEndDataProvider; -import com.vaadin.server.data.Query; +import com.vaadin.data.provider.BackEndDataProvider; +import com.vaadin.data.provider.Query; /** * A data provider for tests that creates "Item n" strings on the fly. |