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/fury.git
The following commit(s) were added to refs/heads/main by this push:
new 39b919e0 fix(java): NonExistentEnum on mode serializeEnumByName (#1904)
39b919e0 is described below
commit 39b919e04c5646d470e67681b31272368e8be91d
Author: orisgarno <[email protected]>
AuthorDate: Fri Oct 25 00:00:32 2024 +0700
fix(java): NonExistentEnum on mode serializeEnumByName (#1904)
## What does this PR do?
Handle NonExistentEnum on mode serializeEnumByName by returning UNKNOWN.
since there are no relevancy anymore by using enum ordinal.
## 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/fury/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.
-->
---
.../serializer/NonexistentClassSerializers.java | 8 ++++++++
.../NonexistentClassSerializersTest.java | 22 ++++++++++++++++++++++
2 files changed, 30 insertions(+)
diff --git
a/java/fury-core/src/main/java/org/apache/fury/serializer/NonexistentClassSerializers.java
b/java/fury-core/src/main/java/org/apache/fury/serializer/NonexistentClassSerializers.java
index fa8768b9..bbdd972e 100644
---
a/java/fury-core/src/main/java/org/apache/fury/serializer/NonexistentClassSerializers.java
+++
b/java/fury-core/src/main/java/org/apache/fury/serializer/NonexistentClassSerializers.java
@@ -34,6 +34,7 @@ import org.apache.fury.resolver.ClassInfo;
import org.apache.fury.resolver.ClassInfoHolder;
import org.apache.fury.resolver.ClassResolver;
import org.apache.fury.resolver.MetaContext;
+import org.apache.fury.resolver.MetaStringResolver;
import org.apache.fury.resolver.RefResolver;
import org.apache.fury.serializer.NonexistentClass.NonexistentEnum;
import org.apache.fury.type.Descriptor;
@@ -226,14 +227,21 @@ public final class NonexistentClassSerializers {
public static final class NonexistentEnumClassSerializer extends Serializer {
private final NonexistentEnum[] enumConstants;
+ private final MetaStringResolver metaStringResolver;
public NonexistentEnumClassSerializer(Fury fury) {
super(fury, NonexistentEnum.class);
+ metaStringResolver = fury.getMetaStringResolver();
enumConstants = NonexistentEnum.class.getEnumConstants();
}
@Override
public Object read(MemoryBuffer buffer) {
+ if (fury.getConfig().serializeEnumByName()) {
+ metaStringResolver.readMetaStringBytes(buffer);
+ return NonexistentEnum.UNKNOWN;
+ }
+
int ordinal = buffer.readVarUint32Small7();
if (ordinal >= enumConstants.length) {
ordinal = enumConstants.length - 1;
diff --git
a/java/fury-core/src/test/java/org/apache/fury/serializer/NonexistentClassSerializersTest.java
b/java/fury-core/src/test/java/org/apache/fury/serializer/NonexistentClassSerializersTest.java
index 9fadf683..05a5dcdc 100644
---
a/java/fury-core/src/test/java/org/apache/fury/serializer/NonexistentClassSerializersTest.java
+++
b/java/fury-core/src/test/java/org/apache/fury/serializer/NonexistentClassSerializersTest.java
@@ -122,6 +122,28 @@ public class NonexistentClassSerializersTest extends
FuryTestBase {
assertEquals(o, NonexistentClass.NonexistentEnum.V1);
}
+ @Test(dataProvider = "scopedMetaShare")
+ public void testNonexistentEnum_AsString(boolean scopedMetaShare) {
+ Fury fury =
+ furyBuilder(scopedMetaShare)
+ .withDeserializeNonexistentClass(true)
+ .serializeEnumByName(true)
+ .build();
+ String enumCode = ("enum TestEnum {" + " A, B" + "}");
+ Class<?> cls = JaninoUtils.compileClass(getClass().getClassLoader(), "",
"TestEnum", enumCode);
+ Object c = cls.getEnumConstants()[1];
+ assertEquals(c.toString(), "B");
+ byte[] bytes = fury.serialize(c);
+ Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
+ Fury fury2 =
+ furyBuilder(scopedMetaShare)
+ .withDeserializeNonexistentClass(true)
+ .serializeEnumByName(true)
+ .build();
+ Object o = fury2.deserialize(bytes);
+ assertEquals(o, NonexistentClass.NonexistentEnum.UNKNOWN);
+ }
+
@Test(dataProvider = "scopedMetaShare")
public void testNonexistentEnumAndArrayField(boolean scopedMetaShare) throws
Exception {
String enumStructCode1 =
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
