Provide in-memory sorting information in Query

Change-Id: Iebafff6079816c08e5a4d144f6891d1379751f12

2 files changed, 6 insertions, 7 deletions

diff --git a/server/src/test/java/com/vaadin/server/data/AbstractDataProviderTest.java b/server/src/test/java/com/vaadin/server/data/AbstractDataProviderTest.java
index db2f704e2d..b6033ad098 100644
--- a/server/src/test/java/com/vaadin/server/data/AbstractDataProviderTest.java
+++ b/server/src/test/java/com/vaadin/server/data/AbstractDataProviderTest.java
@@ -32,12 +32,12 @@ public class AbstractDataProviderTest {
     private static class TestDataProvider
             extends AbstractDataProvider<Object, Object> {
         @Override
-        public Stream<Object> fetch(Query<Object> t) {
+        public Stream<Object> fetch(Query<Object, Object> t) {
             return null;
         }
 
         @Override
-        public int size(Query<Object> t) {
+        public int size(Query<Object, Object> t) {
             return 0;
         }
 
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 54ea367fca..de03684307 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
@@ -156,16 +156,15 @@ public class ComboBoxFilteringTest {
 
         Assert.assertEquals(
                 "ComboBox filtered out results with no filter applied",
-                totalMatches, dataProvider.size(new Query<String>()));
+                totalMatches, dataProvider.size(new Query<>()));
         Assert.assertEquals(
                 "ComboBox filtered out results with empty filter string",
-                totalMatches, dataProvider.size(new Query<String>("")));
+                totalMatches, dataProvider.size(new Query<>("")));
         Assert.assertEquals("ComboBox filtered out wrong number of results",
-                matchingResults,
-                dataProvider.size(new Query<String>(filterText)));
+                matchingResults, dataProvider.size(new Query<>(filterText)));
         Assert.assertEquals(
                 "ComboBox should have no results with a non-matching filter", 0,
-                dataProvider.size(new Query<String>(nonMatchingFilterText)));
+                dataProvider.size(new Query<>(nonMatchingFilterText)));
     }
 
     private List<Person> getPersonCollection() {