Fix Java Serialization warnings for Tuple

vavr-io · Sep 30, 2024 · 86b40d8 · 86b40d8
1 parent c5fff07
commit 86b40d8
Show file tree

Hide file tree

Showing 9 changed files with 207 additions and 37 deletions.
diff --git a/generator/Generator.sc b/generator/Generator.sc
@@ -1963,7 +1963,7 @@ def generateMainClasses(): Unit = {
               /$javadoc
                * The ${j.ordinal} element of this tuple.
                */
-              public final T$j _$j;
+              transient public T$j _$j;
             """)("\n\n")}
 
             ${if (i == 0) xs"""
@@ -2238,6 +2238,24 @@ def generateMainClasses(): Unit = {
                 return ${if (i == 0) "1" else if (i == 1) "Objects.hashCode(_1)" else if (i == 2) "Objects.hashCode(_1) ^ Objects.hashCode(_2)" else s"""Objects.hash(${(1 to i).gen(j => s"_$j")(", ")})"""};
             }
 
+            ${(i > 0).gen(xs"""
+            private void writeObject(java.io.ObjectOutputStream s) throws java.io.IOException {
+                s.defaultWriteObject();
+                ${(1 to i).gen(j => xs"""
+                  s.writeObject(_$j);
+                   """)("\n")}
+            }
+
+            @SuppressWarnings("unchecked")
+            private void readObject(java.io.ObjectInputStream s)
+                        throws java.io.IOException, ClassNotFoundException {
+                s.defaultReadObject();
+                ${(1 to i).gen(j => xs"""
+                  _$j = (T$j) s.readObject();
+                   """)("\n")}
+            }
+            """)}
+
             @Override
             public String toString() {
                 return ${if (i == 0) "\"()\"" else s""""(" + ${(1 to i).gen(j => s"_$j")(" + \", \" + ")} + ")""""};

diff --git a/src-gen/main/java/io/vavr/Tuple1.java b/src-gen/main/java/io/vavr/Tuple1.java
@@ -49,7 +49,7 @@ public final class Tuple1<T1> implements Tuple, Serializable {
     /**
      * The 1st element of this tuple.
      */
-    public final T1 _1;
+    transient public T1 _1;
 
     /**
      * Constructs a tuple of one element.
@@ -303,6 +303,18 @@ public int hashCode() {
         return Objects.hashCode(_1);
     }
 
+    private void writeObject(java.io.ObjectOutputStream s) throws java.io.IOException {
+        s.defaultWriteObject();
+        s.writeObject(_1);
+    }
+
+    @SuppressWarnings("unchecked")
+    private void readObject(java.io.ObjectInputStream s)
+                throws java.io.IOException, ClassNotFoundException {
+        s.defaultReadObject();
+        _1 = (T1) s.readObject();
+    }
+
     @Override
     public String toString() {
         return "(" + _1 + ")";

diff --git a/src-gen/main/java/io/vavr/Tuple2.java b/src-gen/main/java/io/vavr/Tuple2.java
@@ -53,12 +53,12 @@ public final class Tuple2<T1, T2> implements Tuple, Serializable {
     /**
      * The 1st element of this tuple.
      */
-    public final T1 _1;
+    transient public T1 _1;
 
     /**
      * The 2nd element of this tuple.
      */
-    public final T2 _2;
+    transient public T2 _2;
 
     /**
      * Constructs a tuple of two elements.
@@ -397,6 +397,20 @@ public int hashCode() {
         return Objects.hashCode(_1) ^ Objects.hashCode(_2);
     }
 
+    private void writeObject(java.io.ObjectOutputStream s) throws java.io.IOException {
+        s.defaultWriteObject();
+        s.writeObject(_1);
+        s.writeObject(_2);
+    }
+
+    @SuppressWarnings("unchecked")
+    private void readObject(java.io.ObjectInputStream s)
+                throws java.io.IOException, ClassNotFoundException {
+        s.defaultReadObject();
+        _1 = (T1) s.readObject();
+        _2 = (T2) s.readObject();
+    }
+
     @Override
     public String toString() {
         return "(" + _1 + ", " + _2 + ")";

diff --git a/src-gen/main/java/io/vavr/Tuple3.java b/src-gen/main/java/io/vavr/Tuple3.java
@@ -51,17 +51,17 @@ public final class Tuple3<T1, T2, T3> implements Tuple, Serializable {
     /**
      * The 1st element of this tuple.
      */
-    public final T1 _1;
+    transient public T1 _1;
 
     /**
      * The 2nd element of this tuple.
      */
-    public final T2 _2;
+    transient public T2 _2;
 
     /**
      * The 3rd element of this tuple.
      */
-    public final T3 _3;
+    transient public T3 _3;
 
     /**
      * Constructs a tuple of three elements.
@@ -420,6 +420,22 @@ public int hashCode() {
         return Objects.hash(_1, _2, _3);
     }
 
+    private void writeObject(java.io.ObjectOutputStream s) throws java.io.IOException {
+        s.defaultWriteObject();
+        s.writeObject(_1);
+        s.writeObject(_2);
+        s.writeObject(_3);
+    }
+
+    @SuppressWarnings("unchecked")
+    private void readObject(java.io.ObjectInputStream s)
+                throws java.io.IOException, ClassNotFoundException {
+        s.defaultReadObject();
+        _1 = (T1) s.readObject();
+        _2 = (T2) s.readObject();
+        _3 = (T3) s.readObject();
+    }
+
     @Override
     public String toString() {
         return "(" + _1 + ", " + _2 + ", " + _3 + ")";

diff --git a/src-gen/main/java/io/vavr/Tuple4.java b/src-gen/main/java/io/vavr/Tuple4.java
@@ -52,22 +52,22 @@ public final class Tuple4<T1, T2, T3, T4> implements Tuple, Serializable {
     /**
      * The 1st element of this tuple.
      */
-    public final T1 _1;
+    transient public T1 _1;
 
     /**
      * The 2nd element of this tuple.
      */
-    public final T2 _2;
+    transient public T2 _2;
 
     /**
      * The 3rd element of this tuple.
      */
-    public final T3 _3;
+    transient public T3 _3;
 
     /**
      * The 4th element of this tuple.
      */
-    public final T4 _4;
+    transient public T4 _4;
 
     /**
      * Constructs a tuple of 4 elements.
@@ -467,6 +467,24 @@ public int hashCode() {
         return Objects.hash(_1, _2, _3, _4);
     }
 
+    private void writeObject(java.io.ObjectOutputStream s) throws java.io.IOException {
+        s.defaultWriteObject();
+        s.writeObject(_1);
+        s.writeObject(_2);
+        s.writeObject(_3);
+        s.writeObject(_4);
+    }
+
+    @SuppressWarnings("unchecked")
+    private void readObject(java.io.ObjectInputStream s)
+                throws java.io.IOException, ClassNotFoundException {
+        s.defaultReadObject();
+        _1 = (T1) s.readObject();
+        _2 = (T2) s.readObject();
+        _3 = (T3) s.readObject();
+        _4 = (T4) s.readObject();
+    }
+
     @Override
     public String toString() {
         return "(" + _1 + ", " + _2 + ", " + _3 + ", " + _4 + ")";

diff --git a/src-gen/main/java/io/vavr/Tuple5.java b/src-gen/main/java/io/vavr/Tuple5.java
@@ -53,27 +53,27 @@ public final class Tuple5<T1, T2, T3, T4, T5> implements Tuple, Serializable {
     /**
      * The 1st element of this tuple.
      */
-    public final T1 _1;
+    transient public T1 _1;
 
     /**
      * The 2nd element of this tuple.
      */
-    public final T2 _2;
+    transient public T2 _2;
 
     /**
      * The 3rd element of this tuple.
      */
-    public final T3 _3;
+    transient public T3 _3;
 
     /**
      * The 4th element of this tuple.
      */
-    public final T4 _4;
+    transient public T4 _4;
 
     /**
      * The 5th element of this tuple.
      */
-    public final T5 _5;
+    transient public T5 _5;
 
     /**
      * Constructs a tuple of 5 elements.
@@ -515,6 +515,26 @@ public int hashCode() {
         return Objects.hash(_1, _2, _3, _4, _5);
     }
 
+    private void writeObject(java.io.ObjectOutputStream s) throws java.io.IOException {
+        s.defaultWriteObject();
+        s.writeObject(_1);
+        s.writeObject(_2);
+        s.writeObject(_3);
+        s.writeObject(_4);
+        s.writeObject(_5);
+    }
+
+    @SuppressWarnings("unchecked")
+    private void readObject(java.io.ObjectInputStream s)
+                throws java.io.IOException, ClassNotFoundException {
+        s.defaultReadObject();
+        _1 = (T1) s.readObject();
+        _2 = (T2) s.readObject();
+        _3 = (T3) s.readObject();
+        _4 = (T4) s.readObject();
+        _5 = (T5) s.readObject();
+    }
+
     @Override
     public String toString() {
         return "(" + _1 + ", " + _2 + ", " + _3 + ", " + _4 + ", " + _5 + ")";

diff --git a/src-gen/main/java/io/vavr/Tuple6.java b/src-gen/main/java/io/vavr/Tuple6.java
@@ -54,32 +54,32 @@ public final class Tuple6<T1, T2, T3, T4, T5, T6> implements Tuple, Serializable
     /**
      * The 1st element of this tuple.
      */
-    public final T1 _1;
+    transient public T1 _1;
 
     /**
      * The 2nd element of this tuple.
      */
-    public final T2 _2;
+    transient public T2 _2;
 
     /**
      * The 3rd element of this tuple.
      */
-    public final T3 _3;
+    transient public T3 _3;
 
     /**
      * The 4th element of this tuple.
      */
-    public final T4 _4;
+    transient public T4 _4;
 
     /**
      * The 5th element of this tuple.
      */
-    public final T5 _5;
+    transient public T5 _5;
 
     /**
      * The 6th element of this tuple.
      */
-    public final T6 _6;
+    transient public T6 _6;
 
     /**
      * Constructs a tuple of 6 elements.
@@ -564,6 +564,28 @@ public int hashCode() {
         return Objects.hash(_1, _2, _3, _4, _5, _6);
     }
 
+    private void writeObject(java.io.ObjectOutputStream s) throws java.io.IOException {
+        s.defaultWriteObject();
+        s.writeObject(_1);
+        s.writeObject(_2);
+        s.writeObject(_3);
+        s.writeObject(_4);
+        s.writeObject(_5);
+        s.writeObject(_6);
+    }
+
+    @SuppressWarnings("unchecked")
+    private void readObject(java.io.ObjectInputStream s)
+                throws java.io.IOException, ClassNotFoundException {
+        s.defaultReadObject();
+        _1 = (T1) s.readObject();
+        _2 = (T2) s.readObject();
+        _3 = (T3) s.readObject();
+        _4 = (T4) s.readObject();
+        _5 = (T5) s.readObject();
+        _6 = (T6) s.readObject();
+    }
+
     @Override
     public String toString() {
         return "(" + _1 + ", " + _2 + ", " + _3 + ", " + _4 + ", " + _5 + ", " + _6 + ")";

diff --git a/src-gen/main/java/io/vavr/Tuple7.java b/src-gen/main/java/io/vavr/Tuple7.java
@@ -55,37 +55,37 @@ public final class Tuple7<T1, T2, T3, T4, T5, T6, T7> implements Tuple, Serializ
     /**
      * The 1st element of this tuple.
      */
-    public final T1 _1;
+    transient public T1 _1;
 
     /**
      * The 2nd element of this tuple.
      */
-    public final T2 _2;
+    transient public T2 _2;
 
     /**
      * The 3rd element of this tuple.
      */
-    public final T3 _3;
+    transient public T3 _3;
 
     /**
      * The 4th element of this tuple.
      */
-    public final T4 _4;
+    transient public T4 _4;
 
     /**
      * The 5th element of this tuple.
      */
-    public final T5 _5;
+    transient public T5 _5;
 
     /**
      * The 6th element of this tuple.
      */
-    public final T6 _6;
+    transient public T6 _6;
 
     /**
      * The 7th element of this tuple.
      */
-    public final T7 _7;
+    transient public T7 _7;
 
     /**
      * Constructs a tuple of 7 elements.
@@ -614,6 +614,30 @@ public int hashCode() {
         return Objects.hash(_1, _2, _3, _4, _5, _6, _7);
     }
 
+    private void writeObject(java.io.ObjectOutputStream s) throws java.io.IOException {
+        s.defaultWriteObject();
+        s.writeObject(_1);
+        s.writeObject(_2);
+        s.writeObject(_3);
+        s.writeObject(_4);
+        s.writeObject(_5);
+        s.writeObject(_6);
+        s.writeObject(_7);
+    }
+
+    @SuppressWarnings("unchecked")
+    private void readObject(java.io.ObjectInputStream s)
+                throws java.io.IOException, ClassNotFoundException {
+        s.defaultReadObject();
+        _1 = (T1) s.readObject();
+        _2 = (T2) s.readObject();
+        _3 = (T3) s.readObject();
+        _4 = (T4) s.readObject();
+        _5 = (T5) s.readObject();
+        _6 = (T6) s.readObject();
+        _7 = (T7) s.readObject();
+    }
+
     @Override
     public String toString() {
         return "(" + _1 + ", " + _2 + ", " + _3 + ", " + _4 + ", " + _5 + ", " + _6 + ", " + _7 + ")";