Support arrays in RPC and shared state + test (#8655)

6 files changed, 197 insertions, 76 deletions

diff --git a/src/com/vaadin/terminal/gwt/client/communication/JsonDecoder.java b/src/com/vaadin/terminal/gwt/client/communication/JsonDecoder.java
index 1459d8ee7d..23a2c30cd0 100644
--- a/src/com/vaadin/terminal/gwt/client/communication/JsonDecoder.java
+++ b/src/com/vaadin/terminal/gwt/client/communication/JsonDecoder.java
@@ -52,9 +52,7 @@ public class JsonDecoder {
         }
 
         String baseTypeName = type.getBaseTypeName();
-        if (baseTypeName.endsWith("[]")) {
-            return decodeArray(type, (JSONArray) jsonValue, connection);
-        } else if (Map.class.getName().equals(baseTypeName)
+        if (Map.class.getName().equals(baseTypeName)
                 || HashMap.class.getName().equals(baseTypeName)) {
             return decodeMap(type, jsonValue, connection);
         } else if (List.class.getName().equals(baseTypeName)
@@ -78,6 +76,13 @@ public class JsonDecoder {
         } else if (Boolean.class.getName().equals(baseTypeName)) {
             // TODO handle properly
             return Boolean.valueOf(String.valueOf(jsonValue));
+        } else if (Byte.class.getName().equals(baseTypeName)) {
+            // TODO handle properly
+            return Byte.valueOf(String.valueOf(jsonValue));
+        } else if (Character.class.getName().equals(baseTypeName)) {
+            // TODO handle properly
+            return Character.valueOf(((JSONString) jsonValue).stringValue()
+                    .charAt(0));
         } else if (Connector.class.getName().equals(baseTypeName)) {
             return ConnectorMap.get(connection).getConnector(
                     ((JSONString) jsonValue).stringValue());
@@ -180,16 +185,6 @@ public class JsonDecoder {
         return map;
     }
 
-    private static Object[] decodeArray(Type type, JSONArray jsonArray,
-            ApplicationConnection connection) {
-        String arrayTypeName = type.getBaseTypeName();
-        String chldTypeName = arrayTypeName.substring(0,
-                arrayTypeName.length() - 2);
-        List<Object> list = decodeList(new Type(chldTypeName, null), jsonArray,
-                connection);
-        return list.toArray(new Object[list.size()]);
-    }
-
     private static List<Object> decodeList(Type type, JSONArray jsonArray,
             ApplicationConnection connection) {
         List<Object> tokens = new ArrayList<Object>();
diff --git a/src/com/vaadin/terminal/gwt/client/communication/JsonEncoder.java b/src/com/vaadin/terminal/gwt/client/communication/JsonEncoder.java
index cb7dbe5e72..925f0b6272 100644
--- a/src/com/vaadin/terminal/gwt/client/communication/JsonEncoder.java
+++ b/src/com/vaadin/terminal/gwt/client/communication/JsonEncoder.java
@@ -13,6 +13,7 @@ import java.util.Set;
 import com.google.gwt.json.client.JSONArray;
 import com.google.gwt.json.client.JSONBoolean;
 import com.google.gwt.json.client.JSONNull;
+import com.google.gwt.json.client.JSONNumber;
 import com.google.gwt.json.client.JSONObject;
 import com.google.gwt.json.client.JSONString;
 import com.google.gwt.json.client.JSONValue;
@@ -72,6 +73,10 @@ public class JsonEncoder {
             return new JSONString((String) value);
         } else if (value instanceof Boolean) {
             return JSONBoolean.getInstance((Boolean) value);
+        } else if (value instanceof Byte) {
+            return new JSONNumber((Byte) value);
+        } else if (value instanceof Character) {
+            return new JSONString(String.valueOf(value));
         } else if (value instanceof Object[]) {
             return encodeObjectArray((Object[]) value, restrictToInternalTypes,
                     connection);
diff --git a/src/com/vaadin/terminal/gwt/server/JsonCodec.java b/src/com/vaadin/terminal/gwt/server/JsonCodec.java
index 71e4727164..4fb7681e4a 100644
--- a/src/com/vaadin/terminal/gwt/server/JsonCodec.java
+++ b/src/com/vaadin/terminal/gwt/server/JsonCodec.java
@@ -8,6 +8,7 @@ import java.beans.IntrospectionException;
 import java.beans.Introspector;
 import java.beans.PropertyDescriptor;
 import java.io.Serializable;
+import java.lang.reflect.Array;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.ParameterizedType;
@@ -82,6 +83,10 @@ public class JsonCodec implements Serializable {
 
     public static boolean isInternalType(Type type) {
         if (type instanceof Class && ((Class<?>) type).isPrimitive()) {
+            if (type == byte.class || type == char.class) {
+                // Almost all primitive types are handled internally
+                return false;
+            }
             // All primitive types are handled internally
             return true;
         } else if (type == UidlValue.class) {
@@ -123,6 +128,16 @@ public class JsonCodec implements Serializable {
         // Try to decode object using fields
         if (value == JSONObject.NULL) {
             return null;
+        } else if (targetType == byte.class || targetType == Byte.class) {
+            return Byte.valueOf(String.valueOf(value));
+        } else if (targetType == char.class || targetType == Character.class) {
+            return Character.valueOf(String.valueOf(value).charAt(0));
+        } else if (targetType instanceof Class<?>
+                && ((Class<?>) targetType).isArray()) {
+            // Legacy Object[] and String[] handled elsewhere, this takes care
+            // of generic arrays
+            return decodeArray((Class<?>) targetType, (JSONArray) value,
+                    application);
         } else if (targetType == JSONObject.class
                 || targetType == JSONArray.class) {
             return value;
@@ -131,6 +146,18 @@ public class JsonCodec implements Serializable {
         }
     }
 
+    private static Object decodeArray(Class<?> targetType, JSONArray value,
+            Application application) throws JSONException {
+        Class<?> componentType = targetType.getComponentType();
+        Object array = Array.newInstance(componentType, value.length());
+        for (int i = 0; i < value.length(); i++) {
+            Object decodedValue = decodeInternalOrCustomType(componentType,
+                    value.get(i), application);
+            Array.set(array, i, decodedValue);
+        }
+        return array;
+    }
+
     /**
      * Decodes a value that is of an internal type.
      * <p>
@@ -203,7 +230,7 @@ public class JsonCodec implements Serializable {
             return application.getConnector(stringValue);
         }
 
-        // Standard Java types
+        // Legacy types
 
         if (JsonEncoder.VTYPE_STRING.equals(transportType)) {
             return stringValue;
@@ -494,14 +521,17 @@ public class JsonCodec implements Serializable {
             return value;
         } else if (value instanceof Number) {
             return value;
+        } else if (value instanceof Character) {
+            // Character is not a Number
+            return value;
         } else if (value instanceof Collection) {
             Collection<?> collection = (Collection<?>) value;
             JSONArray jsonArray = encodeCollection(valueType, collection,
                     application);
             return jsonArray;
-        } else if (value instanceof Object[]) {
-            Object[] array = (Object[]) value;
-            JSONArray jsonArray = encodeArrayContents(array, application);
+        } else if (valueType instanceof Class<?>
+                && ((Class<?>) valueType).isArray()) {
+            JSONArray jsonArray = encodeArrayContents(value, application);
             return jsonArray;
         } else if (value instanceof Map) {
             Object jsonMap = encodeMap(valueType, (Map<?, ?>) value,
@@ -604,11 +634,13 @@ public class JsonCodec implements Serializable {
         return e.name();
     }
 
-    private static JSONArray encodeArrayContents(Object[] array,
+    private static JSONArray encodeArrayContents(Object array,
             Application application) throws JSONException {
         JSONArray jsonArray = new JSONArray();
-        for (Object o : array) {
-            jsonArray.put(encode(o, null, null, application));
+        Class<?> componentType = array.getClass().getComponentType();
+        for (int i = 0; i < Array.getLength(array); i++) {
+            jsonArray.put(encode(Array.get(array, i), null, componentType,
+                    application));
         }
         return jsonArray;
     }
diff --git a/src/com/vaadin/terminal/gwt/widgetsetutils/GeneratedRpcMethodProviderGenerator.java b/src/com/vaadin/terminal/gwt/widgetsetutils/GeneratedRpcMethodProviderGenerator.java
index ba3dcd85b9..b1d69b178b 100644
--- a/src/com/vaadin/terminal/gwt/widgetsetutils/GeneratedRpcMethodProviderGenerator.java
+++ b/src/com/vaadin/terminal/gwt/widgetsetutils/GeneratedRpcMethodProviderGenerator.java
@@ -146,8 +146,8 @@ public class GeneratedRpcMethodProviderGenerator extends Generator {
                         if (i != 0) {
                             sourceWriter.print(", ");
                         }
-                        sourceWriter.print("("
-                                + parameterType.getQualifiedSourceName()
+                        String parameterTypeName = getBoxedTypeName(parameterType);
+                        sourceWriter.print("(" + parameterTypeName
                                 + ") parameters[" + i + "]");
                     }
                     sourceWriter.println(");");
@@ -179,13 +179,7 @@ public class GeneratedRpcMethodProviderGenerator extends Generator {
     }
 
     public static void writeTypeCreator(SourceWriter sourceWriter, JType type) {
-        String typeName;
-        if (type.isPrimitive() != null) {
-            // Used boxed types for primitives
-            typeName = type.isPrimitive().getQualifiedBoxedSourceName();
-        } else {
-            typeName = type.getErasedType().getQualifiedBinaryName();
-        }
+        String typeName = getBoxedTypeName(type);
         sourceWriter.print("new Type(\"" + typeName + "\", ");
         JParameterizedType parameterized = type.isParameterized();
         if (parameterized != null) {
@@ -202,6 +196,15 @@ public class GeneratedRpcMethodProviderGenerator extends Generator {
         sourceWriter.print(")");
     }
 
+    public static String getBoxedTypeName(JType type) {
+        if (type.isPrimitive() != null) {
+            // Used boxed types for primitives
+            return type.isPrimitive().getQualifiedBoxedSourceName();
+        } else {
+            return type.getErasedType().getQualifiedSourceName();
+        }
+    }
+
     private String getInvokeMethodName(JClassType type) {
         return "invoke" + type.getQualifiedSourceName().replaceAll("\\.", "_");
     }
diff --git a/src/com/vaadin/terminal/gwt/widgetsetutils/SerializerGenerator.java b/src/com/vaadin/terminal/gwt/widgetsetutils/SerializerGenerator.java
index c32b54ff1c..1951f8ba40 100644
--- a/src/com/vaadin/terminal/gwt/widgetsetutils/SerializerGenerator.java
+++ b/src/com/vaadin/terminal/gwt/widgetsetutils/SerializerGenerator.java
@@ -6,7 +6,6 @@ package com.vaadin.terminal.gwt.widgetsetutils;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 
@@ -16,13 +15,15 @@ import com.google.gwt.core.ext.GeneratorContext;
 import com.google.gwt.core.ext.TreeLogger;
 import com.google.gwt.core.ext.TreeLogger.Type;
 import com.google.gwt.core.ext.UnableToCompleteException;
+import com.google.gwt.core.ext.typeinfo.JArrayType;
 import com.google.gwt.core.ext.typeinfo.JClassType;
 import com.google.gwt.core.ext.typeinfo.JEnumConstant;
 import com.google.gwt.core.ext.typeinfo.JEnumType;
 import com.google.gwt.core.ext.typeinfo.JMethod;
 import com.google.gwt.core.ext.typeinfo.JPrimitiveType;
 import com.google.gwt.core.ext.typeinfo.JType;
-import com.google.gwt.core.ext.typeinfo.TypeOracle;
+import com.google.gwt.core.ext.typeinfo.TypeOracleException;
+import com.google.gwt.json.client.JSONArray;
 import com.google.gwt.json.client.JSONObject;
 import com.google.gwt.json.client.JSONString;
 import com.google.gwt.json.client.JSONValue;
@@ -46,26 +47,32 @@ import com.vaadin.terminal.gwt.client.communication.SerializerMap;
 public class SerializerGenerator extends Generator {
 
     private static final String SUBTYPE_SEPARATOR = "___";
-    private static String beanSerializerPackageName = SerializerMap.class
+    private static String serializerPackageName = SerializerMap.class
             .getPackage().getName();
 
     @Override
     public String generate(TreeLogger logger, GeneratorContext context,
-            String beanTypeName) throws UnableToCompleteException {
-        JClassType beanType = context.getTypeOracle().findType(beanTypeName);
-        String beanSerializerClassName = getSerializerSimpleClassName(beanType);
+            String typeName) throws UnableToCompleteException {
+        JClassType type;
+        try {
+            type = (JClassType) context.getTypeOracle().parse(typeName);
+        } catch (TypeOracleException e1) {
+            logger.log(Type.ERROR, "Could not find type " + typeName, e1);
+            throw new UnableToCompleteException();
+        }
+        String serializerClassName = getSerializerSimpleClassName(type);
         try {
             // Generate class source code
-            generateClass(logger, context, beanType, beanSerializerPackageName,
-                    beanSerializerClassName);
+            generateClass(logger, context, type, serializerPackageName,
+                    serializerClassName);
         } catch (Exception e) {
             logger.log(TreeLogger.ERROR, "SerializerGenerator failed for "
-                    + beanType.getQualifiedSourceName(), e);
+                    + type.getQualifiedSourceName(), e);
             throw new UnableToCompleteException();
         }
 
         // return the fully qualifed name of the class generated
-        return getFullyQualifiedSerializerClassName(beanType);
+        return getFullyQualifiedSerializerClassName(type);
     }
 
     /**
@@ -75,7 +82,7 @@ public class SerializerGenerator extends Generator {
      *            Logger object
      * @param context
      *            Generator context
-     * @param beanType
+     * @param type
      * @param beanTypeName
      *            bean type for which the serializer is to be generated
      * @param beanSerializerTypeName
@@ -83,7 +90,7 @@ public class SerializerGenerator extends Generator {
      * @throws UnableToCompleteException
      */
     private void generateClass(TreeLogger logger, GeneratorContext context,
-            JClassType beanType, String serializerPackageName,
+            JClassType type, String serializerPackageName,
             String serializerClassName) throws UnableToCompleteException {
         // get print writer that receives the source code
         PrintWriter printWriter = null;
@@ -94,13 +101,12 @@ public class SerializerGenerator extends Generator {
         if (printWriter == null) {
             return;
         }
-        boolean isEnum = (beanType.isEnum() != null);
+        boolean isEnum = (type.isEnum() != null);
+        boolean isArray = (type.isArray() != null);
 
-        Date date = new Date();
-        TypeOracle typeOracle = context.getTypeOracle();
-        String beanQualifiedSourceName = beanType.getQualifiedSourceName();
+        String qualifiedSourceName = type.getQualifiedSourceName();
         logger.log(Type.DEBUG, "Processing serializable type "
-                + beanQualifiedSourceName + "...");
+                + qualifiedSourceName + "...");
 
         // init composer, set class properties, create source writer
         ClassSourceFileComposerFactory composer = null;
@@ -115,12 +121,12 @@ public class SerializerGenerator extends Generator {
         composer.addImport(JsonDecoder.class.getName());
         // composer.addImport(VaadinSerializer.class.getName());
 
-        if (isEnum) {
+        if (isEnum || isArray) {
             composer.addImplementedInterface(JSONSerializer.class.getName()
-                    + "<" + beanQualifiedSourceName + ">");
+                    + "<" + qualifiedSourceName + ">");
         } else {
             composer.addImplementedInterface(DiffJSONSerializer.class.getName()
-                    + "<" + beanQualifiedSourceName + ">");
+                    + "<" + qualifiedSourceName + ">");
         }
 
         SourceWriter sourceWriter = composer.createSourceWriter(context,
@@ -132,17 +138,19 @@ public class SerializerGenerator extends Generator {
         // public JSONValue serialize(Object value,
         // ApplicationConnection connection) {
         sourceWriter.println("public " + JSONValue.class.getName()
-                + " serialize(" + beanQualifiedSourceName + " value, "
+                + " serialize(" + qualifiedSourceName + " value, "
                 + ApplicationConnection.class.getName() + " connection) {");
         sourceWriter.indent();
         // MouseEventDetails castedValue = (MouseEventDetails) value;
-        sourceWriter.println(beanQualifiedSourceName + " castedValue = ("
-                + beanQualifiedSourceName + ") value;");
+        sourceWriter.println(qualifiedSourceName + " castedValue = ("
+                + qualifiedSourceName + ") value;");
 
         if (isEnum) {
-            writeEnumSerializer(logger, sourceWriter, beanType);
+            writeEnumSerializer(logger, sourceWriter, type);
+        } else if (isArray) {
+            writeArraySerializer(logger, sourceWriter, type.isArray());
         } else {
-            writeBeanSerializer(logger, sourceWriter, beanType);
+            writeBeanSerializer(logger, sourceWriter, type);
         }
         // }
         sourceWriter.outdent();
@@ -152,14 +160,14 @@ public class SerializerGenerator extends Generator {
         // Updater
         // public void update(T target, Type type, JSONValue jsonValue,
         // ApplicationConnection connection);
-        if (!isEnum) {
-            sourceWriter.println("public void update("
-                    + beanQualifiedSourceName + " target, Type type, "
-                    + JSONValue.class.getName() + " jsonValue, "
-                    + ApplicationConnection.class.getName() + " connection) {");
+        if (!isEnum && !isArray) {
+            sourceWriter.println("public void update(" + qualifiedSourceName
+                    + " target, Type type, " + JSONValue.class.getName()
+                    + " jsonValue, " + ApplicationConnection.class.getName()
+                    + " connection) {");
             sourceWriter.indent();
 
-            writeBeanDeserializer(logger, sourceWriter, beanType);
+            writeBeanDeserializer(logger, sourceWriter, type);
 
             sourceWriter.outdent();
             sourceWriter.println("}");
@@ -168,18 +176,19 @@ public class SerializerGenerator extends Generator {
         // Deserializer
         // T deserialize(Type type, JSONValue jsonValue, ApplicationConnection
         // connection);
-        sourceWriter.println("public " + beanQualifiedSourceName
+        sourceWriter.println("public " + qualifiedSourceName
                 + " deserialize(Type type, " + JSONValue.class.getName()
                 + " jsonValue, " + ApplicationConnection.class.getName()
                 + " connection) {");
         sourceWriter.indent();
 
         if (isEnum) {
-            writeEnumDeserializer(logger, sourceWriter, beanType.isEnum());
+            writeEnumDeserializer(logger, sourceWriter, type.isEnum());
+        } else if (isArray) {
+            writeArrayDeserializer(logger, sourceWriter, type.isArray());
         } else {
-            sourceWriter.println(beanQualifiedSourceName
-                    + " target = GWT.create(" + beanQualifiedSourceName
-                    + ".class);");
+            sourceWriter.println(qualifiedSourceName + " target = GWT.create("
+                    + qualifiedSourceName + ".class);");
             sourceWriter
                     .println("update(target, type, jsonValue, connection);");
             // return target;
@@ -195,7 +204,7 @@ public class SerializerGenerator extends Generator {
         // commit generated class
         context.commit(logger, printWriter);
         logger.log(TreeLogger.INFO, "Generated Serializer class "
-                + getFullyQualifiedSerializerClassName(beanType));
+                + getFullyQualifiedSerializerClassName(type));
     }
 
     private void writeEnumDeserializer(TreeLogger logger,
@@ -214,6 +223,43 @@ public class SerializerGenerator extends Generator {
         sourceWriter.println("return null;");
     }
 
+    private void writeArrayDeserializer(TreeLogger logger,
+            SourceWriter sourceWriter, JArrayType type) {
+        JType leafType = type.getLeafType();
+        int rank = type.getRank();
+
+        sourceWriter.println(JSONArray.class.getName()
+                + " jsonArray = jsonValue.isArray();");
+
+        // Type value = new Type[jsonArray.size()][][];
+        sourceWriter.print(type.getQualifiedSourceName() + " value = new "
+                + leafType.getQualifiedSourceName() + "[jsonArray.size()]");
+        for (int i = 1; i < rank; i++) {
+            sourceWriter.print("[]");
+        }
+        sourceWriter.println(";");
+
+        sourceWriter.println("for(int i = 0 ; i < value.length; i++) {");
+        sourceWriter.indent();
+
+        JType componentType = type.getComponentType();
+
+        sourceWriter.print("value[i] = ("
+                + GeneratedRpcMethodProviderGenerator
+                        .getBoxedTypeName(componentType) + ") "
+                + JsonDecoder.class.getName() + ".decodeValue(");
+        GeneratedRpcMethodProviderGenerator.writeTypeCreator(sourceWriter,
+                componentType);
+        sourceWriter.print(", jsonArray.get(i), null, connection)");
+
+        sourceWriter.println(";");
+
+        sourceWriter.outdent();
+        sourceWriter.println("}");
+
+        sourceWriter.println("return value;");
+    }
+
     private void writeBeanDeserializer(TreeLogger logger,
             SourceWriter sourceWriter, JClassType beanType) {
         String beanQualifiedSourceName = beanType.getQualifiedSourceName();
@@ -281,6 +327,23 @@ public class SerializerGenerator extends Generator {
                 + "(castedValue.name());");
     }
 
+    private void writeArraySerializer(TreeLogger logger,
+            SourceWriter sourceWriter, JArrayType array) {
+        sourceWriter.println(JSONArray.class.getName() + " values = new "
+                + JSONArray.class.getName() + "();");
+        JType componentType = array.getComponentType();
+        // JPrimitiveType primitive = componentType.isPrimitive();
+        sourceWriter.println("for (int i = 0; i < castedValue.length; i++) {");
+        sourceWriter.indent();
+        sourceWriter.print("values.set(i, ");
+        sourceWriter.print(JsonEncoder.class.getName()
+                + ".encode(castedValue[i], false, connection)");
+        sourceWriter.println(");");
+        sourceWriter.outdent();
+        sourceWriter.println("}");
+        sourceWriter.println("return values;");
+    }
+
     private void writeBeanSerializer(TreeLogger logger,
             SourceWriter sourceWriter, JClassType beanType)
             throws UnableToCompleteException {
@@ -373,10 +436,15 @@ public class SerializerGenerator extends Generator {
         return getSimpleClassName(beanType) + "_Serializer";
     }
 
-    private static String getSimpleClassName(JClassType type) {
-        if (type.isMemberType()) {
+    private static String getSimpleClassName(JType type) {
+        JArrayType arrayType = type.isArray();
+        if (arrayType != null) {
+            return "Array" + getSimpleClassName(arrayType.getComponentType());
+        }
+        JClassType classType = type.isClass();
+        if (classType != null && classType.isMemberType()) {
             // Assumed to be static sub class
-            String baseName = getSimpleClassName(type.getEnclosingType());
+            String baseName = getSimpleClassName(classType.getEnclosingType());
             String name = baseName + SUBTYPE_SEPARATOR
                     + type.getSimpleSourceName();
             return name;
@@ -385,7 +453,6 @@ public class SerializerGenerator extends Generator {
     }
 
     public static String getFullyQualifiedSerializerClassName(JClassType type) {
-        return beanSerializerPackageName + "."
-                + getSerializerSimpleClassName(type);
+        return serializerPackageName + "." + getSerializerSimpleClassName(type);
     }
 }
diff --git a/src/com/vaadin/terminal/gwt/widgetsetutils/SerializerMapGenerator.java b/src/com/vaadin/terminal/gwt/widgetsetutils/SerializerMapGenerator.java
index 2688775435..5e151323a0 100644
--- a/src/com/vaadin/terminal/gwt/widgetsetutils/SerializerMapGenerator.java
+++ b/src/com/vaadin/terminal/gwt/widgetsetutils/SerializerMapGenerator.java
@@ -17,6 +17,7 @@ import com.google.gwt.core.ext.GeneratorContext;
 import com.google.gwt.core.ext.TreeLogger;
 import com.google.gwt.core.ext.TreeLogger.Type;
 import com.google.gwt.core.ext.UnableToCompleteException;
+import com.google.gwt.core.ext.typeinfo.JArrayType;
 import com.google.gwt.core.ext.typeinfo.JClassType;
 import com.google.gwt.core.ext.typeinfo.JMethod;
 import com.google.gwt.core.ext.typeinfo.JParameterizedType;
@@ -96,6 +97,10 @@ public class SerializerMapGenerator extends Generator {
         JClassType javaSerializable = typeOracle.findType(Serializable.class
                 .getName());
         for (JClassType type : typesNeedingSerializers) {
+            if (type.isArray() != null) {
+                // Don't check for arrays
+                continue;
+            }
             boolean serializable = type.isAssignableTo(javaSerializable);
             if (!serializable) {
                 logger.log(
@@ -166,8 +171,15 @@ public class SerializerMapGenerator extends Generator {
 
         // TODO cache serializer instances in a map
         for (JClassType type : typesNeedingSerializers) {
-            sourceWriter.println("if (type.equals(\""
-                    + type.getQualifiedBinaryName() + "\")) {");
+            sourceWriter.print("if (type.equals(\""
+                    + type.getQualifiedSourceName() + "\")");
+            if (type instanceof JArrayType) {
+                // Also add binary name to support encoding based on
+                // object.getClass().getName()
+                sourceWriter.print("||type.equals(\"" + type.getJNISignature()
+                        + "\")");
+            }
+            sourceWriter.println(") {");
             sourceWriter.indent();
             String serializerName = SerializerGenerator
                     .getFullyQualifiedSerializerClassName(type);
@@ -277,6 +289,14 @@ public class SerializerMapGenerator extends Generator {
             serializableTypes.add(typeClass);
             findSubTypesNeedingSerializers(typeClass, serializableTypes);
         }
+
+        // Generate (n-1)-dimensional array serializer for n-dimensional array
+        JArrayType arrayType = type.isArray();
+        if (arrayType != null) {
+            serializableTypes.add(arrayType);
+            addTypeIfNeeded(serializableTypes, arrayType.getComponentType());
+        }
+
     }
 
     Set<Class<?>> frameworkHandledTypes = new HashSet<Class<?>>();
@@ -293,15 +313,14 @@ public class SerializerMapGenerator extends Generator {
         frameworkHandledTypes.add(Map.class);
         frameworkHandledTypes.add(List.class);
         frameworkHandledTypes.add(Set.class);
+        frameworkHandledTypes.add(Byte.class);
+        frameworkHandledTypes.add(Character.class);
 
     }
 
     private boolean serializationHandledByFramework(JType setterType) {
         // Some types are handled by the framework at the moment. See #8449
         // This method should be removed at some point.
-        if (setterType.isArray() != null) {
-            return true;
-        }
         if (setterType.isPrimitive() != null) {
             return true;
         }