diff --git a/core/src/main/java/com/alibaba/fastjson2/JSONFactory.java b/core/src/main/java/com/alibaba/fastjson2/JSONFactory.java
index 6f4afc74d8..6ab5b807a2 100644
--- a/core/src/main/java/com/alibaba/fastjson2/JSONFactory.java
+++ b/core/src/main/java/com/alibaba/fastjson2/JSONFactory.java
@@ -139,6 +139,17 @@ public NameCacheEntry2(String name, long value0, long value1) {
'4', '5', '6', '7', '8', '9', '+', '/'
};
+ static final char[] CA_URL_SAFE = new char[]{
+ 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
+ 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
+ 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X',
+ 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f',
+ 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
+ 'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
+ 'w', 'x', 'y', 'z', '0', '1', '2', '3',
+ '4', '5', '6', '7', '8', '9', '-', '_'
+ };
+
static final int[] DIGITS2 = new int[]{
+0, +0, +0, +0, +0, +0, +0, +0, +0, +0, +0, +0, +0, +0, +0, +0,
+0, +0, +0, +0, +0, +0, +0, +0, +0, +0, +0, +0, +0, +0, +0, +0,
diff --git a/core/src/main/java/com/alibaba/fastjson2/JSONReader.java b/core/src/main/java/com/alibaba/fastjson2/JSONReader.java
index 59aae431de..ef9a596d3c 100644
--- a/core/src/main/java/com/alibaba/fastjson2/JSONReader.java
+++ b/core/src/main/java/com/alibaba/fastjson2/JSONReader.java
@@ -1748,6 +1748,10 @@ public byte[] readBinary() {
return Base64.getDecoder().decode(str);
}
+ if ((context.features & Feature.Base64URLSafeStringAsByteArray.mask) != 0) {
+ return Base64.getUrlDecoder().decode(str);
+ }
+
throw new JSONException(info("not support input " + str));
}
@@ -3133,11 +3137,17 @@ public byte[] readBase64() {
&& (p1 = str.indexOf(',', p0 + 1)) != -1 && str.regionMatches(p0 + 1, base64, 0, base64.length())) {
str = str.substring(p1 + 1);
}
+
+ if (str.isEmpty()) {
+ return new byte[0];
+ }
+
+ if ((context.features & Feature.Base64URLSafeStringAsByteArray.mask) != 0) {
+ return Base64.getUrlDecoder().decode(str);
+ }
+ return Base64.getDecoder().decode(str);
}
- if (str.isEmpty()) {
- return new byte[0];
- }
- return Base64.getDecoder().decode(str);
+ return null;
}
/**
@@ -6525,7 +6535,17 @@ public enum Feature {
* For example, ["value"] would be returned as "value".
* @since 2.0.60
*/
- DisableStringArrayUnwrapping(1L << 34L);
+ DisableStringArrayUnwrapping(1L << 34L),
+
+ /**
+ * Feature that determines whether to treat Base64URL-encoded (URL-safe and unpadded) strings as byte arrays during deserialization.
+ * When enabled, strings that contain Base64URL-encoded data will be automatically decoded to byte arrays.
+ *
+ * By default, this feature is disabled.
+ *
+ * @since 2.0.62
+ */
+ Base64URLSafeStringAsByteArray(1L << 35L);
public final long mask;
diff --git a/core/src/main/java/com/alibaba/fastjson2/JSONReaderUTF8.java b/core/src/main/java/com/alibaba/fastjson2/JSONReaderUTF8.java
index c60aa6109b..42e88cd566 100644
--- a/core/src/main/java/com/alibaba/fastjson2/JSONReaderUTF8.java
+++ b/core/src/main/java/com/alibaba/fastjson2/JSONReaderUTF8.java
@@ -7669,7 +7669,11 @@ public final byte[] readBase64() {
}
byte[] src = Arrays.copyOfRange(bytes, offset, index);
- decoded = Base64.getDecoder().decode(src);
+ if ((context.features & Feature.Base64URLSafeStringAsByteArray.mask) != 0) {
+ decoded = Base64.getUrlDecoder().decode(src);
+ } else {
+ decoded = Base64.getDecoder().decode(src);
+ }
} else {
decoded = new byte[0];
}
diff --git a/core/src/main/java/com/alibaba/fastjson2/JSONWriter.java b/core/src/main/java/com/alibaba/fastjson2/JSONWriter.java
index 3460df30db..dc0c261932 100644
--- a/core/src/main/java/com/alibaba/fastjson2/JSONWriter.java
+++ b/core/src/main/java/com/alibaba/fastjson2/JSONWriter.java
@@ -1168,7 +1168,7 @@ public void writeBinary(byte[] bytes) {
return;
}
- if ((context.features & WriteByteArrayAsBase64.mask) != 0) {
+ if ((context.features & WriteByteArrayAsBase64.mask) != 0 || (context.features & WriteByteArrayAsBase64URLSafe.mask) != 0) {
writeBase64(bytes);
return;
}
@@ -4449,7 +4449,17 @@ public enum Feature {
*
* @since 2.0.61
*/
- WriteFloatSpecialAsString(1L << 45);
+ WriteFloatSpecialAsString(1L << 45),
+
+ /**
+ * Feature that determines whether to write byte arrays as Base64URL-encoded (URL-safe and unpadded) strings during serialization.
+ * When enabled, byte array values will be serialized as Base64URL-encoded strings without padding rather than arrays of numbers or standard Base64.
+ *
+ * By default, this feature is disabled.
+ *
+ * @since 2.0.62
+ */
+ WriteByteArrayAsBase64URLSafe(1L << 46);
public final long mask;
diff --git a/core/src/main/java/com/alibaba/fastjson2/JSONWriterUTF16.java b/core/src/main/java/com/alibaba/fastjson2/JSONWriterUTF16.java
index 0e21a6b0d4..e1ad6ae78c 100644
--- a/core/src/main/java/com/alibaba/fastjson2/JSONWriterUTF16.java
+++ b/core/src/main/java/com/alibaba/fastjson2/JSONWriterUTF16.java
@@ -933,6 +933,9 @@ public final void writeBase64(byte[] bytes) {
return;
}
+ boolean urlSafe = (context.features & Feature.WriteByteArrayAsBase64URLSafe.mask) != 0;
+ char[] dict = urlSafe ? CA_URL_SAFE : CA;
+
int charsLen = ((bytes.length - 1) / 3 + 1) << 2; // base64 character count
int off = this.off;
@@ -948,10 +951,10 @@ public final void writeBase64(byte[] bytes) {
int i = (bytes[s++] & 0xff) << 16 | (bytes[s++] & 0xff) << 8 | (bytes[s++] & 0xff);
// Encode the int into four chars
- chars[off] = CA[(i >>> 18) & 0x3f];
- chars[off + 1] = CA[(i >>> 12) & 0x3f];
- chars[off + 2] = CA[(i >>> 6) & 0x3f];
- chars[off + 3] = CA[i & 0x3f];
+ chars[off] = dict[(i >>> 18) & 0x3f];
+ chars[off + 1] = dict[(i >>> 12) & 0x3f];
+ chars[off + 2] = dict[(i >>> 6) & 0x3f];
+ chars[off + 3] = dict[i & 0x3f];
off += 4;
}
@@ -962,11 +965,23 @@ public final void writeBase64(byte[] bytes) {
int i = ((bytes[eLen] & 0xff) << 10) | (left == 2 ? ((bytes[bytes.length - 1] & 0xff) << 2) : 0);
// Set last four chars
- chars[off] = CA[i >> 12];
- chars[off + 1] = CA[(i >>> 6) & 0x3f];
- chars[off + 2] = left == 2 ? CA[i & 0x3f] : '=';
- chars[off + 3] = '=';
- off += 4;
+ chars[off] = dict[i >> 12];
+ chars[off + 1] = dict[(i >>> 6) & 0x3f];
+
+ if (urlSafe) {
+ // URL-safe Base64 without padding
+ if (left == 2) {
+ chars[off + 2] = dict[i & 0x3f];
+ off += 3;
+ } else {
+ off += 2;
+ }
+ } else {
+ // Standard Base64 includes padding
+ chars[off + 2] = left == 2 ? dict[i & 0x3f] : '=';
+ chars[off + 3] = '=';
+ off += 4;
+ }
}
chars[off] = quote;
diff --git a/core/src/main/java/com/alibaba/fastjson2/JSONWriterUTF8.java b/core/src/main/java/com/alibaba/fastjson2/JSONWriterUTF8.java
index f29e014f3a..71e7df25b7 100644
--- a/core/src/main/java/com/alibaba/fastjson2/JSONWriterUTF8.java
+++ b/core/src/main/java/com/alibaba/fastjson2/JSONWriterUTF8.java
@@ -79,6 +79,14 @@ public final void writeReference(String path) {
@Override
public final void writeBase64(byte[] value) {
+ if (value == null) {
+ writeArrayNull();
+ return;
+ }
+
+ boolean urlSafe = (context.features & Feature.WriteByteArrayAsBase64URLSafe.mask) != 0;
+ char[] dict = urlSafe ? CA_URL_SAFE : CA;
+
int charsLen = ((value.length - 1) / 3 + 1) << 2; // base64 character count
int off = this.off;
@@ -96,10 +104,10 @@ public final void writeBase64(byte[] value) {
int i = (value[s++] & 0xff) << 16 | (value[s++] & 0xff) << 8 | (value[s++] & 0xff);
// Encode the int into four chars
- bytes[off] = (byte) CA[(i >>> 18) & 0x3f];
- bytes[off + 1] = (byte) CA[(i >>> 12) & 0x3f];
- bytes[off + 2] = (byte) CA[(i >>> 6) & 0x3f];
- bytes[off + 3] = (byte) CA[i & 0x3f];
+ bytes[off] = (byte) dict[(i >>> 18) & 0x3f];
+ bytes[off + 1] = (byte) dict[(i >>> 12) & 0x3f];
+ bytes[off + 2] = (byte) dict[(i >>> 6) & 0x3f];
+ bytes[off + 3] = (byte) dict[i & 0x3f];
off += 4;
}
@@ -110,11 +118,23 @@ public final void writeBase64(byte[] value) {
int i = ((value[eLen] & 0xff) << 10) | (left == 2 ? ((value[value.length - 1] & 0xff) << 2) : 0);
// Set last four chars
- bytes[off] = (byte) CA[i >> 12];
- bytes[off + 1] = (byte) CA[(i >>> 6) & 0x3f];
- bytes[off + 2] = left == 2 ? (byte) CA[i & 0x3f] : (byte) '=';
- bytes[off + 3] = '=';
- off += 4;
+ bytes[off] = (byte) dict[i >> 12];
+ bytes[off + 1] = (byte) dict[(i >>> 6) & 0x3f];
+
+ if (urlSafe) {
+ // URL-safe Base64 without padding
+ if (left == 2) {
+ bytes[off + 2] = (byte) dict[i & 0x3f];
+ off += 3;
+ } else {
+ off += 2;
+ }
+ } else {
+ // Standard Base64 includes padding
+ bytes[off + 2] = left == 2 ? (byte) dict[i & 0x3f] : (byte) '=';
+ bytes[off + 3] = '=';
+ off += 4;
+ }
}
bytes[off] = (byte) quote;
diff --git a/core/src/main/java/com/alibaba/fastjson2/reader/ObjectReaderCreator.java b/core/src/main/java/com/alibaba/fastjson2/reader/ObjectReaderCreator.java
index 508d771b1c..33c3a862be 100644
--- a/core/src/main/java/com/alibaba/fastjson2/reader/ObjectReaderCreator.java
+++ b/core/src/main/java/com/alibaba/fastjson2/reader/ObjectReaderCreator.java
@@ -3885,6 +3885,11 @@ static ObjectReader getInitReader(
if (objectReader != ObjectReaderImplDate.INSTANCE) {
initReader = objectReader;
}
+ } else if (fieldClass == Instant.class) {
+ ObjectReader objectReader = provider.getObjectReader(Instant.class);
+ if (objectReader != ObjectReaderImplInstant.INSTANCE) {
+ initReader = objectReader;
+ }
}
}
return initReader;
diff --git a/core/src/main/java/com/alibaba/fastjson2/reader/ObjectReaderImplGenericArray.java b/core/src/main/java/com/alibaba/fastjson2/reader/ObjectReaderImplGenericArray.java
index 1ffac89b6a..04180e5be4 100644
--- a/core/src/main/java/com/alibaba/fastjson2/reader/ObjectReaderImplGenericArray.java
+++ b/core/src/main/java/com/alibaba/fastjson2/reader/ObjectReaderImplGenericArray.java
@@ -14,6 +14,7 @@
import java.util.List;
import static com.alibaba.fastjson2.JSONReader.Feature.Base64StringAsByteArray;
+import static com.alibaba.fastjson2.JSONReader.Feature.Base64URLSafeStringAsByteArray;
class ObjectReaderImplGenericArray
implements ObjectReader {
@@ -84,7 +85,8 @@ public Object readObject(JSONReader jsonReader, Type fieldType, Object fieldName
&& ((GenericArrayType) fieldType).getGenericComponentType() == byte.class
) {
byte[] bytes;
- if ((jsonReader.features(features) & Base64StringAsByteArray.mask) != 0) {
+ if ((jsonReader.features(features) & Base64StringAsByteArray.mask) != 0
+ || (jsonReader.features(features) & Base64URLSafeStringAsByteArray.mask) != 0) {
String str = jsonReader.readString();
bytes = Base64.getDecoder().decode(str);
} else {
diff --git a/core/src/main/java/com/alibaba/fastjson2/reader/ObjectReaderImplInt8ValueArray.java b/core/src/main/java/com/alibaba/fastjson2/reader/ObjectReaderImplInt8ValueArray.java
index 255d70f083..018f37aed7 100644
--- a/core/src/main/java/com/alibaba/fastjson2/reader/ObjectReaderImplInt8ValueArray.java
+++ b/core/src/main/java/com/alibaba/fastjson2/reader/ObjectReaderImplInt8ValueArray.java
@@ -13,6 +13,7 @@
import java.util.function.Function;
import static com.alibaba.fastjson2.JSONReader.Feature.Base64StringAsByteArray;
+import static com.alibaba.fastjson2.JSONReader.Feature.Base64URLSafeStringAsByteArray;
class ObjectReaderImplInt8ValueArray
extends ObjectReaderPrimitive {
@@ -33,7 +34,13 @@ class ObjectReaderImplInt8ValueArray
ObjectReaderImplInt8ValueArray(Function builder, String format) {
super(byte[].class);
this.format = format;
- this.features = "base64".equals(format) ? Base64StringAsByteArray.mask : 0;
+ if ("base64".equals(format)) {
+ this.features = Base64StringAsByteArray.mask;
+ } else if ("base64url".equals(format)) {
+ this.features = Base64URLSafeStringAsByteArray.mask;
+ } else {
+ this.features = 0;
+ }
this.builder = builder;
}
@@ -75,7 +82,8 @@ public Object readObject(JSONReader jsonReader, Type fieldType, Object fieldName
if (jsonReader.isString()) {
byte[] bytes;
- if ((jsonReader.features(this.features | features) & Base64StringAsByteArray.mask) != 0) {
+ if ((jsonReader.features(this.features | features) & Base64StringAsByteArray.mask) != 0
+ || (jsonReader.features(this.features | features) & Base64URLSafeStringAsByteArray.mask) != 0) {
bytes = jsonReader.readBase64();
} else {
String str = jsonReader.readString();
diff --git a/core/src/main/java/com/alibaba/fastjson2/reader/ObjectReaderImplList.java b/core/src/main/java/com/alibaba/fastjson2/reader/ObjectReaderImplList.java
index 8439487efc..c0b6afc67d 100644
--- a/core/src/main/java/com/alibaba/fastjson2/reader/ObjectReaderImplList.java
+++ b/core/src/main/java/com/alibaba/fastjson2/reader/ObjectReaderImplList.java
@@ -679,6 +679,14 @@ public Object readObject(JSONReader jsonReader, Type fieldType, Object fieldName
break;
}
+ if (jsonReader.current() == '/') {
+ jsonReader.skipComment();
+ }
+
+ if (jsonReader.nextIfMatch(']')) {
+ break;
+ }
+
Object item;
if (itemType == String.class) {
item = jsonReader.readString();
diff --git a/core/src/main/java/com/alibaba/fastjson2/writer/FieldWriter.java b/core/src/main/java/com/alibaba/fastjson2/writer/FieldWriter.java
index cfec244ecd..9b39ac6c90 100644
--- a/core/src/main/java/com/alibaba/fastjson2/writer/FieldWriter.java
+++ b/core/src/main/java/com/alibaba/fastjson2/writer/FieldWriter.java
@@ -600,7 +600,9 @@ public void writeBinary(JSONWriter jsonWriter, byte[] value) {
if ((features & WriteNonStringValueAsString.mask) != 0) {
jsonWriter.writeString(value);
} else if ("base64".equals(format)
- || (format == null && (jsonWriter.getFeatures(this.features) & WriteByteArrayAsBase64.mask) != 0)
+ || (format == null &&
+ (jsonWriter.getFeatures(this.features) & WriteByteArrayAsBase64.mask) != 0 ||
+ (jsonWriter.getFeatures(this.features) & WriteByteArrayAsBase64URLSafe.mask) != 0)
) {
jsonWriter.writeBase64(value);
} else if ("hex".equals(format)) {
diff --git a/core/src/main/java/com/alibaba/fastjson2/writer/FieldWriterObject.java b/core/src/main/java/com/alibaba/fastjson2/writer/FieldWriterObject.java
index 8953665a83..483da0ab48 100644
--- a/core/src/main/java/com/alibaba/fastjson2/writer/FieldWriterObject.java
+++ b/core/src/main/java/com/alibaba/fastjson2/writer/FieldWriterObject.java
@@ -365,16 +365,17 @@ private boolean writeInternal(JSONWriter jsonWriter, T object) {
}
Class valueClass = value.getClass();
- if (valueClass == byte[].class) {
- writeBinary(jsonWriter, (byte[]) value);
- return true;
- }
-
ObjectWriter valueWriter = getObjectWriter(jsonWriter, valueClass);
if (valueWriter == null) {
throw new JSONException("get objectWriter error : " + valueClass);
}
+ if (valueClass == byte[].class
+ && (valueWriter == ObjectWriterImplInt8Array.INSTANCE || valueWriter == ObjectWriterImplInt8ValueArray.INSTANCE)) {
+ writeBinary(jsonWriter, (byte[]) value);
+ return true;
+ }
+
if (unwrapped
&& writeWithUnwrapped(jsonWriter, value, features, refDetect, valueWriter)) {
return true;
diff --git a/core/src/main/java/com/alibaba/fastjson2/writer/ObjectWriterCreator.java b/core/src/main/java/com/alibaba/fastjson2/writer/ObjectWriterCreator.java
index 882bf38542..ac6613d1c8 100644
--- a/core/src/main/java/com/alibaba/fastjson2/writer/ObjectWriterCreator.java
+++ b/core/src/main/java/com/alibaba/fastjson2/writer/ObjectWriterCreator.java
@@ -451,17 +451,18 @@ boolean record = BeanUtils.isRecord(objectClass);
}
long writerFieldFeatures = features | beanFeatures;
- boolean fieldBased = (writerFieldFeatures & JSONWriter.Feature.FieldBased.mask) != 0;
+ boolean fieldBased = ((writerFieldFeatures & JSONWriter.Feature.FieldBased.mask) != 0 && !objectClass.isInterface())
+ || !beanInfo.alphabetic;
- if (fieldBased && (record || objectClass.isInterface())) {
+ if (fieldBased && record) {
fieldBased = false;
}
List fieldWriters;
+ Map fieldWriterMap = new LinkedHashMap<>();
final FieldInfo fieldInfo = new FieldInfo();
if (fieldBased) {
- Map fieldWriterMap = new TreeMap<>();
BeanUtils.declaredFields(objectClass, field -> {
fieldInfo.init();
FieldWriter fieldWriter = createFieldWriter(objectClass, writerFieldFeatures, provider, beanInfo, fieldInfo, field);
@@ -484,8 +485,6 @@ boolean record = BeanUtils.isRecord(objectClass);
}
if (!fieldWritersCreated) {
- Map fieldWriterMap = new LinkedHashMap<>();
-
if (!record) {
BeanUtils.declaredFields(objectClass, field -> {
fieldInfo.init();
diff --git a/core/src/main/java/com/alibaba/fastjson2/writer/ObjectWriterImplInt8ValueArray.java b/core/src/main/java/com/alibaba/fastjson2/writer/ObjectWriterImplInt8ValueArray.java
index 267760cad4..7a483ceba8 100644
--- a/core/src/main/java/com/alibaba/fastjson2/writer/ObjectWriterImplInt8ValueArray.java
+++ b/core/src/main/java/com/alibaba/fastjson2/writer/ObjectWriterImplInt8ValueArray.java
@@ -13,6 +13,7 @@
import java.util.zip.GZIPOutputStream;
import static com.alibaba.fastjson2.JSONWriter.Feature.WriteByteArrayAsBase64;
+import static com.alibaba.fastjson2.JSONWriter.Feature.WriteByteArrayAsBase64URLSafe;
final class ObjectWriterImplInt8ValueArray
extends ObjectWriterPrimitiveImpl {
@@ -96,6 +97,7 @@ public void write(JSONWriter jsonWriter, Object object, Object fieldName, Type f
if ("base64".equals(format)
|| "gzip,base64".equals(format)
|| (jsonWriter.getFeatures(features) & WriteByteArrayAsBase64.mask) != 0
+ || (jsonWriter.getFeatures(features) & WriteByteArrayAsBase64URLSafe.mask) != 0
) {
jsonWriter.writeBase64(bytes);
return;
diff --git a/core/src/test/java/com/alibaba/fastjson2/features/Base64URLSafeStringAsByteArrayTest.java b/core/src/test/java/com/alibaba/fastjson2/features/Base64URLSafeStringAsByteArrayTest.java
new file mode 100644
index 0000000000..4d6c35cf41
--- /dev/null
+++ b/core/src/test/java/com/alibaba/fastjson2/features/Base64URLSafeStringAsByteArrayTest.java
@@ -0,0 +1,52 @@
+package com.alibaba.fastjson2.features;
+
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONReader;
+import org.junit.jupiter.api.Test;
+
+import java.util.Base64;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class Base64URLSafeStringAsByteArrayTest {
+ private final byte[][] testData = new byte[][]{
+ // 触发 '_' 字符解码
+ new byte[]{-1, -1, -1},
+
+ // 触发 '-' 字符解码
+ new byte[]{-5, -17, -66},
+
+ // 对应无 '=' 填充的场景 (原需 2 个填充)
+ new byte[]{-1, -1, -1, -1},
+
+ // 对应无 '=' 填充的场景 (原需 1 个填充)
+ new byte[]{-1, -1, -1, -1, -1},
+
+ // 边界测试：空数组
+ new byte[0]
+ };
+
+ private String getUrlSafeUnpaddedJson() {
+ Base64.Encoder encoder = Base64.getUrlEncoder().withoutPadding();
+ StringBuilder sb = new StringBuilder("[");
+ for (int i = 0; i < testData.length; i++) {
+ sb.append("\"").append(encoder.encodeToString(testData[i])).append("\"");
+ if (i < testData.length - 1) {
+ sb.append(",");
+ }
+ }
+ sb.append("]");
+ return sb.toString();
+ }
+
+ @Test
+ public void testReadBase64URLSafeStringAsByteArray() {
+ String json = getUrlSafeUnpaddedJson();
+ byte[][] parsed = JSON.parseObject(json, byte[][].class, JSONReader.Feature.Base64URLSafeStringAsByteArray);
+ assertEquals(testData.length, parsed.length);
+ for (int i = 0; i < testData.length; i++) {
+ assertArrayEquals(testData[i], parsed[i]);
+ }
+ }
+}
diff --git a/core/src/test/java/com/alibaba/fastjson2/features/WriteByteArrayAsBase64URLSafeTest.java b/core/src/test/java/com/alibaba/fastjson2/features/WriteByteArrayAsBase64URLSafeTest.java
new file mode 100644
index 0000000000..ae09b2ff00
--- /dev/null
+++ b/core/src/test/java/com/alibaba/fastjson2/features/WriteByteArrayAsBase64URLSafeTest.java
@@ -0,0 +1,57 @@
+package com.alibaba.fastjson2.features;
+
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONWriter;
+import org.junit.jupiter.api.Test;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class WriteByteArrayAsBase64URLSafeTest {
+ private final byte[][] testData = new byte[][]{
+ // 触发 '_' 字符解码
+ new byte[]{-1, -1, -1},
+
+ // 触发 '-' 字符解码
+ new byte[]{-5, -17, -66},
+
+ // 对应无 '=' 填充的场景 (原需 2 个填充)
+ new byte[]{-1, -1, -1, -1},
+
+ // 对应无 '=' 填充的场景 (原需 1 个填充)
+ new byte[]{-1, -1, -1, -1, -1},
+
+ // 边界测试：空数组
+ new byte[0]
+ };
+
+ private String getExpectedJson() {
+ Base64.Encoder encoder = Base64.getUrlEncoder().withoutPadding();
+ StringBuilder sb = new StringBuilder("[");
+ for (int i = 0; i < testData.length; i++) {
+ sb.append("\"").append(encoder.encodeToString(testData[i])).append("\"");
+ if (i < testData.length - 1) {
+ sb.append(",");
+ }
+ }
+ sb.append("]");
+ return sb.toString();
+ }
+
+ @Test
+ public void testWriteByteArrayAsBase64URLSafe_UTF16() {
+ String expected = getExpectedJson();
+ String actual = JSON.toJSONString(testData, JSONWriter.Feature.WriteByteArrayAsBase64URLSafe);
+ assertEquals(expected, actual);
+ }
+
+ @Test
+ public void testWriteByteArrayAsBase64URLSafe_UTF8() {
+ String expected = getExpectedJson();
+ byte[] bytes = JSON.toJSONBytes(testData, JSONWriter.Feature.WriteByteArrayAsBase64URLSafe);
+ String actual = new String(bytes, StandardCharsets.UTF_8);
+ assertEquals(expected, actual);
+ }
+}
diff --git a/extension-vertx/pom.xml b/extension-vertx/pom.xml
new file mode 100644
index 0000000000..ca808e38e8
--- /dev/null
+++ b/extension-vertx/pom.xml
@@ -0,0 +1,147 @@
+
+
+ 4.0.0
+
+ com.alibaba.fastjson2
+ fastjson2-parent
+ 2.0.62-SNAPSHOT
+ ../pom.xml
+
+
+ fastjson2-extension-vertx
+ fastjson2-extension-vertx
+ Fastjson is a JSON processor (JSON parser + JSON generator) written in Java
+ jar
+ https://github.com/alibaba/fastjson2
+ 2026
+
+
+
+ Apache 2
+ https://www.apache.org/licenses/LICENSE-2.0.txt
+ repo
+ A business-friendly OSS license
+
+
+
+ https://github.com/alibaba/fastjson2
+ scm:git:https://git@github.com/alibaba/fastjson2.git
+
+
+
+ 17
+ 17
+ ${maven.compiler.source}
+
+
+
+ Alibaba Group
+ https://github.com/alibaba
+
+
+
+ wenshao
+ wenshao
+ shaojin.wensj(at)alibaba-inc.com
+
+ Developer
+ Tech Leader
+
+ +8
+ https://github.com/wenshao
+
+
+ jujn
+ jujn
+ jth_xdu(at)qq.com
+
+ Developer
+
+ +8
+ https://github.com/jujn
+
+
+
+
+
+
+ io.vertx
+ vertx-dependencies
+ pom
+ ${vertx5.version}
+ import
+
+
+
+
+
+
+ com.alibaba.fastjson2
+ fastjson2-extension
+ ${project.version}
+
+
+
+ io.vertx
+ vertx-core
+ provided
+
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+ test
+
+
+ com.fasterxml.jackson.datatype
+ jackson-datatype-jsr310
+ test
+
+
+ commons-io
+ commons-io
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter-api
+ test
+
+
+ org.openjdk.jmh
+ jmh-core
+ test
+
+
+ org.openjdk.jmh
+ jmh-generator-annprocess
+ test
+
+
+
+
+ org.slf4j
+ slf4j-nop
+ 2.0.12
+ test
+
+
+
+
+
+
+ maven-surefire-plugin
+
+
+ com/alibaba/fastjson2/**/*.java
+
+
+ Asia/Shanghai
+
+
+
+
+
+
diff --git a/extension-vertx/src/main/java/com/alibaba/fastjson2/support/vertx/BufferReader.java b/extension-vertx/src/main/java/com/alibaba/fastjson2/support/vertx/BufferReader.java
new file mode 100644
index 0000000000..ea3fdc92df
--- /dev/null
+++ b/extension-vertx/src/main/java/com/alibaba/fastjson2/support/vertx/BufferReader.java
@@ -0,0 +1,20 @@
+package com.alibaba.fastjson2.support.vertx;
+
+import com.alibaba.fastjson2.JSONReader;
+import com.alibaba.fastjson2.reader.ObjectReader;
+import io.vertx.core.buffer.Buffer;
+
+import java.lang.reflect.Type;
+
+class BufferReader implements ObjectReader {
+ public static final BufferReader INSTANCE = new BufferReader();
+
+ @Override
+ public Buffer readObject(JSONReader jsonReader, Type fieldType, Object fieldName, long features) {
+ if (jsonReader.nextIfNull()) {
+ return null;
+ }
+
+ return Buffer.buffer(jsonReader.readBinary());
+ }
+}
diff --git a/extension-vertx/src/main/java/com/alibaba/fastjson2/support/vertx/BufferWriter.java b/extension-vertx/src/main/java/com/alibaba/fastjson2/support/vertx/BufferWriter.java
new file mode 100644
index 0000000000..098dd340f4
--- /dev/null
+++ b/extension-vertx/src/main/java/com/alibaba/fastjson2/support/vertx/BufferWriter.java
@@ -0,0 +1,22 @@
+package com.alibaba.fastjson2.support.vertx;
+
+import com.alibaba.fastjson2.JSONWriter;
+import com.alibaba.fastjson2.writer.ObjectWriter;
+import io.vertx.core.buffer.Buffer;
+
+import java.lang.reflect.Type;
+
+class BufferWriter implements ObjectWriter {
+ public static final BufferWriter INSTANCE = new BufferWriter();
+
+ @Override
+ public void write(JSONWriter jsonWriter, Object object, Object fieldName, Type fieldType, long features) {
+ if (object == null) {
+ jsonWriter.writeNull();
+ return;
+ }
+
+ Buffer buffer = (Buffer) object;
+ jsonWriter.writeBinary(buffer.getBytes());
+ }
+}
diff --git a/extension-vertx/src/main/java/com/alibaba/fastjson2/support/vertx/ByteArrayReader.java b/extension-vertx/src/main/java/com/alibaba/fastjson2/support/vertx/ByteArrayReader.java
new file mode 100644
index 0000000000..bf27b09f8f
--- /dev/null
+++ b/extension-vertx/src/main/java/com/alibaba/fastjson2/support/vertx/ByteArrayReader.java
@@ -0,0 +1,19 @@
+package com.alibaba.fastjson2.support.vertx;
+
+import com.alibaba.fastjson2.JSONReader;
+import com.alibaba.fastjson2.reader.ObjectReader;
+
+import java.lang.reflect.Type;
+
+class ByteArrayReader implements ObjectReader {
+ public static final ByteArrayReader INSTANCE = new ByteArrayReader();
+
+ @Override
+ public byte[] readObject(JSONReader jsonReader, Type fieldType, Object fieldName, long features) {
+ if (jsonReader.nextIfNull()) {
+ return null;
+ }
+
+ return jsonReader.readBinary();
+ }
+}
diff --git a/extension-vertx/src/main/java/com/alibaba/fastjson2/support/vertx/ByteArrayWriter.java b/extension-vertx/src/main/java/com/alibaba/fastjson2/support/vertx/ByteArrayWriter.java
new file mode 100644
index 0000000000..cba5d3f57c
--- /dev/null
+++ b/extension-vertx/src/main/java/com/alibaba/fastjson2/support/vertx/ByteArrayWriter.java
@@ -0,0 +1,20 @@
+package com.alibaba.fastjson2.support.vertx;
+
+import com.alibaba.fastjson2.JSONWriter;
+import com.alibaba.fastjson2.writer.ObjectWriter;
+
+import java.lang.reflect.Type;
+
+class ByteArrayWriter implements ObjectWriter {
+ public static final ByteArrayWriter INSTANCE = new ByteArrayWriter();
+
+ @Override
+ public void write(JSONWriter jsonWriter, Object object, Object fieldName, Type fieldType, long features) {
+ if (object == null) {
+ jsonWriter.writeNull();
+ return;
+ }
+
+ jsonWriter.writeBinary((byte[]) object);
+ }
+}
diff --git a/extension-vertx/src/main/java/com/alibaba/fastjson2/support/vertx/Fastjson2Codec.java b/extension-vertx/src/main/java/com/alibaba/fastjson2/support/vertx/Fastjson2Codec.java
new file mode 100644
index 0000000000..0209f7256c
--- /dev/null
+++ b/extension-vertx/src/main/java/com/alibaba/fastjson2/support/vertx/Fastjson2Codec.java
@@ -0,0 +1,229 @@
+package com.alibaba.fastjson2.support.vertx;
+
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONReader;
+import com.alibaba.fastjson2.JSONWriter;
+import com.alibaba.fastjson2.modules.ObjectWriterModule;
+import com.alibaba.fastjson2.reader.ObjectReaderProvider;
+import com.alibaba.fastjson2.writer.ObjectWriter;
+import com.alibaba.fastjson2.writer.ObjectWriterProvider;
+import com.fasterxml.jackson.core.type.TypeReference;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufInputStream;
+import io.vertx.core.buffer.Buffer;
+import io.vertx.core.internal.buffer.BufferInternal;
+import io.vertx.core.json.DecodeException;
+import io.vertx.core.json.EncodeException;
+import io.vertx.core.json.JsonArray;
+import io.vertx.core.json.JsonObject;
+import io.vertx.core.spi.json.JsonCodec;
+
+import java.io.InputStream;
+import java.lang.reflect.Type;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZonedDateTime;
+import java.util.List;
+import java.util.Map;
+
+public class Fastjson2Codec implements JsonCodec {
+ private final JSONWriter.Context writerContext;
+ private final JSONWriter.Context prettyWriterContext;
+ private final JSONReader.Context readerContext;
+
+ public void configWriterFeature(JSONWriter.Feature feature, boolean state) {
+ this.writerContext.config(feature, state);
+ this.prettyWriterContext.config(feature, state);
+ }
+
+ public Fastjson2Codec() {
+ ObjectWriterProvider writerProvider = new ObjectWriterProvider();
+ writerProvider.register(JsonObject.class, JsonObjectWriter.INSTANCE);
+ writerProvider.register(JsonArray.class, JsonArrayWriter.INSTANCE);
+ writerProvider.register(byte[].class, ByteArrayWriter.INSTANCE);
+ writerProvider.register(Instant.class, InstantWriter.INSTANCE);
+ writerProvider.register(BufferWriterModule.INSTANCE);
+ writerProvider.register(LocalDateTime.class, LocalDateTimeWriter.INSTANCE);
+ writerProvider.register(ZonedDateTime.class, ZonedDateTimeWriter.INSTANCE);
+ writerProvider.setAlphabetic(false);
+
+ this.writerContext = new JSONWriter.Context(
+ writerProvider,
+ JSONWriter.Feature.WriteNulls,
+ JSONWriter.Feature.WriteMapNullValue,
+ JSONWriter.Feature.WriteEnumsUsingName,
+ JSONWriter.Feature.WriteNonStringKeyAsString,
+ JSONWriter.Feature.WriteByteArrayAsBase64URLSafe
+ );
+ this.prettyWriterContext = new JSONWriter.Context(
+ writerProvider,
+ JSONWriter.Feature.WriteNulls,
+ JSONWriter.Feature.WriteMapNullValue,
+ JSONWriter.Feature.WriteEnumsUsingName,
+ JSONWriter.Feature.WriteNonStringKeyAsString,
+ JSONWriter.Feature.WriteByteArrayAsBase64URLSafe,
+ JSONWriter.Feature.PrettyFormat
+ );
+
+ ObjectReaderProvider readerProvider = new ObjectReaderProvider();
+ readerProvider.register(JsonObject.class, JsonObjectReader.INSTANCE);
+ readerProvider.register(JsonArray.class, JsonArrayReader.INSTANCE);
+ readerProvider.register(byte[].class, ByteArrayReader.INSTANCE);
+ readerProvider.register(Instant.class, InstantReader.INSTANCE);
+ readerProvider.register(Buffer.class, BufferReader.INSTANCE);
+
+ this.readerContext = new JSONReader.Context(
+ readerProvider,
+ JSONReader.Feature.UseNativeObject,
+ JSONReader.Feature.Base64URLSafeStringAsByteArray,
+ JSONReader.Feature.UseDoubleForDecimals
+ );
+ }
+
+ static class BufferWriterModule implements ObjectWriterModule {
+ static final BufferWriterModule INSTANCE = new BufferWriterModule();
+
+ @Override
+ public ObjectWriter getObjectWriter(Type objectType, Class objectClass) {
+ if (objectClass == null) {
+ return null;
+ }
+ if (Buffer.class.isAssignableFrom(objectClass)) { // Buffer 是接口，实际序列化其子类
+ return BufferWriter.INSTANCE;
+ }
+ return null;
+ }
+ }
+
+ @Override
+ public T fromString(String str, Class clazz) throws DecodeException {
+ try {
+ T value = JSON.parseObject(str, clazz, readerContext);
+ return clazz == Object.class ? (T) adapt(value) : value;
+ } catch (Exception e) {
+ throw new DecodeException("Failed to decode: " + e.getMessage(), e);
+ }
+ }
+
+ public T fromString(String str, TypeReference type) throws DecodeException {
+ try {
+ T value = JSON.parseObject(str, type.getType(), readerContext);
+ return type.getType() == Object.class ? (T) adapt(value) : value;
+ } catch (Exception e) {
+ throw new DecodeException("Failed to decode: " + e.getMessage(), e);
+ }
+ }
+
+ public Object fromString(String str) throws DecodeException {
+ return fromString(str, Object.class);
+ }
+
+ @Override
+ public T fromBuffer(Buffer buf, Class clazz) throws DecodeException {
+ return parseFromBuffer(buf, clazz);
+ }
+
+ public T fromBuffer(Buffer buf, TypeReference type) throws DecodeException {
+ return parseFromBuffer(buf, type.getType());
+ }
+
+ public Object fromBuffer(Buffer buf) throws DecodeException {
+ return fromBuffer(buf, Object.class);
+ }
+
+ private T parseFromBuffer(Buffer buf, Type type) throws DecodeException {
+ try {
+ ByteBuf byteBuf = ((BufferInternal) buf).getByteBuf();
+ T value;
+
+ if (byteBuf.hasArray()) {
+ // 堆内内存：直接获取底层 byte[]，不拷贝
+ int offset = byteBuf.arrayOffset() + byteBuf.readerIndex();
+ int length = byteBuf.readableBytes();
+ try (JSONReader reader = JSONReader.of(byteBuf.array(), offset, length, readerContext)) {
+ value = reader.read(type);
+ }
+ } else if (byteBuf.nioBufferCount() == 1) {
+ // 堆外内存：转换为 NIO ByteBuffer 零拷贝解析
+ ByteBuffer nioBuffer = byteBuf.nioBuffer(byteBuf.readerIndex(), byteBuf.readableBytes());
+ try (JSONReader reader = JSONReader.of(nioBuffer, StandardCharsets.UTF_8, readerContext)) {
+ value = reader.read(type);
+ }
+ } else {
+ // 不连续内存：使用 InputStream 流式解析
+ try (InputStream is = new ByteBufInputStream(byteBuf); JSONReader reader = JSONReader.of(is, StandardCharsets.UTF_8, readerContext)) {
+ value = reader.read(type);
+ }
+ }
+
+ return type == Object.class ? (T) adapt(value) : value;
+ } catch (Exception e) {
+ throw new DecodeException("Failed to decode: " + e.getMessage(), e);
+ }
+ }
+
+ @Override
+ public T fromValue(Object json, Class clazz) {
+ try {
+ byte[] bytes = JSON.toJSONBytes(json, StandardCharsets.UTF_8, writerContext);
+ T value = JSON.parseObject(bytes, clazz, readerContext);
+ return clazz == Object.class ? (T) adapt(value) : value;
+ } catch (Exception e) {
+ throw new IllegalArgumentException("Failed to map value: " + e.getMessage(), e);
+ }
+ }
+
+ public T fromValue(Object json, TypeReference type) {
+ try {
+ byte[] bytes = JSON.toJSONBytes(json, StandardCharsets.UTF_8, writerContext);
+ T value = JSON.parseObject(bytes, type.getType(), readerContext);
+ return type.getType() == Object.class ? (T) adapt(value) : value;
+ } catch (Exception e) {
+ throw new IllegalArgumentException("Failed to map value: " + e.getMessage(), e);
+ }
+ }
+
+ @Override
+ public String toString(Object object, boolean pretty) throws EncodeException {
+ try {
+ return pretty ?
+ JSON.toJSONString(object, prettyWriterContext) :
+ JSON.toJSONString(object, writerContext);
+ } catch (Exception e) {
+ throw new EncodeException("Failed to encode as JSON: " + e.getMessage(), e);
+ }
+ }
+
+ @Override
+ public Buffer toBuffer(Object object, boolean pretty) throws EncodeException {
+ try {
+ byte[] bytes = pretty ?
+ JSON.toJSONBytes(object, StandardCharsets.UTF_8, prettyWriterContext) :
+ JSON.toJSONBytes(object, StandardCharsets.UTF_8, writerContext);
+
+ return Buffer.buffer(bytes);
+ } catch (Exception e) {
+ throw new EncodeException("Failed to encode as JSON: " + e.getMessage(), e);
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ private static Object adapt(Object o) {
+ try {
+ if (o == null) {
+ return null;
+ }
+
+ if (o instanceof Map) {
+ return new JsonObject((Map) o);
+ } else if (o instanceof List) {
+ return new JsonArray((List