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 0cb8173db fix(java): fix register serializer for xlang in java (#2683)
0cb8173db is described below
commit 0cb8173db66cd7a56d7d8afa174c8b5dae19434c
Author: Shawn Yang <[email protected]>
AuthorDate: Mon Sep 29 14:45:41 2025 +0800
fix(java): fix register serializer for xlang in java (#2683)
<!--
**Thanks for contributing to Apache Fory™.**
**If this is your first time opening a PR on fory, you can refer to
[CONTRIBUTING.md](https://github.com/apache/fory/blob/main/CONTRIBUTING.md).**
Contribution Checklist
- The **Apache Fory™** community has requirements on the naming of pr
titles. You can also find instructions in
[CONTRIBUTING.md](https://github.com/apache/fory/blob/main/CONTRIBUTING.md).
- Apache Fory™ has a strong focus on performance. If the PR you submit
will have an impact on performance, please benchmark it first and
provide the benchmark result here.
-->
## Why?
<!-- Describe the purpose of this PR. -->
## What does this PR do?
<!-- Describe the details of this PR. -->
## Related issues
<!--
Is there any related issue? If this PR closes them you say say
fix/closes:
- #xxxx0
- #xxxx1
- Fixes #xxxx2
-->
## Does this PR introduce any user-facing change?
<!--
If any user-facing interface changes, please [open an
issue](https://github.com/apache/fory/issues/new/choose) describing the
need to do so and update the document if necessary.
Delete section if not applicable.
-->
- [ ] Does this PR introduce any public API change?
- [ ] Does this PR introduce any binary protocol compatibility change?
## Benchmark
<!--
When the PR has an impact on performance (if you don't know whether the
PR will have an impact on performance, you can submit the PR first, and
if it will have impact on performance, the code reviewer will explain
it), be sure to attach a benchmark data here.
Delete section if not applicable.
-->
---
.../java/org/apache/fory/resolver/XtypeResolver.java | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git
a/java/fory-core/src/main/java/org/apache/fory/resolver/XtypeResolver.java
b/java/fory-core/src/main/java/org/apache/fory/resolver/XtypeResolver.java
index 3250c24eb..7b5da3a41 100644
--- a/java/fory-core/src/main/java/org/apache/fory/resolver/XtypeResolver.java
+++ b/java/fory-core/src/main/java/org/apache/fory/resolver/XtypeResolver.java
@@ -338,11 +338,7 @@ public class XtypeResolver extends TypeResolver {
}
public <T> void registerSerializer(Class<T> type, Class<? extends
Serializer> serializerClass) {
- ClassInfo classInfo = checkClassRegistration(type);
- if (!serializerClass.getPackage().getName().startsWith("org.apache.fory"))
{
- SerializationUtils.validate(type, serializerClass);
- }
- classInfo.serializer = Serializers.newSerializer(fory, type,
serializerClass);
+ registerSerializer(type, Serializers.newSerializer(fory, type,
serializerClass));
}
public void registerSerializer(Class<?> type, Serializer<?> serializer) {
@@ -350,6 +346,18 @@ public class XtypeResolver extends TypeResolver {
if
(!serializer.getClass().getPackage().getName().startsWith("org.apache.fory")) {
SerializationUtils.validate(type, serializer.getClass());
}
+ int xtypeId = classInfo.xtypeId;
+ int foryId = xtypeId & 0xff;
+ if (foryId != Types.EXT && foryId != Types.NAMED_EXT) {
+ if (foryId == Types.STRUCT || foryId == Types.COMPATIBLE_STRUCT) {
+ classInfo.xtypeId = (xtypeId & 0xffffff00) | Types.EXT;
+ } else if (foryId == Types.NAMED_STRUCT || foryId ==
Types.NAMED_COMPATIBLE_STRUCT) {
+ classInfo.xtypeId = (xtypeId & 0xffffff00) | Types.NAMED_EXT;
+ } else {
+ throw new IllegalArgumentException(
+ String.format("Can't register serializer for type %s with id %s",
type, xtypeId));
+ }
+ }
classInfo.serializer = serializer;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
