This is an automated email from the ASF dual-hosted git repository.
suiliangliang 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 e56a99922 fix(java): fix extension java module conflict (#2455)
e56a99922 is described below
commit e56a999220829f83a003eb129627ff245c63fe28
Author: Shawn Yang <[email protected]>
AuthorDate: Mon Aug 11 14:47:58 2025 +0800
fix(java): fix extension java module conflict (#2455)
<!--
**Thanks for contributing to 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).
- 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.
-->
## What does this PR do?
<!-- Describe the purpose of this PR. -->
## Related issues
<!--
Is there any related issue? Please attach here.
- #xxxx0
- #xxxx1
- #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.
-->
- [ ] 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.
-->
---
.../java/org/apache/fory/serializer/shim/ProtobufDispatcher.java | 5 +++--
.../org/apache/fory/{ => extension}/meta/ZstdMetaCompressor.java | 0
.../apache/fory/{ => extension}/serializer/ByteStringSerializer.java | 0
.../apache/fory/{ => extension}/serializer/ProtobufSerializer.java | 3 ++-
.../org/apache/fory/{ => extension}/meta/ClassDefEncoderTest.java | 0
5 files changed, 5 insertions(+), 3 deletions(-)
diff --git
a/java/fory-core/src/main/java/org/apache/fory/serializer/shim/ProtobufDispatcher.java
b/java/fory-core/src/main/java/org/apache/fory/serializer/shim/ProtobufDispatcher.java
index 2450f049b..3c099115a 100644
---
a/java/fory-core/src/main/java/org/apache/fory/serializer/shim/ProtobufDispatcher.java
+++
b/java/fory-core/src/main/java/org/apache/fory/serializer/shim/ProtobufDispatcher.java
@@ -20,6 +20,7 @@
package org.apache.fory.serializer.shim;
import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.fory.Fory;
import org.apache.fory.logging.Logger;
import org.apache.fory.logging.LoggerFactory;
import org.apache.fory.reflect.ReflectionUtils;
@@ -47,11 +48,11 @@ public class ProtobufDispatcher {
pbMessageSerializerClass =
(Class<? extends Serializer>)
ReflectionUtils.loadClass(
- Serializer.class.getPackage().getName() + "." +
"ProtobufSerializer");
+ Fory.class.getPackage().getName() +
".extension.serializer.ProtobufSerializer");
pbByteStringSerializerClass =
(Class<? extends Serializer>)
ReflectionUtils.loadClass(
- Serializer.class.getPackage().getName() + "." +
"ByteStringSerializer");
+ Fory.class.getPackage().getName() +
".extension.serializer.ByteStringSerializer");
} catch (Exception e) {
ExceptionUtils.ignore(e);
}
diff --git
a/java/fory-extensions/src/main/java/org/apache/fory/meta/ZstdMetaCompressor.java
b/java/fory-extensions/src/main/java/org/apache/fory/extension/meta/ZstdMetaCompressor.java
similarity index 100%
rename from
java/fory-extensions/src/main/java/org/apache/fory/meta/ZstdMetaCompressor.java
rename to
java/fory-extensions/src/main/java/org/apache/fory/extension/meta/ZstdMetaCompressor.java
diff --git
a/java/fory-extensions/src/main/java/org/apache/fory/serializer/ByteStringSerializer.java
b/java/fory-extensions/src/main/java/org/apache/fory/extension/serializer/ByteStringSerializer.java
similarity index 100%
rename from
java/fory-extensions/src/main/java/org/apache/fory/serializer/ByteStringSerializer.java
rename to
java/fory-extensions/src/main/java/org/apache/fory/extension/serializer/ByteStringSerializer.java
diff --git
a/java/fory-extensions/src/main/java/org/apache/fory/serializer/ProtobufSerializer.java
b/java/fory-extensions/src/main/java/org/apache/fory/extension/serializer/ProtobufSerializer.java
similarity index 98%
rename from
java/fory-extensions/src/main/java/org/apache/fory/serializer/ProtobufSerializer.java
rename to
java/fory-extensions/src/main/java/org/apache/fory/extension/serializer/ProtobufSerializer.java
index b6623f9a6..ae9d28094 100644
---
a/java/fory-extensions/src/main/java/org/apache/fory/serializer/ProtobufSerializer.java
+++
b/java/fory-extensions/src/main/java/org/apache/fory/extension/serializer/ProtobufSerializer.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.fory.serializer;
+package org.apache.fory.extension.serializer;
import com.google.protobuf.CodedInputStream;
import com.google.protobuf.CodedOutputStream;
@@ -31,6 +31,7 @@ import java.nio.ByteBuffer;
import org.apache.fory.Fory;
import org.apache.fory.memory.MemoryBuffer;
import org.apache.fory.memory.Platform;
+import org.apache.fory.serializer.Serializer;
import org.apache.fory.util.unsafe._JDKAccess;
@SuppressWarnings({"rawtypes", "unchecked"})
diff --git
a/java/fory-extensions/src/test/java/org/apache/fory/meta/ClassDefEncoderTest.java
b/java/fory-extensions/src/test/java/org/apache/fory/extension/meta/ClassDefEncoderTest.java
similarity index 100%
rename from
java/fory-extensions/src/test/java/org/apache/fory/meta/ClassDefEncoderTest.java
rename to
java/fory-extensions/src/test/java/org/apache/fory/extension/meta/ClassDefEncoderTest.java
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
