Skip to content

Fix 2478 #3536

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Fix 2478 #3536

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5b270b8
fix enable serialize and deserialize when using PropertyNamingStrateg…
yanxutao89 May 2, 2025
7ebe1ff
fix checkstyle
yanxutao89 May 2, 2025
7f3db50
fix limited to NameFilter
yanxutao89 May 7, 2025
d34c39e
fix improve test case
yanxutao89 May 7, 2025
b314306
fix possible concurrency problem
yanxutao89 May 23, 2025
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
28 changes: 21 additions & 7 deletions core/src/main/java/com/alibaba/fastjson2/JSON.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -896,7 +896,7 @@ static <T> T parseObject(

final JSONReader.Context context = JSONFactory.createReadContext(filter, features);
boolean fieldBased = (context.features & JSONReader.Feature.FieldBased.mask) != 0;
ObjectReader<T> objectReader = context.provider.getObjectReader(clazz, fieldBased);
ObjectReader<T> objectReader = context.provider.getObjectReader(clazz, fieldBased, filter);

try (JSONReader reader = JSONReader.of(text, context)) {
if (reader.nextIfNull()) {
Expand All @@ -911,6 +911,8 @@ static <T> T parseObject(
throw new JSONException(reader.info("input not end"));
}
return object;
} finally {
context.provider.setNameFilter(null);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

如果Context被多个线程同时使用，这里有问题的

}
}

Expand Down Expand Up @@ -947,7 +949,7 @@ static <T> T parseObject(
context.setDateFormat(format);

boolean fieldBased = (context.features & JSONReader.Feature.FieldBased.mask) != 0;
ObjectReader<T> objectReader = context.provider.getObjectReader(type, fieldBased);
ObjectReader<T> objectReader = context.provider.getObjectReader(type, fieldBased, filters);

try (JSONReader reader = JSONReader.of(text, context)) {
if (reader.nextIfNull()) {
Expand All @@ -962,6 +964,8 @@ static <T> T parseObject(
throw new JSONException(reader.info("input not end"));
}
return object;
} finally {
context.provider.setNameFilter(null);
}
}

Expand Down Expand Up @@ -1133,7 +1137,7 @@ static <T> T parseObject(
final JSONReader.Context context = JSONFactory.createReadContext(filter, features);
Type type = typeReference.getType();
boolean fieldBased = (context.features & JSONReader.Feature.FieldBased.mask) != 0;
ObjectReader<T> objectReader = context.provider.getObjectReader(type, fieldBased);
ObjectReader<T> objectReader = context.provider.getObjectReader(type, fieldBased, filter);

try (JSONReader reader = JSONReader.of(text, context)) {
T object = objectReader.readObject(reader, type, null, 0);
Expand All @@ -1144,6 +1148,8 @@ static <T> T parseObject(
throw new JSONException(reader.info("input not end"));
}
return object;
} finally {
context.provider.setNameFilter(null);
}
}

Expand Down Expand Up @@ -1331,7 +1337,7 @@ static <T> T parseObject(String text, Type type, Filter filter, JSONReader.Featu
}

final JSONReader.Context context = JSONFactory.createReadContext(filter, features);
ObjectReader<T> objectReader = context.getObjectReader(type);
ObjectReader<T> objectReader = context.getObjectReader(type, filter);

try (JSONReader reader = JSONReader.of(text, context)) {
T object = objectReader.readObject(reader, type, null, 0);
Expand All @@ -1342,6 +1348,8 @@ static <T> T parseObject(String text, Type type, Filter filter, JSONReader.Featu
throw new JSONException(reader.info("input not end"));
}
return object;
} finally {
context.provider.setNameFilter(null);
}
}

Expand Down Expand Up @@ -1566,7 +1574,7 @@ static <T> T parseObject(

final JSONReader.Context context = JSONFactory.createReadContext(filter, features);
boolean fieldBased = (context.features & JSONReader.Feature.FieldBased.mask) != 0;
ObjectReader<T> objectReader = context.provider.getObjectReader(clazz, fieldBased);
ObjectReader<T> objectReader = context.provider.getObjectReader(clazz, fieldBased, filter);

try (JSONReader reader = JSONReader.of(bytes, context)) {
T object = objectReader.readObject(reader, clazz, null, 0);
Expand All @@ -1577,6 +1585,8 @@ static <T> T parseObject(
throw new JSONException(reader.info("input not end"));
}
return object;
} finally {
context.provider.setNameFilter(null);
}
}

Expand Down Expand Up @@ -1649,7 +1659,7 @@ static <T> T parseObject(
context.setDateFormat(format);

boolean fieldBased = (context.features & JSONReader.Feature.FieldBased.mask) != 0;
ObjectReader<T> objectReader = context.provider.getObjectReader(type, fieldBased);
ObjectReader<T> objectReader = context.provider.getObjectReader(type, fieldBased, filters);

try (JSONReader reader = JSONReader.of(bytes, context)) {
T object = objectReader.readObject(reader, type, null, 0);
Expand All @@ -1660,6 +1670,8 @@ static <T> T parseObject(
throw new JSONException(reader.info("input not end"));
}
return object;
} finally {
context.provider.setNameFilter(null);
}
}

Expand Down Expand Up @@ -1805,7 +1817,7 @@ static <T> T parseObject(byte[] bytes, Type type, Filter filter, JSONReader.Feat
}

final JSONReader.Context context = JSONFactory.createReadContext(filter, features);
final ObjectReader<T> objectReader = context.getObjectReader(type);
final ObjectReader<T> objectReader = context.getObjectReader(type, filter);

try (JSONReader reader = JSONReader.of(bytes, context)) {
T object = objectReader.readObject(reader, type, null, 0);
Expand All @@ -1816,6 +1828,8 @@ static <T> T parseObject(byte[] bytes, Type type, Filter filter, JSONReader.Feat
throw new JSONException(reader.info("input not end"));
}
return object;
} finally {
context.provider.setNameFilter(null);
}
}

