Fix remaining Java Serialization issues with JDK21 (#2880)

Fix remaining Java Serialization issues with JDK21 Co-authored-by: karnsa <[email protected]>
vavr-io · Oct 4, 2024 · edba0ea · edba0ea
1 parent 3ce61b1
commit edba0ea
Show file tree

Hide file tree

Showing 11 changed files with 40 additions and 8 deletions.
diff --git a/vavr/generator/Generator.scala b/vavr/generator/Generator.scala
@@ -1104,7 +1104,7 @@ def generateMainClasses(): Unit = {
                   private static final long serialVersionUID = 1L;
 
                   private final Pattern0<T> pattern;
-                  private final $FunctionType<? super T, ? extends R> f;
+                  private transient final $FunctionType<? super T, ? extends R> f;
 
                   private Case0(Pattern0<T> pattern, $FunctionType<? super T, ? extends R> f) {
                       this.pattern = pattern;
@@ -1130,13 +1130,18 @@ def generateMainClasses(): Unit = {
                   case 2 => BiFunctionType
                   case _ => s"Function$i"
                 }
+                val accessModifier = i match {
+                  case 1 => "transient final"
+                  case 2 => "transient final"
+                  case _ => "final"
+                }
                 xs"""
                   public static final class Case$i<T, $generics, R> implements Case<T, R> {
 
                       private static final long serialVersionUID = 1L;
 
                       private final Pattern$i<T, $generics> pattern;
-                      private final $functionType<$argTypes, ? extends R> f;
+                      private $accessModifier $functionType<$argTypes, ? extends R> f;
 
                       private Case$i(Pattern$i<T, $generics> pattern, $functionType<$argTypes, ? extends R> f) {
                           this.pattern = pattern;
@@ -2329,7 +2334,9 @@ def generateMainClasses(): Unit = {
          *
          * @author Daniel Dietrich
          */
-        public interface Tuple {
+        public interface Tuple extends ${im.getType("java.io.Serializable")} {
+
+            long serialVersionUID = 1L;
 
             /**
              * The maximum arity of an Tuple.
@@ -2415,7 +2422,10 @@ def generateMainClasses(): Unit = {
        *
        * @author Pap Lőrinc
        */
-      interface ArrayType<T> {
+      interface ArrayType<T> extends Serializable {
+
+          long serialVersionUID = 1L;
+
           @SuppressWarnings("unchecked")
           static <T> ArrayType<T> obj() { return (ArrayType<T>) ObjectArrayType.INSTANCE; }
 

diff --git a/vavr/src-gen/main/java/io/vavr/API.java b/vavr/src-gen/main/java/io/vavr/API.java
@@ -5654,4 +5654,4 @@ public boolean isDefinedAt(T obj) {
             }
         }
     }
-}
+}
diff --git a/vavr/src-gen/main/java/io/vavr/Tuple.java b/vavr/src-gen/main/java/io/vavr/Tuple.java
@@ -25,6 +25,7 @@
 
 import io.vavr.collection.Seq;
 import io.vavr.collection.Stream;
+import java.io.Serializable;
 import java.util.Map;
 import java.util.Objects;
 
@@ -33,7 +34,9 @@
  *
  * @author Daniel Dietrich
  */
-public interface Tuple {
+public interface Tuple extends Serializable {
+
+    long serialVersionUID = 1L;
 
     /**
      * The maximum arity of an Tuple.

diff --git a/vavr/src-gen/main/java/io/vavr/collection/ArrayType.java b/vavr/src-gen/main/java/io/vavr/collection/ArrayType.java
@@ -32,7 +32,10 @@
  *
  * @author Pap Lőrinc
  */
-interface ArrayType<T> {
+interface ArrayType<T> extends Serializable {
+
+    long serialVersionUID = 1L;
+
     @SuppressWarnings("unchecked")
     static <T> ArrayType<T> obj() { return (ArrayType<T>) ObjectArrayType.INSTANCE; }
 

diff --git a/vavr/src/main/java/io/vavr/collection/Array.java b/vavr/src/main/java/io/vavr/collection/Array.java
@@ -45,6 +45,7 @@ public final class Array<T> implements IndexedSeq<T>, Serializable {
 
     private static final Array<?> EMPTY = new Array<>(new Object[0]);
 
+    @SuppressWarnings("serial") // Conditionally serializable
     private final Object[] delegate;
 
     private Array(Object[] delegate) {

diff --git a/vavr/src/main/java/io/vavr/collection/BitMappedTrie.java b/vavr/src/main/java/io/vavr/collection/BitMappedTrie.java
@@ -60,6 +60,7 @@ final class BitMappedTrie<T> implements Serializable {
     static <T> BitMappedTrie<T> empty() { return (BitMappedTrie<T>) EMPTY; }
 
     final ArrayType<T> type;
+    @SuppressWarnings("serial") // Conditionally serializable
     private final Object array;
     private final int offset, length;
     private final int depthShift;

diff --git a/vavr/src/main/java/io/vavr/collection/HashArrayMappedTrie.java b/vavr/src/main/java/io/vavr/collection/HashArrayMappedTrie.java
@@ -377,7 +377,9 @@ final class LeafSingleton<K, V> extends LeafNode<K, V> implements Serializable {
         private static final long serialVersionUID = 1L;
 
         private final int hash;
+        @SuppressWarnings("serial") // Conditionally serializable
         private final K key;
+        @SuppressWarnings("serial") // Conditionally serializable
         private final V value;
 
         LeafSingleton(int hash, K key, V value) {
@@ -446,7 +448,9 @@ final class LeafList<K, V> extends LeafNode<K, V> implements Serializable {
         private static final long serialVersionUID = 1L;
 
         private final int hash;
+        @SuppressWarnings("serial") // Conditionally serializable
         private final K key;
+        @SuppressWarnings("serial") // Conditionally serializable
         private final V value;
         private final int size;
         private final LeafNode<K, V> tail;
@@ -592,6 +596,7 @@ final class IndexedNode<K, V> extends AbstractNode<K, V> implements Serializable
 
         private final int bitmap;
         private final int size;
+        @SuppressWarnings("serial") // Conditionally serializable
         private final Object[] subNodes;
 
         IndexedNode(int bitmap, int size, Object[] subNodes) {
@@ -705,6 +710,7 @@ final class ArrayNode<K, V> extends AbstractNode<K, V> implements Serializable {
 
         private static final long serialVersionUID = 1L;
 
+        @SuppressWarnings("serial") // Conditionally serializable
         private final Object[] subNodes;
         private final int count;
         private final int size;

diff --git a/vavr/src/main/java/io/vavr/collection/RedBlackTree.java b/vavr/src/main/java/io/vavr/collection/RedBlackTree.java
@@ -46,7 +46,9 @@
  * @param <T> Component type
  * @author Daniel Dietrich
  */
-interface RedBlackTree<T> extends Iterable<T> {
+interface RedBlackTree<T> extends Iterable<T>, Serializable {
+
+    long serialVersionUID = 1L;
 
     static <T> RedBlackTree<T> empty(Comparator<? super T> comparator) {
         Objects.requireNonNull(comparator, "comparator is null");
@@ -344,6 +346,7 @@ final class Node<T> implements RedBlackTree<T>, Serializable {
         final Color color;
         final int blackHeight;
         final RedBlackTree<T> left;
+        @SuppressWarnings("serial")
         final T value;
         final RedBlackTree<T> right;
         final Empty<T> empty;
@@ -821,6 +824,7 @@ final class Empty<T> implements RedBlackTree<T>, Serializable {
 
         private static final long serialVersionUID = 1L;
 
+        @SuppressWarnings("serial") // Conditionally serializable
         final Comparator<T> comparator;
 
         // This is no public API! The RedBlackTree takes care of passing the correct Comparator.

diff --git a/vavr/src/main/java/io/vavr/collection/Tree.java b/vavr/src/main/java/io/vavr/collection/Tree.java
@@ -866,6 +866,7 @@ final class Node<T> implements Tree<T>, Serializable {
 
         private static final long serialVersionUID = 1L;
 
+        @SuppressWarnings("serial") // Conditionally serializable
         private final T value;
         private final io.vavr.collection.List<Node<T>> children;
 

diff --git a/vavr/src/main/java/io/vavr/collection/TreeMap.java b/vavr/src/main/java/io/vavr/collection/TreeMap.java
@@ -1562,6 +1562,7 @@ final class Specific<K, V> implements EntryComparator<K, V> {
 
             private static final long serialVersionUID = 1L;
 
+            @SuppressWarnings("serial") // Conditionally serializable
             private final Comparator<K> keyComparator;
 
             @SuppressWarnings("unchecked")

diff --git a/vavr/src/test/java/io/vavr/collection/BitSetTest.java b/vavr/src/test/java/io/vavr/collection/BitSetTest.java
@@ -572,7 +572,9 @@ private static final class Mapper<T> implements Serializable {
 
         private static final long serialVersionUID = 1L;
 
+        @SuppressWarnings("serial") // Conditionally serializable
         private final java.util.Map<Integer, T> fromIntMap = new java.util.HashMap<>();
+        @SuppressWarnings("serial") // Conditionally serializable
         private final java.util.Map<T, Integer> toIntMap = new java.util.HashMap<>();
         private int nextValue = 0;
-Original file line number
+Diff line change
@@ Expand Up / @@ -5654,4 +5654,4 @@ public boolean isDefinedAt(T obj) { @@
                 }
             }
         }
-    }
+    }