Encode all values based on declared type (#10549)

* ServerRpc encoding uses type data from the interface
* Beans encoded on the server use reflection based on declared type
* Remove row numbers to enable adding test without changing old indices
* Update test to send non-primitive map values

Change-Id: I0462b547cb7de252564b3569420b0b24cee4515f

1 files changed, 21 insertions, 5 deletions

diff --git a/uitest/src/com/vaadin/tests/serialization/SerializerTest.java b/uitest/src/com/vaadin/tests/serialization/SerializerTest.java
index e7acd3e79b..efadf8c237 100644
--- a/uitest/src/com/vaadin/tests/serialization/SerializerTest.java
+++ b/uitest/src/com/vaadin/tests/serialization/SerializerTest.java
@@ -46,10 +46,20 @@ public class SerializerTest extends AbstractTestUI {
     protected void setup(VaadinRequest request) {
         final SerializerTestExtension testExtension = new SerializerTestExtension();
         addExtension(testExtension);
+
+        // Don't show row numbers to make it easier to add tests without
+        // changing all numbers
+        log.setNumberLogRows(false);
         addComponent(log);
 
         SerializerTestRpc rpc = testExtension
                 .getRpcProxy(SerializerTestRpc.class);
+        rpc.sendBeanSubclass(new SimpleTestBean() {
+            @Override
+            public int getValue() {
+                return 42;
+            }
+        });
         rpc.sendBoolean(true, Boolean.FALSE, new boolean[] { true, true, false,
                 true, false, false });
         rpc.sendByte((byte) 5, Byte.valueOf((byte) -12), new byte[] { 3, 1, 2 });
@@ -95,10 +105,10 @@ public class SerializerTest extends AbstractTestUI {
                 put("1", new SimpleTestBean(1));
                 put("2", new SimpleTestBean(2));
             }
-        }, new HashMap<Connector, Boolean>() {
+        }, new HashMap<Connector, SimpleTestBean>() {
             {
-                put(testExtension, true);
-                put(getUI(), false);
+                put(testExtension, new SimpleTestBean(3));
+                put(getUI(), new SimpleTestBean(4));
             }
         }, new HashMap<Integer, Connector>() {
             {
@@ -252,11 +262,12 @@ public class SerializerTest extends AbstractTestUI {
 
             @Override
             public void sendMap(Map<String, SimpleTestBean> stringMap,
-                    Map<Connector, Boolean> connectorMap,
+                    Map<Connector, SimpleTestBean> connectorMap,
                     Map<Integer, Connector> intMap,
                     Map<SimpleTestBean, SimpleTestBean> beanMap) {
                 StringBuilder sb = new StringBuilder();
-                for (Entry<Connector, Boolean> entry : connectorMap.entrySet()) {
+                for (Entry<Connector, SimpleTestBean> entry : connectorMap
+                        .entrySet()) {
                     if (sb.length() == 0) {
                         sb.append('[');
                     } else {
@@ -300,6 +311,11 @@ public class SerializerTest extends AbstractTestUI {
                         + Arrays.toString(array) + ", " + list);
             }
 
+            @Override
+            public void sendBeanSubclass(SimpleTestBean bean) {
+                log.log("sendBeanSubclass: " + bean.getValue());
+            }
+
         });
     }