Expand Down
5 changes: 5 additions & 0 deletions core/src/main/java/com/alibaba/fastjson2/JSONFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.alibaba.fastjson2.filter.ExtraProcessor;
import com.alibaba.fastjson2.filter.Filter;
import com.alibaba.fastjson2.filter.NameFilter;
import com.alibaba.fastjson2.reader.ObjectReader;
import com.alibaba.fastjson2.reader.ObjectReaderCreator;
import com.alibaba.fastjson2.reader.ObjectReaderProvider;
Expand Down Expand Up @@ -434,6 +435,10 @@ public static JSONReader.Context createReadContext(Filter filter, JSONReader.Fea
context.extraProcessor = (ExtraProcessor) filter;
}

if (filter instanceof NameFilter) {
provider.setNameFilter((NameFilter) filter);
}

for (int i = 0; i < features.length; i++) {
context.features |= features[i].mask;
}
Expand Down
10 changes: 10 additions & 0 deletions core/src/main/java/com/alibaba/fastjson2/JSONReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.alibaba.fastjson2.filter.ContextAutoTypeBeforeHandler;
import com.alibaba.fastjson2.filter.ExtraProcessor;
import com.alibaba.fastjson2.filter.Filter;
import com.alibaba.fastjson2.filter.NameFilter;
import com.alibaba.fastjson2.reader.*;
import com.alibaba.fastjson2.util.*;

Expand Down Expand Up @@ -4000,6 +4001,11 @@ public ObjectReader getObjectReader(Type type) {
return provider.getObjectReader(type, fieldBased);
}

public ObjectReader getObjectReader(Type type, Filter... filters) {
boolean fieldBased = (features & Feature.FieldBased.mask) != 0;
return provider.getObjectReader(type, fieldBased, filters);
}

