Support JsonValue types as declared types in state and RPC (#15560)

Change-Id: I2779a533811bb1b60c4e74789f6378574bc6ac61

1 files changed, 8 insertions, 1 deletions

diff --git a/server/src/com/vaadin/server/JsonCodec.java b/server/src/com/vaadin/server/JsonCodec.java
index 1f7b4ead43..ec1ea10f2b 100644
--- a/server/src/com/vaadin/server/JsonCodec.java
+++ b/server/src/com/vaadin/server/JsonCodec.java
@@ -300,7 +300,9 @@ public class JsonCodec implements Serializable {
         }
 
         // Try to decode object using fields
-        if (value.getType() == JsonType.NULL) {
+        if (isJsonType(targetType)) {
+            return value;
+        } else if (value.getType() == JsonType.NULL) {
             return null;
         } else if (targetType == byte.class || targetType == Byte.class) {
             return Byte.valueOf((byte) value.asNumber());
@@ -334,6 +336,11 @@ public class JsonCodec implements Serializable {
         }
     }
 
+    private static boolean isJsonType(Type type) {
+        return type instanceof Class<?>
+                && JsonValue.class.isAssignableFrom((Class<?>) type);
+    }
+
     private static Object decodeArray(Type componentType, JsonArray value,
             ConnectorTracker connectorTracker) {
         Class<?> componentClass = getClassForType(componentType);