Ensure all server and shared classes are serializable (#10735)

Change-Id: I40a59087fea7fbd4ad202ef803b42bbc76bf94d3

9 files changed, 20 insertions, 9 deletions

diff --git a/server/src/com/vaadin/data/ContainerHelpers.java b/server/src/com/vaadin/data/ContainerHelpers.java
index 3b6e37a546..f794656c83 100644
--- a/server/src/com/vaadin/data/ContainerHelpers.java
+++ b/server/src/com/vaadin/data/ContainerHelpers.java
@@ -15,6 +15,7 @@
  */
 package com.vaadin.data;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -27,7 +28,7 @@ import com.vaadin.data.Container.Indexed;
  * 
  * @since 7.0
  */
-public class ContainerHelpers {
+public class ContainerHelpers implements Serializable {
 
     /**
      * Get a range of item ids from the container using
diff --git a/server/src/com/vaadin/server/EncodeResult.java b/server/src/com/vaadin/server/EncodeResult.java
index cfed4bf340..87fefef548 100644
--- a/server/src/com/vaadin/server/EncodeResult.java
+++ b/server/src/com/vaadin/server/EncodeResult.java
@@ -16,7 +16,9 @@
 
 package com.vaadin.server;
 
-public class EncodeResult {
+import java.io.Serializable;
+
+public class EncodeResult implements Serializable {
     private final Object encodedValue;
     private final Object diff;
 
diff --git a/server/src/com/vaadin/server/JsonCodec.java b/server/src/com/vaadin/server/JsonCodec.java
index 4aefed515d..b9cdcf5a87 100644
--- a/server/src/com/vaadin/server/JsonCodec.java
+++ b/server/src/com/vaadin/server/JsonCodec.java
@@ -57,7 +57,7 @@ import com.vaadin.ui.ConnectorTracker;
  */
 public class JsonCodec implements Serializable {
 
-    public static interface BeanProperty {
+    public static interface BeanProperty extends Serializable {
         public Object getValue(Object bean) throws Exception;
 
         public void setValue(Object bean, Object value) throws Exception;
diff --git a/server/src/com/vaadin/server/VaadinPortlet.java b/server/src/com/vaadin/server/VaadinPortlet.java
index 7ac6312e54..e13a64682e 100644
--- a/server/src/com/vaadin/server/VaadinPortlet.java
+++ b/server/src/com/vaadin/server/VaadinPortlet.java
@@ -21,6 +21,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
+import java.io.Serializable;
 import java.lang.reflect.Method;
 import java.net.MalformedURLException;
 import java.security.GeneralSecurityException;
@@ -61,7 +62,8 @@ import com.vaadin.util.CurrentInstance;
  * 
  * @author peholmst
  */
-public class VaadinPortlet extends GenericPortlet implements Constants {
+public class VaadinPortlet extends GenericPortlet implements Constants,
+        Serializable {
 
     /**
      * @deprecated As of 7.0. Will likely change or be removed in a future
diff --git a/server/src/com/vaadin/server/WrappedSession.java b/server/src/com/vaadin/server/WrappedSession.java
index 58682a212f..57d3ef6a8c 100644
--- a/server/src/com/vaadin/server/WrappedSession.java
+++ b/server/src/com/vaadin/server/WrappedSession.java
@@ -16,6 +16,7 @@
 
 package com.vaadin.server;
 
+import java.io.Serializable;
 import java.util.Set;
 
 import javax.portlet.PortletSession;
@@ -30,7 +31,7 @@ import javax.servlet.http.HttpSession;
  * @version @VERSION@
  * @since 7.0.0
  */
-public interface WrappedSession {
+public interface WrappedSession extends Serializable {
     /**
      * Returns the maximum time interval, in seconds, that this session will be
      * kept open between client accesses.
diff --git a/server/src/com/vaadin/ui/AbstractColorPicker.java b/server/src/com/vaadin/ui/AbstractColorPicker.java
index 3d1d026d5e..d7037e366d 100644
--- a/server/src/com/vaadin/ui/AbstractColorPicker.java
+++ b/server/src/com/vaadin/ui/AbstractColorPicker.java
@@ -15,6 +15,7 @@
  */
 package com.vaadin.ui;
 
+import java.io.Serializable;
 import java.lang.reflect.Method;
 
 import com.vaadin.shared.ui.colorpicker.Color;
@@ -50,7 +51,7 @@ public abstract class AbstractColorPicker extends AbstractComponent implements
     /**
      * Interface for converting 2d-coordinates to a Color
      */
-    public interface Coordinates2Color {
+    public interface Coordinates2Color extends Serializable {
 
         /**
          * Calculate color from coordinates
diff --git a/server/src/com/vaadin/ui/components/colorpicker/HasColorChangeListener.java b/server/src/com/vaadin/ui/components/colorpicker/HasColorChangeListener.java
index a5803513b7..c84a90bf6f 100644
--- a/server/src/com/vaadin/ui/components/colorpicker/HasColorChangeListener.java
+++ b/server/src/com/vaadin/ui/components/colorpicker/HasColorChangeListener.java
@@ -15,7 +15,9 @@
  */
 package com.vaadin.ui.components.colorpicker;
 
-public interface HasColorChangeListener {
+import java.io.Serializable;
+
+public interface HasColorChangeListener extends Serializable {
 
     /**
      * Adds a {@link ColorChangeListener} to the component.
diff --git a/server/src/com/vaadin/util/CurrentInstance.java b/server/src/com/vaadin/util/CurrentInstance.java
index 805a8108f7..adf6d963c3 100644
--- a/server/src/com/vaadin/util/CurrentInstance.java
+++ b/server/src/com/vaadin/util/CurrentInstance.java
@@ -16,6 +16,7 @@
 
 package com.vaadin.util;
 
+import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -27,7 +28,7 @@ import java.util.Map.Entry;
  * @version @VERSION@
  * @since 7.0.0
  */
-public class CurrentInstance {
+public class CurrentInstance implements Serializable {
     private final Object instance;
     private final boolean inheritable;
 
diff --git a/server/src/com/vaadin/util/ReflectTools.java b/server/src/com/vaadin/util/ReflectTools.java
index 956b09b922..6fccd365fb 100644
--- a/server/src/com/vaadin/util/ReflectTools.java
+++ b/server/src/com/vaadin/util/ReflectTools.java
@@ -17,6 +17,7 @@ package com.vaadin.util;
 
 import java.beans.IntrospectionException;
 import java.beans.PropertyDescriptor;
+import java.io.Serializable;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
@@ -27,7 +28,7 @@ import java.lang.reflect.Method;
  * 
  * @since 6.2
  */
-public class ReflectTools {
+public class ReflectTools implements Serializable {
     /**
      * Locates the method in the given class. Returns null if the method is not
      * found. Throws an ExceptionInInitializerError if there is a problem