From e10c3e78f5f35fb8e926eba25ba153555ce2ff0e Mon Sep 17 00:00:00 2001
From: Ilia Motornyi <elmot@vaadin.com>
Date: Thu, 24 May 2018 16:35:27 +0300
Subject: [PATCH] Use SerializableFunction, add serializable test (#210)

* Make classes serializable, add test
---
 pom.xml                                            |  7 +++++++
 .../vaadin/flow/component/grid/AbstractRow.java    |  5 +++--
 .../flow/component/grid/GridSerializableTest.java  | 14 ++++++++++++++
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 src/test/java/com/vaadin/flow/component/grid/GridSerializableTest.java

diff --git a/pom.xml b/pom.xml
index 4ba00be2..d891e682 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,6 +58,13 @@
             <scope>provided</scope>
         </dependency>
 
+        <!-- Dependencies for the test -->
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>flow-test-generic</artifactId>
+            <version>${flow.version}</version>
+            <scope>test</scope>
+        </dependency>
         <!-- Dependencies for the demo -->
         <dependency>
            <groupId>org.slf4j</groupId>
diff --git a/src/main/java/com/vaadin/flow/component/grid/AbstractRow.java b/src/main/java/com/vaadin/flow/component/grid/AbstractRow.java
index 80948861..b36d1a3e 100644
--- a/src/main/java/com/vaadin/flow/component/grid/AbstractRow.java
+++ b/src/main/java/com/vaadin/flow/component/grid/AbstractRow.java
@@ -31,6 +31,7 @@
 import com.vaadin.flow.component.grid.AbstractRow.AbstractCell;
 import com.vaadin.flow.component.grid.Grid.Column;
 import com.vaadin.flow.dom.Element;
+import com.vaadin.flow.function.SerializableFunction;
 
 /**
  * Base class for header and footer rows
@@ -90,9 +91,9 @@ protected AbstractColumn<?> getColumn() {
     protected ColumnLayer layer;
     protected List<CELL> cells;
 
-    private Function<AbstractColumn<?>, CELL> cellCtor;
+    private SerializableFunction<AbstractColumn<?>, CELL> cellCtor;
 
-    AbstractRow(ColumnLayer layer, Function<AbstractColumn<?>, CELL> cellCtor) {
+    AbstractRow(ColumnLayer layer, SerializableFunction<AbstractColumn<?>, CELL> cellCtor) {
         this.layer = layer;
         this.cellCtor = cellCtor;
         cells = layer.getColumns().stream().map(cellCtor)
diff --git a/src/test/java/com/vaadin/flow/component/grid/GridSerializableTest.java b/src/test/java/com/vaadin/flow/component/grid/GridSerializableTest.java
new file mode 100644
index 00000000..b0410cde
--- /dev/null
+++ b/src/test/java/com/vaadin/flow/component/grid/GridSerializableTest.java
@@ -0,0 +1,14 @@
+package com.vaadin.flow.component.grid;
+
+import java.util.stream.Stream;
+
+import com.vaadin.flow.testutil.ClassesSerializableTest;
+
+public class GridSerializableTest extends ClassesSerializableTest {
+    @Override
+    protected Stream<String> getExcludedPatterns() {
+        return Stream.concat(super.getExcludedPatterns(),Stream.of(
+                "com\\.vaadin\\.flow\\.component\\.grid\\.it\\..*"
+        ));
+    }
+}