(fury) branch main updated: fix(java): fix enum abstract field serialization (#1765)

[chaokunyang]

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 40697ed5 fix(java): fix enum abstract field serialization (#1765)
40697ed5 is described below

commit 40697ed5855830542d9c259cd91af90ff529c5a3
Author: Shawn Yang <shawn.ck.y...@gmail.com>
AuthorDate: Sat Jul 27 01:39:27 2024 +0800

    fix(java): fix enum abstract field serialization (#1765)
    
    ## What does this PR do?
    
     fix enum abstract field serialization
    
    ## Related issues
    
    Closes #1764
    
    ## 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.
    -->
---
 .../org/apache/fury/resolver/ClassResolver.java    |  2 +-
 .../apache/fury/serializer/EnumSerializerTest.java | 37 ++++++++++++++++++----
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git 
a/java/fury-core/src/main/java/org/apache/fury/resolver/ClassResolver.java 
b/java/fury-core/src/main/java/org/apache/fury/resolver/ClassResolver.java
index ce4dfa27..883a63d0 100644
--- a/java/fury-core/src/main/java/org/apache/fury/resolver/ClassResolver.java
+++ b/java/fury-core/src/main/java/org/apache/fury/resolver/ClassResolver.java
@@ -809,7 +809,7 @@ public class ClassResolver {
   }
 
   public Class<? extends Serializer> getSerializerClass(Class<?> cls, boolean 
codegen) {
-    if (ReflectionUtils.isAbstract(cls) || cls.isInterface()) {
+    if (!cls.isEnum() && (ReflectionUtils.isAbstract(cls) || 
cls.isInterface())) {
       throw new UnsupportedOperationException(
           String.format("Class %s doesn't support serialization.", cls));
     }
diff --git 
a/java/fury-core/src/test/java/org/apache/fury/serializer/EnumSerializerTest.java
 
b/java/fury-core/src/test/java/org/apache/fury/serializer/EnumSerializerTest.java
index 270817af..ae03bb4f 100644
--- 
a/java/fury-core/src/test/java/org/apache/fury/serializer/EnumSerializerTest.java
+++ 
b/java/fury-core/src/test/java/org/apache/fury/serializer/EnumSerializerTest.java
@@ -21,9 +21,12 @@ package org.apache.fury.serializer;
 
 import static org.testng.Assert.*;
 
+import lombok.AllArgsConstructor;
+import lombok.Data;
 import org.apache.fury.Fury;
 import org.apache.fury.FuryTestBase;
 import org.apache.fury.codegen.JaninoUtils;
+import org.apache.fury.config.CompatibleMode;
 import org.apache.fury.config.FuryBuilder;
 import org.apache.fury.config.Language;
 import org.testng.annotations.Test;
@@ -60,15 +63,13 @@ public class EnumSerializerTest extends FuryTestBase {
             .requireClassRegistration(false);
     Fury fury1 = builder.build();
     Fury fury2 = builder.build();
-    assertEquals(EnumSerializerTest.EnumFoo.A, serDe(fury1, fury2, 
EnumSerializerTest.EnumFoo.A));
-    assertEquals(EnumSerializerTest.EnumFoo.B, serDe(fury1, fury2, 
EnumSerializerTest.EnumFoo.B));
-    assertEquals(
-        EnumSerializerTest.EnumSubClass.A, serDe(fury1, fury2, 
EnumSerializerTest.EnumSubClass.A));
-    assertEquals(
-        EnumSerializerTest.EnumSubClass.B, serDe(fury1, fury2, 
EnumSerializerTest.EnumSubClass.B));
+    assertEquals(EnumFoo.A, serDe(fury1, fury2, EnumFoo.A));
+    assertEquals(EnumFoo.B, serDe(fury1, fury2, EnumFoo.B));
+    assertEquals(EnumSubClass.A, serDe(fury1, fury2, EnumSubClass.A));
+    assertEquals(EnumSubClass.B, serDe(fury1, fury2, EnumSubClass.B));
   }
 
-  @Test()
+  @Test
   public void testEnumSerializationUnexistentEnumValueAsNull() {
     String enumCode2 = "enum TestEnum2 {" + " A;" + "}";
     String enumCode1 = "enum TestEnum2 {" + " A, B" + "}";
@@ -93,4 +94,26 @@ public class EnumSerializerTest extends FuryTestBase {
     byte[] bytes = furySerialization.serialize(cls1.getEnumConstants()[1]);
     Object data = furyDeserialize.deserialize(bytes);
   }
+
+  @Data
+  @AllArgsConstructor
+  static class EnumSubclassFieldTest {
+    EnumSubClass subEnum;
+  }
+
+  @Test(dataProvider = "enableCodegen")
+  public void testEnumSubclassField(boolean enableCodegen) {
+    serDeCheck(
+        builder().withCodegen(enableCodegen).build(), new 
EnumSubclassFieldTest(EnumSubClass.B));
+  }
+
+  @Test(dataProvider = "scopedMetaShare")
+  public void testEnumSubclassFieldCompatible(boolean scopedMetaShare) {
+    serDeCheck(
+        builder()
+            .withScopedMetaShare(scopedMetaShare)
+            .withCompatibleMode(CompatibleMode.COMPATIBLE)
+            .build(),
+        new EnumSubclassFieldTest(EnumSubClass.B));
+  }
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@fury.apache.org
For additional commands, e-mail: commits-h...@fury.apache.org