This is an automated email from the ASF dual-hosted git repository.
chaokunyang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/fory.git
The following commit(s) were added to refs/heads/main by this push:
new 02490ecf8 chore(java): rename _getTypeResolver to getTypeResolver
(#3227)
02490ecf8 is described below
commit 02490ecf88cb73d86dae219048bc52240a2f6d87
Author: Shawn Yang <[email protected]>
AuthorDate: Tue Jan 27 21:06:39 2026 +0800
chore(java): rename _getTypeResolver to getTypeResolver (#3227)
## Why?
## What does this PR do?
## Related issues
## Does this PR introduce any user-facing change?
- [ ] Does this PR introduce any public API change?
- [ ] Does this PR introduce any binary protocol compatibility change?
## Benchmark
---
.../org/apache/fory/AbstractThreadSafeFory.java | 2 +-
.../src/main/java/org/apache/fory/Fory.java | 36 +++++++++++-----------
.../fory/builder/BaseObjectCodecBuilder.java | 8 ++---
.../fory/builder/MetaSharedCodecBuilder.java | 3 +-
.../java/org/apache/fory/meta/TypeDefEncoder.java | 2 +-
.../fory/serializer/AbstractObjectSerializer.java | 2 +-
.../apache/fory/serializer/ArraySerializers.java | 2 +-
.../fory/serializer/DeferedLazySerializer.java | 2 +-
.../org/apache/fory/serializer/FieldGroups.java | 2 +-
.../fory/serializer/MetaSharedLayerSerializer.java | 2 +-
.../fory/serializer/MetaSharedSerializer.java | 4 +--
.../fory/serializer/OptionalSerializers.java | 2 +-
.../fory/serializer/PrimitiveSerializers.java | 2 +-
.../fory/serializer/SerializationBinding.java | 2 +-
.../org/apache/fory/serializer/Serializers.java | 2 +-
.../apache/fory/serializer/TimeSerializers.java | 2 +-
.../apache/fory/serializer/UnionSerializer.java | 4 +--
.../fory/serializer/UnsignedSerializers.java | 2 +-
.../collection/CollectionSerializers.java | 2 +-
.../collection/GuavaCollectionSerializers.java | 2 +-
.../collection/ImmutableCollectionSerializers.java | 2 +-
.../fory/serializer/collection/MapSerializers.java | 2 +-
.../collection/PrimitiveListSerializers.java | 2 +-
.../serializer/collection/SubListSerializers.java | 2 +-
.../collection/SynchronizedSerializers.java | 2 +-
.../collection/UnmodifiableSerializers.java | 2 +-
.../apache/fory/serializer/struct/Fingerprint.java | 2 +-
.../src/main/java/org/apache/fory/type/Types.java | 4 +--
.../src/test/java/org/apache/fory/TestUtils.java | 2 +-
.../org/apache/fory/xlang/PyCrossLanguageTest.java | 2 +-
30 files changed, 53 insertions(+), 54 deletions(-)
diff --git
a/java/fory-core/src/main/java/org/apache/fory/AbstractThreadSafeFory.java
b/java/fory-core/src/main/java/org/apache/fory/AbstractThreadSafeFory.java
index d5ab97353..c0691879d 100644
--- a/java/fory-core/src/main/java/org/apache/fory/AbstractThreadSafeFory.java
+++ b/java/fory-core/src/main/java/org/apache/fory/AbstractThreadSafeFory.java
@@ -130,7 +130,7 @@ public abstract class AbstractThreadSafeFory implements
ThreadSafeFory {
@Override
public void setTypeChecker(TypeChecker typeChecker) {
- registerCallback(fory ->
fory._getTypeResolver().setTypeChecker(typeChecker));
+ registerCallback(fory ->
fory.getTypeResolver().setTypeChecker(typeChecker));
}
@Override
diff --git a/java/fory-core/src/main/java/org/apache/fory/Fory.java
b/java/fory-core/src/main/java/org/apache/fory/Fory.java
index 0d6dd9e0c..4b7d727cb 100644
--- a/java/fory-core/src/main/java/org/apache/fory/Fory.java
+++ b/java/fory-core/src/main/java/org/apache/fory/Fory.java
@@ -169,24 +169,24 @@ public final class Fory implements BaseFory {
@Override
public void register(Class<?> cls) {
- _getTypeResolver().register(cls);
+ getTypeResolver().register(cls);
}
@Override
public void register(Class<?> cls, int id) {
- _getTypeResolver().register(cls, id);
+ getTypeResolver().register(cls, id);
}
@Deprecated
@Override
public void register(Class<?> cls, boolean createSerializer) {
- _getTypeResolver().register(cls);
+ getTypeResolver().register(cls);
}
@Deprecated
@Override
public void register(Class<?> cls, int id, boolean createSerializer) {
- _getTypeResolver().register(cls, id);
+ getTypeResolver().register(cls, id);
}
/**
@@ -205,65 +205,65 @@ public final class Fory implements BaseFory {
}
public void register(Class<?> cls, String namespace, String typeName) {
- _getTypeResolver().register(cls, namespace, typeName);
+ getTypeResolver().register(cls, namespace, typeName);
}
@Override
public void register(String className) {
- _getTypeResolver().register(className);
+ getTypeResolver().register(className);
}
@Override
public void register(String className, int classId) {
- _getTypeResolver().register(className, classId);
+ getTypeResolver().register(className, classId);
}
@Override
public void register(String className, String namespace, String typeName) {
- _getTypeResolver().register(className, namespace, typeName);
+ getTypeResolver().register(className, namespace, typeName);
}
@Override
public void registerUnion(Class<?> cls, int id, Serializer<?> serializer) {
- _getTypeResolver().registerUnion(cls, id, serializer);
+ getTypeResolver().registerUnion(cls, id, serializer);
}
@Override
public void registerUnion(
Class<?> cls, String namespace, String typeName, Serializer<?>
serializer) {
- _getTypeResolver().registerUnion(cls, namespace, typeName, serializer);
+ getTypeResolver().registerUnion(cls, namespace, typeName, serializer);
}
@Override
public <T> void registerSerializer(Class<T> type, Class<? extends
Serializer> serializerClass) {
- _getTypeResolver().registerSerializer(type, serializerClass);
+ getTypeResolver().registerSerializer(type, serializerClass);
}
@Override
public void registerSerializer(Class<?> type, Serializer<?> serializer) {
- _getTypeResolver().registerSerializer(type, serializer);
+ getTypeResolver().registerSerializer(type, serializer);
}
@Override
public void registerSerializer(Class<?> type, Function<Fory, Serializer<?>>
serializerCreator) {
- _getTypeResolver().registerSerializer(type, serializerCreator.apply(this));
+ getTypeResolver().registerSerializer(type, serializerCreator.apply(this));
}
@Override
public <T> void registerSerializerAndType(
Class<T> type, Class<? extends Serializer> serializerClass) {
- _getTypeResolver().registerSerializerAndType(type, serializerClass);
+ getTypeResolver().registerSerializerAndType(type, serializerClass);
}
@Override
public void registerSerializerAndType(Class<?> type, Serializer<?>
serializer) {
- _getTypeResolver().registerSerializerAndType(type, serializer);
+ getTypeResolver().registerSerializerAndType(type, serializer);
}
@Override
public void registerSerializerAndType(
Class<?> type, Function<Fory, Serializer<?>> serializerCreator) {
- _getTypeResolver().registerSerializerAndType(type,
serializerCreator.apply(this));
+ getTypeResolver().registerSerializerAndType(type,
serializerCreator.apply(this));
}
@Override
@@ -1631,7 +1631,7 @@ public final class Fory implements BaseFory {
@Override
public void ensureSerializersCompiled() {
- _getTypeResolver().ensureSerializersCompiled();
+ getTypeResolver().ensureSerializersCompiled();
}
public JITContext getJITContext() {
@@ -1664,7 +1664,7 @@ public final class Fory implements BaseFory {
*/
@Internal
// CHECKSTYLE.OFF:MethodName
- public TypeResolver _getTypeResolver() {
+ public TypeResolver getTypeResolver() {
// CHECKSTYLE.ON:MethodName
return crossLanguage ? xtypeResolver : classResolver;
}
diff --git
a/java/fory-core/src/main/java/org/apache/fory/builder/BaseObjectCodecBuilder.java
b/java/fory-core/src/main/java/org/apache/fory/builder/BaseObjectCodecBuilder.java
index 86d102c98..c79bf3aaf 100644
---
a/java/fory-core/src/main/java/org/apache/fory/builder/BaseObjectCodecBuilder.java
+++
b/java/fory-core/src/main/java/org/apache/fory/builder/BaseObjectCodecBuilder.java
@@ -178,7 +178,7 @@ public abstract class BaseObjectCodecBuilder extends
CodecBuilder {
public BaseObjectCodecBuilder(TypeRef<?> beanType, Fory fory, Class<?>
parentSerializerClass) {
super(new CodegenContext(), beanType);
this.fory = fory;
- typeResolver = fory._getTypeResolver();
+ typeResolver = fory.getTypeResolver();
this.parentSerializerClass = parentSerializerClass;
if (fory.isCrossLanguage()) {
writeMethodName = "xwrite";
@@ -204,7 +204,7 @@ public abstract class BaseObjectCodecBuilder extends
CodecBuilder {
typeResolverRef = fieldRef(TYPE_RESOLVER_NAME, typeResolverType);
Expression typeResolverExpr =
cast(
- inlineInvoke(foryRef, "_getTypeResolver",
TypeRef.of(TypeResolver.class)),
+ inlineInvoke(foryRef, "getTypeResolver",
TypeRef.of(TypeResolver.class)),
typeResolverType);
ctx.addField(ctx.type(typeResolverType), TYPE_RESOLVER_NAME,
typeResolverExpr);
ctx.reserveName(STRING_SERIALIZER_NAME);
@@ -269,7 +269,7 @@ public abstract class BaseObjectCodecBuilder extends
CodecBuilder {
}
protected static <T> T typeResolver(Fory fory, Function<TypeResolver, T>
function) {
- return fory.getJITContext().asyncVisitFory(f ->
function.apply(f._getTypeResolver()));
+ return fory.getJITContext().asyncVisitFory(f ->
function.apply(f.getTypeResolver()));
}
private boolean needWriteRef(TypeRef<?> type) {
@@ -292,7 +292,7 @@ public abstract class BaseObjectCodecBuilder extends
CodecBuilder {
""
+ "super(${fory}, ${cls});\n"
+ "this.${fory} = ${fory};\n"
- + "${fory}._getTypeResolver().setSerializerIfAbsent(${cls},
this);\n",
+ + "${fory}.getTypeResolver().setSerializerIfAbsent(${cls},
this);\n",
"fory",
FORY_NAME,
"cls",
diff --git
a/java/fory-core/src/main/java/org/apache/fory/builder/MetaSharedCodecBuilder.java
b/java/fory-core/src/main/java/org/apache/fory/builder/MetaSharedCodecBuilder.java
index 38e009105..f52359eac 100644
---
a/java/fory-core/src/main/java/org/apache/fory/builder/MetaSharedCodecBuilder.java
+++
b/java/fory-core/src/main/java/org/apache/fory/builder/MetaSharedCodecBuilder.java
@@ -90,8 +90,7 @@ public class MetaSharedCodecBuilder extends
ObjectCodecBuilder {
"Class version check should be disabled when compatible mode is
enabled.");
this.classDef = classDef;
Collection<Descriptor> descriptors =
- fory(
- f -> MetaSharedSerializer.consolidateFields(f._getTypeResolver(),
beanClass, classDef));
+ fory(f -> MetaSharedSerializer.consolidateFields(f.getTypeResolver(),
beanClass, classDef));
DescriptorGrouper grouper = typeResolver(r ->
r.createDescriptorGrouper(descriptors, false));
List<Descriptor> sortedDescriptors = grouper.getSortedDescriptors();
if (org.apache.fory.util.Utils.DEBUG_OUTPUT_ENABLED) {
diff --git
a/java/fory-core/src/main/java/org/apache/fory/meta/TypeDefEncoder.java
b/java/fory-core/src/main/java/org/apache/fory/meta/TypeDefEncoder.java
index 6886c2ef2..bbdee2021 100644
--- a/java/fory-core/src/main/java/org/apache/fory/meta/TypeDefEncoder.java
+++ b/java/fory-core/src/main/java/org/apache/fory/meta/TypeDefEncoder.java
@@ -67,7 +67,7 @@ class TypeDefEncoder {
fory.getXtypeResolver().getFieldDescriptors(type, true),
false,
Function.identity());
- ClassInfo classInfo = fory._getTypeResolver().getClassInfo(type);
+ ClassInfo classInfo = fory.getTypeResolver().getClassInfo(type);
List<Field> fields;
int typeId = classInfo.getTypeId();
if (Types.isStructType(typeId & 0xff)) {
diff --git
a/java/fory-core/src/main/java/org/apache/fory/serializer/AbstractObjectSerializer.java
b/java/fory-core/src/main/java/org/apache/fory/serializer/AbstractObjectSerializer.java
index ce9407c87..b891cf841 100644
---
a/java/fory-core/src/main/java/org/apache/fory/serializer/AbstractObjectSerializer.java
+++
b/java/fory-core/src/main/java/org/apache/fory/serializer/AbstractObjectSerializer.java
@@ -70,7 +70,7 @@ public abstract class AbstractObjectSerializer<T> extends
Serializer<T> {
super(fory, type);
this.refResolver = fory.getRefResolver();
this.classResolver = fory.getClassResolver();
- this.typeResolver = fory._getTypeResolver();
+ this.typeResolver = fory.getTypeResolver();
this.isRecord = RecordUtils.isRecord(type);
this.objectCreator = objectCreator;
}
diff --git
a/java/fory-core/src/main/java/org/apache/fory/serializer/ArraySerializers.java
b/java/fory-core/src/main/java/org/apache/fory/serializer/ArraySerializers.java
index ab3380a83..1da8bd101 100644
---
a/java/fory-core/src/main/java/org/apache/fory/serializer/ArraySerializers.java
+++
b/java/fory-core/src/main/java/org/apache/fory/serializer/ArraySerializers.java
@@ -982,7 +982,7 @@ public class ArraySerializers {
}
public static void registerDefaultSerializers(Fory fory) {
- TypeResolver resolver = fory._getTypeResolver();
+ TypeResolver resolver = fory.getTypeResolver();
resolver.registerInternalSerializer(
Object[].class, new ObjectArraySerializer<>(fory, Object[].class));
resolver.registerInternalSerializer(
diff --git
a/java/fory-core/src/main/java/org/apache/fory/serializer/DeferedLazySerializer.java
b/java/fory-core/src/main/java/org/apache/fory/serializer/DeferedLazySerializer.java
index 636a00ba6..c6b01b555 100644
---
a/java/fory-core/src/main/java/org/apache/fory/serializer/DeferedLazySerializer.java
+++
b/java/fory-core/src/main/java/org/apache/fory/serializer/DeferedLazySerializer.java
@@ -60,7 +60,7 @@ public class DeferedLazySerializer extends Serializer {
Tuple2<Boolean, Serializer> tuple2 = serializerSupplier.get();
if (tuple2.f0) {
serializer = tuple2.f1;
- fory._getTypeResolver().setSerializer(type, serializer);
+ fory.getTypeResolver().setSerializer(type, serializer);
} else {
return tuple2.f1;
}
diff --git
a/java/fory-core/src/main/java/org/apache/fory/serializer/FieldGroups.java
b/java/fory-core/src/main/java/org/apache/fory/serializer/FieldGroups.java
index 73b3f598b..fc2b8dcce 100644
--- a/java/fory-core/src/main/java/org/apache/fory/serializer/FieldGroups.java
+++ b/java/fory-core/src/main/java/org/apache/fory/serializer/FieldGroups.java
@@ -142,7 +142,7 @@ public class FieldGroups {
this.descriptor = d;
this.typeRef = d.getTypeRef();
this.dispatchId = DispatchId.getDispatchId(fory, d);
- TypeResolver resolver = fory._getTypeResolver();
+ TypeResolver resolver = fory.getTypeResolver();
// invoke `copy` to avoid ObjectSerializer construct clear serializer by
`clearSerializer`.
if (resolver.isMonomorphic(descriptor)) {
classInfo = SerializationUtils.getClassInfo(fory,
typeRef.getRawType());
diff --git
a/java/fory-core/src/main/java/org/apache/fory/serializer/MetaSharedLayerSerializer.java
b/java/fory-core/src/main/java/org/apache/fory/serializer/MetaSharedLayerSerializer.java
index 022469266..4a463073b 100644
---
a/java/fory-core/src/main/java/org/apache/fory/serializer/MetaSharedLayerSerializer.java
+++
b/java/fory-core/src/main/java/org/apache/fory/serializer/MetaSharedLayerSerializer.java
@@ -68,7 +68,7 @@ public class MetaSharedLayerSerializer<T> extends
MetaSharedLayerSerializerBase<
super(fory, type);
this.layerClassDef = layerClassDef;
this.layerMarkerClass = layerMarkerClass;
- TypeResolver typeResolver = fory._getTypeResolver();
+ TypeResolver typeResolver = fory.getTypeResolver();
this.binding = SerializationBinding.createBinding(fory);
// Build field infos from layerClassDef
diff --git
a/java/fory-core/src/main/java/org/apache/fory/serializer/MetaSharedSerializer.java
b/java/fory-core/src/main/java/org/apache/fory/serializer/MetaSharedSerializer.java
index ca6dbf94e..9b6253100 100644
---
a/java/fory-core/src/main/java/org/apache/fory/serializer/MetaSharedSerializer.java
+++
b/java/fory-core/src/main/java/org/apache/fory/serializer/MetaSharedSerializer.java
@@ -91,9 +91,9 @@ public class MetaSharedSerializer<T> extends
AbstractObjectSerializer<T> {
LOG.info(" [{}] {}", i, classDef.getFieldsInfo().get(i));
}
}
- Collection<Descriptor> descriptors =
consolidateFields(fory._getTypeResolver(), type, classDef);
+ Collection<Descriptor> descriptors =
consolidateFields(fory.getTypeResolver(), type, classDef);
DescriptorGrouper descriptorGrouper =
- fory._getTypeResolver().createDescriptorGrouper(descriptors, false);
+ fory.getTypeResolver().createDescriptorGrouper(descriptors, false);
if (Utils.DEBUG_OUTPUT_ENABLED) {
LOG.info(
"========== MetaSharedSerializer sorted descriptors for {}
==========", type.getName());
diff --git
a/java/fory-core/src/main/java/org/apache/fory/serializer/OptionalSerializers.java
b/java/fory-core/src/main/java/org/apache/fory/serializer/OptionalSerializers.java
index 2c8fe9afd..eb91cf21d 100644
---
a/java/fory-core/src/main/java/org/apache/fory/serializer/OptionalSerializers.java
+++
b/java/fory-core/src/main/java/org/apache/fory/serializer/OptionalSerializers.java
@@ -131,7 +131,7 @@ public final class OptionalSerializers {
}
public static void registerDefaultSerializers(Fory fory) {
- TypeResolver resolver = fory._getTypeResolver();
+ TypeResolver resolver = fory.getTypeResolver();
resolver.registerInternalSerializer(Optional.class, new
OptionalSerializer(fory));
resolver.registerInternalSerializer(OptionalInt.class, new
OptionalIntSerializer(fory));
resolver.registerInternalSerializer(OptionalLong.class, new
OptionalLongSerializer(fory));
diff --git
a/java/fory-core/src/main/java/org/apache/fory/serializer/PrimitiveSerializers.java
b/java/fory-core/src/main/java/org/apache/fory/serializer/PrimitiveSerializers.java
index 1e3c9e979..4cc69731a 100644
---
a/java/fory-core/src/main/java/org/apache/fory/serializer/PrimitiveSerializers.java
+++
b/java/fory-core/src/main/java/org/apache/fory/serializer/PrimitiveSerializers.java
@@ -350,7 +350,7 @@ public class PrimitiveSerializers {
public static void registerDefaultSerializers(Fory fory) {
// primitive types will be boxed.
- TypeResolver resolver = fory._getTypeResolver();
+ TypeResolver resolver = fory.getTypeResolver();
resolver.registerInternalSerializer(boolean.class, new
BooleanSerializer(fory, boolean.class));
resolver.registerInternalSerializer(byte.class, new ByteSerializer(fory,
byte.class));
resolver.registerInternalSerializer(short.class, new ShortSerializer(fory,
short.class));
diff --git
a/java/fory-core/src/main/java/org/apache/fory/serializer/SerializationBinding.java
b/java/fory-core/src/main/java/org/apache/fory/serializer/SerializationBinding.java
index 33c1bc73f..1790b03b8 100644
---
a/java/fory-core/src/main/java/org/apache/fory/serializer/SerializationBinding.java
+++
b/java/fory-core/src/main/java/org/apache/fory/serializer/SerializationBinding.java
@@ -48,7 +48,7 @@ abstract class SerializationBinding {
SerializationBinding(Fory fory) {
this.fory = fory;
this.refResolver = fory.getRefResolver();
- typeResolver = fory._getTypeResolver();
+ typeResolver = fory.getTypeResolver();
}
abstract <T> void writeRef(MemoryBuffer buffer, T obj);
diff --git
a/java/fory-core/src/main/java/org/apache/fory/serializer/Serializers.java
b/java/fory-core/src/main/java/org/apache/fory/serializer/Serializers.java
index a1716be03..1487c39c2 100644
--- a/java/fory-core/src/main/java/org/apache/fory/serializer/Serializers.java
+++ b/java/fory-core/src/main/java/org/apache/fory/serializer/Serializers.java
@@ -569,7 +569,7 @@ public class Serializers {
}
public static void registerDefaultSerializers(Fory fory) {
- TypeResolver resolver = fory._getTypeResolver();
+ TypeResolver resolver = fory.getTypeResolver();
resolver.registerInternalSerializer(Class.class, new
ClassSerializer(fory));
resolver.registerInternalSerializer(StringBuilder.class, new
StringBuilderSerializer(fory));
resolver.registerInternalSerializer(StringBuffer.class, new
StringBufferSerializer(fory));
diff --git
a/java/fory-core/src/main/java/org/apache/fory/serializer/TimeSerializers.java
b/java/fory-core/src/main/java/org/apache/fory/serializer/TimeSerializers.java
index 110017fb2..0dd960abc 100644
---
a/java/fory-core/src/main/java/org/apache/fory/serializer/TimeSerializers.java
+++
b/java/fory-core/src/main/java/org/apache/fory/serializer/TimeSerializers.java
@@ -714,7 +714,7 @@ public class TimeSerializers {
}
public static void registerDefaultSerializers(Fory fory) {
- TypeResolver resolver = fory._getTypeResolver();
+ TypeResolver resolver = fory.getTypeResolver();
resolver.registerInternalSerializer(Date.class, new DateSerializer(fory));
resolver.registerInternalSerializer(java.sql.Date.class, new
SqlDateSerializer(fory));
resolver.registerInternalSerializer(Time.class, new
SqlTimeSerializer(fory));
diff --git
a/java/fory-core/src/main/java/org/apache/fory/serializer/UnionSerializer.java
b/java/fory-core/src/main/java/org/apache/fory/serializer/UnionSerializer.java
index 32289885e..f11c8a717 100644
---
a/java/fory-core/src/main/java/org/apache/fory/serializer/UnionSerializer.java
+++
b/java/fory-core/src/main/java/org/apache/fory/serializer/UnionSerializer.java
@@ -198,11 +198,11 @@ public class UnionSerializer extends Serializer<Union> {
buffer.writeVarUint32Small7(typeId);
return;
}
- fory._getTypeResolver().writeClassInfo(buffer, classInfo);
+ fory.getTypeResolver().writeClassInfo(buffer, classInfo);
}
private ClassInfo getClassInfo(int typeId, Object value) {
- TypeResolver resolver = fory._getTypeResolver();
+ TypeResolver resolver = fory.getTypeResolver();
int internalTypeId = typeId & 0xff;
if (typeId >= 256 && resolver instanceof XtypeResolver) {
ClassInfo classInfo = ((XtypeResolver) resolver).getUserTypeInfo(typeId
>>> 8);
diff --git
a/java/fory-core/src/main/java/org/apache/fory/serializer/UnsignedSerializers.java
b/java/fory-core/src/main/java/org/apache/fory/serializer/UnsignedSerializers.java
index 5f7d11bf5..677d26032 100644
---
a/java/fory-core/src/main/java/org/apache/fory/serializer/UnsignedSerializers.java
+++
b/java/fory-core/src/main/java/org/apache/fory/serializer/UnsignedSerializers.java
@@ -102,7 +102,7 @@ public class UnsignedSerializers {
public static void registerDefaultSerializers(Fory fory) {
// Note: Classes are already registered in ClassResolver.initialize()
// We only need to register serializers here
- TypeResolver resolver = fory._getTypeResolver();
+ TypeResolver resolver = fory.getTypeResolver();
resolver.registerInternalSerializer(Uint8.class, new
Uint8Serializer(fory));
resolver.registerInternalSerializer(Uint16.class, new
Uint16Serializer(fory));
resolver.registerInternalSerializer(Uint32.class, new
Uint32Serializer(fory));
diff --git
a/java/fory-core/src/main/java/org/apache/fory/serializer/collection/CollectionSerializers.java
b/java/fory-core/src/main/java/org/apache/fory/serializer/collection/CollectionSerializers.java
index f8477781e..cd5b7b6dd 100644
---
a/java/fory-core/src/main/java/org/apache/fory/serializer/collection/CollectionSerializers.java
+++
b/java/fory-core/src/main/java/org/apache/fory/serializer/collection/CollectionSerializers.java
@@ -1002,7 +1002,7 @@ public class CollectionSerializers {
// TODO Support ArraySubListSerializer, SubListSerializer
public static void registerDefaultSerializers(Fory fory) {
- TypeResolver resolver = fory._getTypeResolver();
+ TypeResolver resolver = fory.getTypeResolver();
resolver.registerInternalSerializer(ArrayList.class, new
ArrayListSerializer(fory));
Class arrayAsListClass = Arrays.asList(1, 2).getClass();
resolver.registerInternalSerializer(
diff --git
a/java/fory-core/src/main/java/org/apache/fory/serializer/collection/GuavaCollectionSerializers.java
b/java/fory-core/src/main/java/org/apache/fory/serializer/collection/GuavaCollectionSerializers.java
index 15fc3f3be..56ea2926e 100644
---
a/java/fory-core/src/main/java/org/apache/fory/serializer/collection/GuavaCollectionSerializers.java
+++
b/java/fory-core/src/main/java/org/apache/fory/serializer/collection/GuavaCollectionSerializers.java
@@ -401,7 +401,7 @@ public class GuavaCollectionSerializers {
// inconsistent if peers load different version of guava.
// For example: guava 20 return ImmutableBiMap for ImmutableMap.of(), but
guava 27 return
// ImmutableMap.
- TypeResolver resolver = fory._getTypeResolver();
+ TypeResolver resolver = fory.getTypeResolver();
Class cls =
loadClass(pkg + ".RegularImmutableBiMap", ImmutableBiMap.of("k1", 1,
"k2", 4).getClass());
resolver.registerInternalSerializer(cls, new
ImmutableBiMapSerializer(fory, cls));
diff --git
a/java/fory-core/src/main/java/org/apache/fory/serializer/collection/ImmutableCollectionSerializers.java
b/java/fory-core/src/main/java/org/apache/fory/serializer/collection/ImmutableCollectionSerializers.java
index 72c3d4f69..3feb33097 100644
---
a/java/fory-core/src/main/java/org/apache/fory/serializer/collection/ImmutableCollectionSerializers.java
+++
b/java/fory-core/src/main/java/org/apache/fory/serializer/collection/ImmutableCollectionSerializers.java
@@ -260,7 +260,7 @@ public class ImmutableCollectionSerializers {
}
public static void registerSerializers(Fory fory) {
- TypeResolver resolver = fory._getTypeResolver();
+ TypeResolver resolver = fory.getTypeResolver();
resolver.registerInternalSerializer(List12, new
ImmutableListSerializer(fory, List12));
resolver.registerInternalSerializer(ListN, new
ImmutableListSerializer(fory, ListN));
resolver.registerInternalSerializer(SubList, new
ImmutableListSerializer(fory, SubList));
diff --git
a/java/fory-core/src/main/java/org/apache/fory/serializer/collection/MapSerializers.java
b/java/fory-core/src/main/java/org/apache/fory/serializer/collection/MapSerializers.java
index 346a56938..c17b4a2c2 100644
---
a/java/fory-core/src/main/java/org/apache/fory/serializer/collection/MapSerializers.java
+++
b/java/fory-core/src/main/java/org/apache/fory/serializer/collection/MapSerializers.java
@@ -495,7 +495,7 @@ public class MapSerializers {
// TODO(chaokunyang) support ConcurrentSkipListMap.SubMap mo efficiently.
public static void registerDefaultSerializers(Fory fory) {
- TypeResolver resolver = fory._getTypeResolver();
+ TypeResolver resolver = fory.getTypeResolver();
resolver.registerInternalSerializer(HashMap.class, new
HashMapSerializer(fory));
resolver.registerInternalSerializer(LinkedHashMap.class, new
LinkedHashMapSerializer(fory));
resolver.registerInternalSerializer(
diff --git
a/java/fory-core/src/main/java/org/apache/fory/serializer/collection/PrimitiveListSerializers.java
b/java/fory-core/src/main/java/org/apache/fory/serializer/collection/PrimitiveListSerializers.java
index 6a9970aaf..d86556bb1 100644
---
a/java/fory-core/src/main/java/org/apache/fory/serializer/collection/PrimitiveListSerializers.java
+++
b/java/fory-core/src/main/java/org/apache/fory/serializer/collection/PrimitiveListSerializers.java
@@ -542,7 +542,7 @@ public class PrimitiveListSerializers {
public static void registerDefaultSerializers(Fory fory) {
// Note: Classes are already registered in ClassResolver.initialize()
// We only need to register serializers here
- TypeResolver resolver = fory._getTypeResolver();
+ TypeResolver resolver = fory.getTypeResolver();
resolver.registerInternalSerializer(BoolList.class, new
BoolListSerializer(fory));
resolver.registerInternalSerializer(Int8List.class, new
Int8ListSerializer(fory));
resolver.registerInternalSerializer(Int16List.class, new
Int16ListSerializer(fory));
diff --git
a/java/fory-core/src/main/java/org/apache/fory/serializer/collection/SubListSerializers.java
b/java/fory-core/src/main/java/org/apache/fory/serializer/collection/SubListSerializers.java
index bcc689279..98efa1839 100644
---
a/java/fory-core/src/main/java/org/apache/fory/serializer/collection/SubListSerializers.java
+++
b/java/fory-core/src/main/java/org/apache/fory/serializer/collection/SubListSerializers.java
@@ -64,7 +64,7 @@ public class SubListSerializers {
}
public static void registerSerializers(Fory fory, boolean preserveView) {
- TypeResolver classResolver = fory._getTypeResolver();
+ TypeResolver classResolver = fory.getTypeResolver();
// java.util.ImmutableCollections$SubList is already registered in
// ImmutableCollectionSerializers
for (Class<?> cls :
diff --git
a/java/fory-core/src/main/java/org/apache/fory/serializer/collection/SynchronizedSerializers.java
b/java/fory-core/src/main/java/org/apache/fory/serializer/collection/SynchronizedSerializers.java
index be5d983de..dc0fcaaff 100644
---
a/java/fory-core/src/main/java/org/apache/fory/serializer/collection/SynchronizedSerializers.java
+++
b/java/fory-core/src/main/java/org/apache/fory/serializer/collection/SynchronizedSerializers.java
@@ -212,7 +212,7 @@ public class SynchronizedSerializers {
*/
public static void registerSerializers(Fory fory) {
try {
- TypeResolver resolver = fory._getTypeResolver();
+ TypeResolver resolver = fory.getTypeResolver();
for (Tuple2<Class<?>, Function> factory : synchronizedFactories()) {
resolver.registerInternalSerializer(factory.f0, createSerializer(fory,
factory));
}
diff --git
a/java/fory-core/src/main/java/org/apache/fory/serializer/collection/UnmodifiableSerializers.java
b/java/fory-core/src/main/java/org/apache/fory/serializer/collection/UnmodifiableSerializers.java
index 26f28aecb..3a2814872 100644
---
a/java/fory-core/src/main/java/org/apache/fory/serializer/collection/UnmodifiableSerializers.java
+++
b/java/fory-core/src/main/java/org/apache/fory/serializer/collection/UnmodifiableSerializers.java
@@ -210,7 +210,7 @@ public class UnmodifiableSerializers {
*/
public static void registerSerializers(Fory fory) {
try {
- TypeResolver resolver = fory._getTypeResolver();
+ TypeResolver resolver = fory.getTypeResolver();
for (Tuple2<Class<?>, Function> factory : unmodifiableFactories()) {
resolver.registerInternalSerializer(factory.f0, createSerializer(fory,
factory));
}
diff --git
a/java/fory-core/src/main/java/org/apache/fory/serializer/struct/Fingerprint.java
b/java/fory-core/src/main/java/org/apache/fory/serializer/struct/Fingerprint.java
index 311bf3c21..0d7be7179 100644
---
a/java/fory-core/src/main/java/org/apache/fory/serializer/struct/Fingerprint.java
+++
b/java/fory-core/src/main/java/org/apache/fory/serializer/struct/Fingerprint.java
@@ -144,7 +144,7 @@ public class Fingerprint {
private static int getTypeId(Fory fory, Descriptor descriptor) {
Class<?> cls = descriptor.getTypeRef().getRawType();
- TypeResolver resolver = fory._getTypeResolver();
+ TypeResolver resolver = fory.getTypeResolver();
if (resolver.isSet(cls)) {
return Types.SET;
} else if (resolver.isCollection(cls)) {
diff --git a/java/fory-core/src/main/java/org/apache/fory/type/Types.java
b/java/fory-core/src/main/java/org/apache/fory/type/Types.java
index 08b3f6dd6..e27640e74 100644
--- a/java/fory-core/src/main/java/org/apache/fory/type/Types.java
+++ b/java/fory-core/src/main/java/org/apache/fory/type/Types.java
@@ -351,7 +351,7 @@ public class Types {
}
private static int getUnionDescriptorTypeId(Fory fory, Class<?> rawType) {
- ClassInfo classInfo = fory._getTypeResolver().getClassInfo(rawType, false);
+ ClassInfo classInfo = fory.getTypeResolver().getClassInfo(rawType, false);
if (classInfo == null) {
return -1;
}
@@ -385,7 +385,7 @@ public class Types {
return Types.FLOAT64;
}
}
- ClassInfo classInfo = fory._getTypeResolver().getClassInfo(clz, false);
+ ClassInfo classInfo = fory.getTypeResolver().getClassInfo(clz, false);
if (classInfo != null) {
return classInfo.getTypeId();
}
diff --git a/java/fory-core/src/test/java/org/apache/fory/TestUtils.java
b/java/fory-core/src/test/java/org/apache/fory/TestUtils.java
index afa0d7250..c516b95c4 100644
--- a/java/fory-core/src/test/java/org/apache/fory/TestUtils.java
+++ b/java/fory-core/src/test/java/org/apache/fory/TestUtils.java
@@ -345,7 +345,7 @@ public class TestUtils {
public static Map<String, Object> objectToMap(Fory fory, Object obj) {
Class<?> cls = obj.getClass();
ClassDef classDef = fory.getClassResolver().getTypeDef(cls, true);
- List<Descriptor> descriptors =
classDef.getDescriptors(fory._getTypeResolver(), cls);
+ List<Descriptor> descriptors =
classDef.getDescriptors(fory.getTypeResolver(), cls);
Map<String, Object> result = new LinkedHashMap<>();
for (Descriptor descriptor : descriptors) {
Field field = descriptor.getField();
diff --git
a/java/fory-core/src/test/java/org/apache/fory/xlang/PyCrossLanguageTest.java
b/java/fory-core/src/test/java/org/apache/fory/xlang/PyCrossLanguageTest.java
index ac9222389..2d03985e6 100644
---
a/java/fory-core/src/test/java/org/apache/fory/xlang/PyCrossLanguageTest.java
+++
b/java/fory-core/src/test/java/org/apache/fory/xlang/PyCrossLanguageTest.java
@@ -502,7 +502,7 @@ public class PyCrossLanguageTest extends ForyTestBase {
ObjectSerializer.class.getDeclaredMethod(
"computeStructHash", Fory.class, DescriptorGrouper.class);
method.setAccessible(true);
- TypeResolver resolver = fory._getTypeResolver();
+ TypeResolver resolver = fory.getTypeResolver();
Collection<Descriptor> descriptors =
resolver.getFieldDescriptors(ComplexObject1.class, false);
DescriptorGrouper grouper = resolver.createDescriptorGrouper(descriptors,
false);
Integer hash = (Integer) method.invoke(objSerializer, fory, grouper);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
