fix InvokeHint conflict

apache · Jan 28, 2025 · 702e661 · 702e661
1 parent 75e7e4b
commit 702e661
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 5 deletions.
diff --git a/java/fury-core/src/main/java/org/apache/fury/builder/BaseObjectCodecBuilder.java b/java/fury-core/src/main/java/org/apache/fury/builder/BaseObjectCodecBuilder.java
@@ -282,6 +282,12 @@ public InvokeHint add(Expression cutPoint) {
       return this;
     }
 
+    public InvokeHint copy() {
+      InvokeHint invokeHint = new InvokeHint(genNewMethod);
+      invokeHint.cutPoints = new HashSet<>(cutPoints);
+      return invokeHint;
+    }
+
     @Override
     public String toString() {
       return "InvokeHint{" + "genNewMethod=" + genNewMethod + ", cutPoints=" + cutPoints + '}';
@@ -1691,8 +1697,8 @@ private Expression readContainerElement(
         read =
             new If(
                 hasNull,
-                deserializeFor(buffer, elementType, callback, invokeHint),
-                callback.apply(deserializeForNotNull(buffer, elementType, invokeHint)));
+                deserializeFor(buffer, elementType, callback, invokeHint.copy()),
+                callback.apply(deserializeForNotNull(buffer, elementType, invokeHint.copy())));
       }
     } else {
       invokeHint.add(elemSerializer);
@@ -1712,9 +1718,11 @@ private Expression readContainerElement(
                     buffer,
                     elementType,
                     callback,
-                    () -> deserializeForNotNull(buffer, elementType, elemSerializer, invokeHint)),
+                    () ->
+                        deserializeForNotNull(
+                            buffer, elementType, elemSerializer, invokeHint.copy())),
                 callback.apply(
-                    deserializeForNotNull(buffer, elementType, elemSerializer, invokeHint)));
+                    deserializeForNotNull(buffer, elementType, elemSerializer, invokeHint.copy())));
       }
     }
     return read;

diff --git a/java/fury-core/src/test/java/org/apache/fury/serializer/collection/MapSerializersTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/collection/MapSerializersTest.java
@@ -830,7 +830,6 @@ public void testWildcard(boolean referenceTrackingConfig) {
     Fury fury =
         Fury.builder()
             .withRefTracking(referenceTrackingConfig)
-            .withCodegen(true)
             .requireClassRegistration(false)
             .build();
     MapWildcardFieldStruct1 struct = new MapWildcardFieldStruct1();
@@ -843,4 +842,23 @@ public void testWildcard(boolean referenceTrackingConfig) {
     struct.f5 = ofHashMap("k5", new Wildcard1<>());
     serDeCheck(fury, struct);
   }
+
+  @Data
+  public static class NestedListMap {
+    public List<Map<String, String>> map1;
+    public List<HashMap<String, String>> map2;
+  }
+
+  @Test(dataProvider = "referenceTrackingConfig")
+  public void testNestedListMap(boolean referenceTrackingConfig) {
+    Fury fury =
+        Fury.builder()
+            .withRefTracking(referenceTrackingConfig)
+            .requireClassRegistration(false)
+            .build();
+    NestedListMap o = new NestedListMap();
+    o.map1 = ofArrayList(ofHashMap("k1", "v"));
+    o.map2 = ofArrayList(ofHashMap("k2", "2"));
+    serDeCheck(fury, o);
+  }
 }