modify StringSerializer & AbstractStringBuilderSerializer

Author: loushaokun

java/fory-core/src/main/java/org/apache/fory/memory/ByteBufferUtil.java

@@ -76,17 +76,6 @@ public static ByteBuffer createDirectByteBufferFromNativeAddress(long address, i
     }
   }
 
-  //  /** Wrap a buffer [address, address + size) into provided <code>buffer</code>. */
-  //  @NotForAndroid(reason = "Android cannot directly operate the capacity field")
-  //  public static void wrapDirectByteBufferFromNativeAddress(
-  //      ByteBuffer buffer, long address, int size) {
-  //    Preconditions.checkArgument(
-  //        buffer.isDirect(), "Can't wrap native memory into a non-direct ByteBuffer.");
-  //    Platform.putLong(buffer, BUFFER_ADDRESS_FIELD_OFFSET, address);
-  //    Platform.putInt(buffer, BUFFER_CAPACITY_FIELD_OFFSET, size);
-  //    buffer.clear();
-  //  }
-
   @NotForAndroid
   public static ByteBuffer wrapDirectBuffer(long address, int size) {
     return createDirectByteBufferFromNativeAddress(address, size);

java/fory-core/src/main/java/org/apache/fory/memory/MemoryBuffer.java

@@ -1307,20 +1307,28 @@ public void coverMemoryWithArray(
         switch (eleType) {
           case BOOL:
             coverMemoryWithBoolArrayInner((boolean[]) arr, offset, length);
+            break;
           case BYTE:
             buffer.put((byte[]) arr, offset, length);
+            break;
           case CHAR:
             buffer.asCharBuffer().put((char[]) arr, offset, length);
+            break;
           case SHORT:
             buffer.asShortBuffer().put((short[]) arr, offset, length);
+            break;
           case INT:
             buffer.asIntBuffer().put((int[]) arr, offset, length);
+            break;
           case LONG:
             buffer.asLongBuffer().put((long[]) arr, offset, length);
+            break;
           case FLOAT:
             buffer.asFloatBuffer().put((float[]) arr, offset, length);
+            break;
           case DOUBLE:
             buffer.asDoubleBuffer().put((double[]) arr, offset, length);
+            break;
         }
       }
     }
@@ -2569,21 +2577,28 @@ public void copyTo(
         switch (eleType) {
           case BOOL:
             copyToBoolsInner((boolean[]) target, offset, length);
-            return;
+            break;
           case BYTE:
             buffer.get((byte[]) target, offset, length);
+            break;
           case CHAR:
             buffer.asCharBuffer().get((char[]) target, offset, length);
+            break;
           case SHORT:
             buffer.asShortBuffer().get((short[]) target, offset, length);
+            break;
           case INT:
             buffer.asIntBuffer().get((int[]) target, offset, length);
+            break;
           case LONG:
             buffer.asLongBuffer().get((long[]) target, offset, length);
+            break;
           case FLOAT:
             buffer.asFloatBuffer().get((float[]) target, offset, length);
+            break;
           case DOUBLE:
             buffer.asDoubleBuffer().get((double[]) target, offset, length);
+            break;
         }
       }
     }

java/fory-core/src/main/java/org/apache/fory/resolver/ClassResolver.java

@@ -358,7 +358,7 @@ private void addDefaultSerializers() {
     UnmodifiableSerializers.registerSerializers(fory);
     ImmutableCollectionSerializers.registerSerializers(fory);
     SubListSerializers.registerSerializers(fory, true);
-    if (fory.getConfig().registerGuavaTypes()) {
+    if (fory.getConfig().registerGuavaTypes() && !Platform.IS_ANDROID) {
       GuavaCollectionSerializers.registerDefaultSerializers(fory);
     }
     if (fory.getConfig().deserializeNonexistentClass()) {

java/fory-core/src/main/java/org/apache/fory/serializer/Serializers.java

@@ -202,25 +202,32 @@ public T xread(MemoryBuffer buffer) {
     }
   }
 
-  private static final ToIntFunction GET_CODER;
-  private static final Function GET_VALUE;
-
-  static {
-    GET_VALUE = (Function) makeGetterFunction(StringBuilder.class.getSuperclass(), "getValue");
-    ToIntFunction<CharSequence> getCoder;
-    try {
-      Method getCoderMethod = StringBuilder.class.getSuperclass().getDeclaredMethod("getCoder");
-      getCoder = (ToIntFunction<CharSequence>) makeGetterFunction(getCoderMethod, int.class);
-    } catch (NoSuchMethodException e) {
-      getCoder = null;
-    }
-    GET_CODER = getCoder;
-  }
-
   public abstract static class AbstractStringBuilderSerializer<T extends CharSequence>
       extends Serializer<T> {
     protected final StringSerializer stringSerializer;
 
+    private static final ToIntFunction GET_CODER;
+    private static final Function GET_VALUE;
+
+    private static final boolean RESTRICTED_STRING_BUILDER = Platform.IS_ANDROID;
+
+    static {
+      if (RESTRICTED_STRING_BUILDER) {
+        GET_CODER = null;
+        GET_VALUE = null;
+      }else {
+        GET_VALUE = (Function) makeGetterFunction(StringBuilder.class.getSuperclass(), "getValue");
+        ToIntFunction<CharSequence> getCoder;
+        try {
+          Method getCoderMethod = StringBuilder.class.getSuperclass().getDeclaredMethod("getCoder");
+          getCoder = (ToIntFunction<CharSequence>) makeGetterFunction(getCoderMethod, int.class);
+        } catch (NoSuchMethodException e) {
+          getCoder = null;
+        }
+        GET_CODER = getCoder;
+      }
+    }
+
     public AbstractStringBuilderSerializer(Fory fory, Class<T> type) {
       super(fory, type);
       stringSerializer = new StringSerializer(fory);
@@ -233,6 +240,12 @@ public void xwrite(MemoryBuffer buffer, T value) {
 
     @Override
     public void write(MemoryBuffer buffer, T value) {
+      if (RESTRICTED_STRING_BUILDER) {
+        // Restricted StringBuilder doesn't have getCoder method, so we use
+        // the StringSerializer to write the string.
+        stringSerializer.writeString(buffer, value.toString());
+        return;
+      }
       if (GET_CODER != null) {
         int coder = GET_CODER.applyAsInt(value);
         byte[] v = (byte[]) GET_VALUE.apply(value);