2.0.56.android4 release

Author: wenshao

benchmark/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.alibaba.fastjson2</groupId>
         <artifactId>fastjson2-parent</artifactId>
-        <version>2.0.55.android5</version>
+        <version>2.0.56.android5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

codegen-test/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.alibaba.fastjson2</groupId>
         <artifactId>fastjson2-parent</artifactId>
-        <version>2.0.55.android5</version>
+        <version>2.0.56.android5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

core/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.alibaba.fastjson2</groupId>
         <artifactId>fastjson2-parent</artifactId>
-        <version>2.0.55.android5</version>
+        <version>2.0.56.android5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

core/src/main/java/com/alibaba/fastjson2/JSON.java

@@ -32,7 +32,7 @@ public interface JSON {
     /**
      * fastjson2 version name
      */
-    String VERSION = "2.0.55";
+    String VERSION = "2.0.56";
 
     /**
      * Parses the json string as a {@link JSONArray} or {@link JSONObject}.

core/src/main/java/com/alibaba/fastjson2/JSONReader.java

@@ -3794,6 +3794,7 @@ public void config(Feature feature, boolean state) {
             }
         }
     }
+    protected static final long MASK_DISABLE_REFERENCE_DETECT = 1L << 33;
 
     public enum Feature {
         FieldBased(1),
@@ -3917,7 +3918,12 @@ public enum Feature {
         /**
          * @since 2.0.53
          */
-        UseDoubleForDecimals(1L << 32L);
+        UseDoubleForDecimals(1L << 32L),
+
+        /**
+         * @since 2.0.56
+         */
+        DisableReferenceDetect(MASK_DISABLE_REFERENCE_DETECT);
 
         public final long mask;
 

core/src/main/java/com/alibaba/fastjson2/JSONReaderUTF16.java

@@ -154,8 +154,10 @@ public byte[] readHex() {
         return bytes;
     }
 
-    @Override
     public final boolean isReference() {
+        if ((context.features & MASK_DISABLE_REFERENCE_DETECT) != 0) {
+            return false;
+        }
         // should be codeSize <= FreqInlineSize 325, current is 276
         final char[] chars = this.chars;
         char ch = this.ch;
@@ -188,6 +190,11 @@ public final boolean isReference() {
             return false;
         }
 
+        return isReference0(chars, offset, end, quote);
+    }
+
+    private boolean isReference0(char[] chars, int offset, int end, char quote) {
+        char ch;
         offset += 6;
         ch = chars[offset];
         while (ch <= ' ' && ((1L << ch) & SPACE) != 0) {
@@ -211,7 +218,9 @@ public final boolean isReference() {
             ch = chars[offset];
         }
 
-        if (ch != quote || (offset + 1 < end && chars[offset + 1] == '#')) {
+        if (ch != quote
+                || (offset + 1 < end && (ch = chars[offset + 1]) != '$' && ch != '.' && ch != '@')
+        ) {
             return false;
         }
 

core/src/main/java/com/alibaba/fastjson2/JSONReaderUTF8.java

@@ -16,6 +16,8 @@
 
 class JSONReaderUTF8
         extends JSONReader {
+    static final int REF = BIG_ENDIAN ? 0x24726566 : 0x66657224;
+
     protected final byte[] bytes;
     protected final int length;
     protected final int start;
@@ -4683,8 +4685,11 @@ public final byte[] readHex() {
     }
 
     @Override
-    public boolean isReference() {
+    public final boolean isReference() {
         // should be codeSize <= FreqInlineSize 325, current : 284
+        if ((context.features & MASK_DISABLE_REFERENCE_DETECT) != 0) {
+            return false;
+        }
         final byte[] bytes = this.bytes;
         int ch = this.ch;
         if (ch != '{') {
@@ -4705,17 +4710,18 @@ public boolean isReference() {
             ch = bytes[offset];
         }
 
-        int quote = ch;
         if (offset + 6 >= end
-                || bytes[offset + 1] != '$'
-                || bytes[offset + 2] != 'r'
-                || bytes[offset + 3] != 'e'
-                || bytes[offset + 4] != 'f'
-                || bytes[offset + 5] != quote
+                || bytes[offset + 5] != ch
+                || UNSAFE.getInt(bytes, ARRAY_BYTE_BASE_OFFSET + offset + 1) != REF
         ) {
             return false;
         }
 
+        return isReference0(bytes, offset, end, ch);
+    }
+
+    private boolean isReference0(byte[] bytes, int offset, int end, int quote) {
+        int ch;
         offset += 6;
         ch = bytes[offset];
         while (ch >= 0 && ch <= ' ' && ((1L << ch) & SPACE) != 0) {
@@ -4739,7 +4745,9 @@ public boolean isReference() {
             ch = bytes[offset];
         }
 
-        if (ch != quote || (offset + 1 < end && bytes[offset + 1] == '#')) {
+        if (ch != quote
+                || (offset + 1 < end && (ch = bytes[offset + 1]) != '$' && ch != '.' && ch != '@')
+        ) {
             return false;
         }
 

core/src/main/java/com/alibaba/fastjson2/annotation/JSONField.java

@@ -121,4 +121,9 @@
      * @since 2.0.52
      */
     Class<?> arrayToMapDuplicateHandler() default Void.class;
+
+    /**
+     * @since 2.0.56
+     */
+    Class<?> contentAs() default Void.class;
 }

core/src/main/java/com/alibaba/fastjson2/codec/FieldInfo.java

@@ -20,6 +20,7 @@ public class FieldInfo {
     public static final long DISABLE_REFERENCE_DETECT = 1L << 58;
     public static final long BACKR_EFERENCE = 1L << 61;
     public static final long RECORD = 1L << 62;
+    public static final long CONTENT_AS = 1L << 63;
 
     public String fieldName;
     public String format;
@@ -44,6 +45,11 @@ public class FieldInfo {
     public String arrayToMapKey;
     public Class<?> arrayToMapDuplicateHandler;
 
+    /**
+     * @since 2.0.56
+     */
+    public Class<?> contentAs;
+
     public ObjectReader getInitReader() {
         Class<?> calzz = readUsing;
         if (calzz != null && ObjectReader.class.isAssignableFrom(calzz)) {
@@ -94,5 +100,6 @@ public void init() {
 
         arrayToMapKey = null;
         arrayToMapDuplicateHandler = null;
+        contentAs = null;
     }
 }

core/src/main/java/com/alibaba/fastjson2/writer/FieldWriterList.java

@@ -21,6 +21,7 @@ abstract class FieldWriterList<T>
     ObjectWriter listWriter;
     ObjectWriter itemObjectWriter;
     final boolean writeAsString;
+    final Class<?> contentAs;
 
     FieldWriterList(
             String name,
@@ -32,9 +33,11 @@ abstract class FieldWriterList<T>
             Type fieldType,
             Class fieldClass,
             Field field,
-            Method method
+            Method method,
+            Class<?> contentAs
     ) {
         super(name, ordinal, features, format, label, fieldType, fieldClass, field, method);
+        this.contentAs = contentAs;
 
         writeAsString = (features & WriteNonStringValueAsString.mask) != 0;
 
@@ -74,6 +77,13 @@ public Class getItemClass() {
 
     @Override
     public ObjectWriter getItemWriter(JSONWriter jsonWriter, Type itemType) {
+        if (contentAs != null) {
+            ObjectWriter itemObjectWriter = this.itemObjectWriter;
+            if (itemObjectWriter != null) {
+                return itemObjectWriter;
+            }
+            return this.itemObjectWriter = jsonWriter.getObjectWriter(this.contentAs, contentAs);
+        }
         if (itemType == null || itemType == this.itemType) {
             if (itemObjectWriter != null) {
                 return itemObjectWriter;