Type Listing for DataProvider to allow custom filter types

Listing has been moved from AbstractListing to each individual Component.

ComboBox is now typed to String filter.

Fixes issues with declarative read of items.

Change-Id: I6918f9f8c426dcbd81546150c2cf9ed49a02bf50

3 files changed, 41 insertions, 9 deletions

diff --git a/server/src/test/java/com/vaadin/ui/AbstractListingTest.java b/server/src/test/java/com/vaadin/ui/AbstractListingTest.java
index b2f303ae24..369efd6e89 100644
--- a/server/src/test/java/com/vaadin/ui/AbstractListingTest.java
+++ b/server/src/test/java/com/vaadin/ui/AbstractListingTest.java
@@ -11,6 +11,7 @@ import org.junit.Assert;
 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;
@@ -22,7 +23,8 @@ import elemental.json.JsonObject;
 
 public class AbstractListingTest {
 
-    private final class TestListing extends AbstractSingleSelect<String> {
+    private final class TestListing extends AbstractSingleSelect<String>
+            implements Listing<String, DataProvider<String, ?>> {
 
         /**
          * Used to execute data generation
@@ -38,7 +40,19 @@ public class AbstractListingTest {
         }
 
         @Override
-        protected void readItems(Element design, DesignContext context) {
+        protected List<String> readItems(Element design,
+                DesignContext context) {
+            return null;
+        }
+
+        @Override
+        public DataProvider<String, ?> getDataProvider() {
+            return internalGetDataProvider();
+        }
+
+        @Override
+        public void setDataProvider(DataProvider<String, ?> dataProvider) {
+            internalSetDataProvider(dataProvider);
         }
     }
 
diff --git a/server/src/test/java/com/vaadin/ui/AbstractMultiSelectTest.java b/server/src/test/java/com/vaadin/ui/AbstractMultiSelectTest.java
index e31e6e28db..ff8d1fcead 100644
--- a/server/src/test/java/com/vaadin/ui/AbstractMultiSelectTest.java
+++ b/server/src/test/java/com/vaadin/ui/AbstractMultiSelectTest.java
@@ -26,7 +26,6 @@ import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import com.vaadin.server.data.DataProvider;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -38,22 +37,24 @@ import org.junit.runners.Parameterized.Parameters;
 import org.mockito.Mockito;
 
 import com.vaadin.data.HasValue.ValueChangeEvent;
+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;
 
 @RunWith(Parameterized.class)
-public class AbstractMultiSelectTest {
+public class AbstractMultiSelectTest<S extends AbstractMultiSelect<String> & Listing<String, DataProvider<String, ?>>> {
 
     @Parameters(name = "{0}")
-    public static Iterable<AbstractMultiSelect<String>> multiSelects() {
+    public static Iterable<?> multiSelects() {
         return Arrays.asList(new CheckBoxGroup<>(), new TwinColSelect<>(),
                 new ListSelect<>());
     }
 
     @Parameter
-    public AbstractMultiSelect<String> selectToTest;
+    public S selectToTest;
 
     private MultiSelectServerRpc rpc;
 
diff --git a/server/src/test/java/com/vaadin/ui/AbstractSingleSelectTest.java b/server/src/test/java/com/vaadin/ui/AbstractSingleSelectTest.java
index 4ea3fdcfa0..ee129d0e0a 100644
--- a/server/src/test/java/com/vaadin/ui/AbstractSingleSelectTest.java
+++ b/server/src/test/java/com/vaadin/ui/AbstractSingleSelectTest.java
@@ -32,8 +32,10 @@ import org.junit.Test;
 import org.mockito.Mockito;
 
 import com.vaadin.data.HasValue.ValueChangeEvent;
+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;
@@ -48,7 +50,8 @@ public class AbstractSingleSelectTest {
 
     private List<Person> selectionChanges;
 
-    private static class PersonListing extends AbstractSingleSelect<Person> {
+    private static class PersonListing extends AbstractSingleSelect<Person>
+            implements Listing<Person, DataProvider<Person, ?>> {
 
         @Override
         protected Element writeItem(Element design, Person item,
@@ -57,7 +60,19 @@ public class AbstractSingleSelectTest {
         }
 
         @Override
-        protected void readItems(Element design, DesignContext context) {
+        protected List<Person> readItems(Element design,
+                DesignContext context) {
+            return null;
+        }
+
+        @Override
+        public DataProvider<Person, ?> getDataProvider() {
+            return internalGetDataProvider();
+        }
+
+        @Override
+        public void setDataProvider(DataProvider<Person, ?> dataProvider) {
+            internalSetDataProvider(dataProvider);
         }
     }
 
@@ -240,7 +255,9 @@ public class AbstractSingleSelectTest {
             }
 
             @Override
-            protected void readItems(Element design, DesignContext context) {
+            protected List<String> readItems(Element design,
+                    DesignContext context) {
+                return null;
             }
         };