Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion core/src/main/java/com/alibaba/fastjson2/JSONFactory.java
Original file line number Diff line number Diff line change
Expand Up @@ -285,13 +285,23 @@ public static void setUseGsonAnnotation(boolean useGsonAnnotation) {
JSONFactory.useGsonAnnotation = useGsonAnnotation;
}

private static volatile boolean jsonFieldDefaultValueCompatMode;

public static boolean isJSONFieldDefaultValueCompatMode() {
return jsonFieldDefaultValueCompatMode;
}

public static void setJSONFieldDefaultValueCompatMode(boolean compatMode) {
jsonFieldDefaultValueCompatMode = compatMode;
}

public static int getDefaultMaxLevel() {
return defaultMaxLevel;
}

public static void setDefaultMaxLevel(int maxLevel) {
if (maxLevel <= 0) {
throw new IllegalArgumentException("maxLevel must be positive");
throw new IllegalArgumentException("maxLevel must be positive, maxLevel " + maxLevel);
}
JSONFactory.defaultMaxLevel = maxLevel;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2317,13 +2317,19 @@ public <T> FieldReader createFieldReaderMethod(
}

if (defaultValue != null && defaultValue.getClass() != fieldClass) {
Function typeConvert = JSONFactory
.getDefaultObjectReaderProvider()
.getTypeConvert(defaultValue.getClass(), fieldType);
if (typeConvert != null) {
defaultValue = typeConvert.apply(defaultValue);
if (JSONFactory.isJSONFieldDefaultValueCompatMode()
&& defaultValue instanceof String
&& Date.class.isAssignableFrom(fieldClass)) {
// For compatibility with JSONField defaultValue
} else {
throw new JSONException("illegal defaultValue : " + defaultValue + ", class " + fieldClass.getName());
Function typeConvert = JSONFactory
.getDefaultObjectReaderProvider()
.getTypeConvert(defaultValue.getClass(), fieldType);
if (typeConvert != null) {
defaultValue = typeConvert.apply(defaultValue);
} else {
throw new JSONException("illegal defaultValue : " + defaultValue + ", class " + fieldClass.getName());
}
}
}

Expand Down
Loading
Loading