public ObjectReaderProvider getProvider() {
return provider;
}
Expand Down Expand Up @@ -4257,6 +4263,10 @@ public void config(Filter[] filters) {
if (filter instanceof ExtraProcessor) {
extraProcessor = (ExtraProcessor) filter;
}

if (filter instanceof NameFilter) {
provider.setNameFilter((NameFilter) filter);
}
}
}

Expand Down
4 changes: 0 additions & 4 deletions core/src/main/java/com/alibaba/fastjson2/codec/BeanInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,6 @@ public BeanInfo(ObjectReaderProvider provider) {
if (provider.isDisableSmartMatch()) {
readerFeatures |= FieldInfo.DISABLE_SMART_MATCH;
}
PropertyNamingStrategy naming = provider.getNamingStrategy();
if (naming != null) {
namingStrategy = naming.name();
}
}

public BeanInfo(ObjectWriterProvider provider) {
Expand Down
77 changes: 18 additions & 59 deletions core/src/main/java/com/alibaba/fastjson2/reader/ObjectReaderCreator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,10 @@
package com.alibaba.fastjson2.reader;

import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONException;
import com.alibaba.fastjson2.JSONFactory;
import com.alibaba.fastjson2.JSONObject;
import com.alibaba.fastjson2.JSONReader;
import com.alibaba.fastjson2.PropertyNamingStrategy;
import com.alibaba.fastjson2.TypeReference;
import com.alibaba.fastjson2.*;
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.codec.BeanInfo;
import com.alibaba.fastjson2.codec.FieldInfo;
import com.alibaba.fastjson2.function.ObjBoolConsumer;
import com.alibaba.fastjson2.function.ObjByteConsumer;
import com.alibaba.fastjson2.function.ObjCharConsumer;
import com.alibaba.fastjson2.function.ObjFloatConsumer;
import com.alibaba.fastjson2.function.ObjShortConsumer;
import com.alibaba.fastjson2.function.*;
import com.alibaba.fastjson2.internal.asm.ASMUtils;
import com.alibaba.fastjson2.modules.ObjectReaderAnnotationProcessor;
import com.alibaba.fastjson2.modules.ObjectReaderModule;
Expand All @@ -25,57 +15,18 @@
import com.alibaba.fastjson2.util.JDKUtils;
import com.alibaba.fastjson2.util.TypeUtils;

import java.lang.invoke.CallSite;
import java.lang.invoke.LambdaMetafactory;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
import java.lang.invoke.MethodType;
import java.lang.reflect.Constructor;
import java.lang.reflect.Executable;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Member;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.lang.reflect.Parameter;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.lang.invoke.*;
import java.lang.reflect.*;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.OffsetDateTime;
import java.time.ZonedDateTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicIntegerArray;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicLongArray;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.BiConsumer;
import java.util.function.BiFunction;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.IntFunction;
import java.util.function.ObjDoubleConsumer;
import java.util.function.ObjIntConsumer;
import java.util.function.ObjLongConsumer;
import java.util.function.Supplier;
import java.time.*;
import java.util.*;
import java.util.concurrent.atomic.*;
import java.util.function.*;
import java.util.stream.Collectors;

import static com.alibaba.fastjson2.util.BeanUtils.*;
import static com.alibaba.fastjson2.util.BeanUtils.SUPER;
import static com.alibaba.fastjson2.util.BeanUtils.getField;
import static com.alibaba.fastjson2.util.TypeUtils.*;

public class ObjectReaderCreator {
Expand Down Expand Up @@ -1426,6 +1377,10 @@ protected void createFieldReader(
}
}

if (provider.getNameFilter() != null) {
fieldName = provider.getNameFilter().process(null, fieldName, null);
}

Type fieldType = field.getGenericType();
Class<?> fieldClass = field.getType();

Expand Down Expand Up @@ -1557,6 +1512,10 @@ protected void createFieldReader(
}
}

if (provider.getNameFilter() != null) {
fieldName = provider.getNameFilter().process(null, fieldName, null);
}

int parameterCount = method.getParameterCount();
if (parameterCount == 0) {
Type fieldType = method.getGenericReturnType();
Expand Down
Loading