fix: missing serialVersionUID of serializable classes (#2344)

rng70-or · BenWhitehead · web-flow · commit 736865b4b97a · 2024-03-13T14:06:17.000-04:00
* fix: add missing serial_version_uid to serializable classes

* chore: make HttpStorageOptions.RetryDependenciesAdapter transient

* chore: fmt

---------

Co-authored-by: BenWhitehead &lt;BenWhitehead@users.noreply.github.com&gt;
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/GrpcStorageOptions.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/GrpcStorageOptions.java
@@ -767,6 +767,7 @@ protected StorageSettings.Builder setInternalHeaderProvider(
 
   private static final class NoopGrpcInterceptorProvider
       implements GrpcInterceptorProvider, Serializable {
+    private static long serialVersionUID = -8523033236999805349L;
     private static final NoopGrpcInterceptorProvider INSTANCE = new NoopGrpcInterceptorProvider();
 
     @Override
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/HttpStorageOptions.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/HttpStorageOptions.java
@@ -36,6 +36,8 @@
 import com.google.cloud.storage.spi.v1.StorageRpc;
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableSet;
+import java.io.IOException;
+import java.io.ObjectInputStream;
 import java.io.Serializable;
 import java.util.Set;
 
@@ -52,7 +54,7 @@ public class HttpStorageOptions extends StorageOptions {
   private static final String DEFAULT_HOST = "https://storage.googleapis.com";
 
   private final HttpRetryAlgorithmManager retryAlgorithmManager;
-  private final RetryDependenciesAdapter retryDepsAdapter;
+  private transient RetryDependenciesAdapter retryDepsAdapter;
 
   private HttpStorageOptions(Builder builder, StorageDefaults serviceDefaults) {
     super(builder, serviceDefaults);
@@ -93,6 +95,11 @@ public boolean equals(Object obj) {
     return obj instanceof HttpStorageOptions && baseEquals((HttpStorageOptions) obj);
   }
 
+  private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
+    in.defaultReadObject();
+    this.retryDepsAdapter = new RetryDependenciesAdapter();
+  }
+
   public static HttpStorageOptions.Builder newBuilder() {
     return new HttpStorageOptions.Builder().setHost(DEFAULT_HOST);
   }
@@ -345,8 +352,7 @@ public ServiceRpc create(StorageOptions options) {
    * We don't yet want to make HttpStorageOptions itself implement {@link RetryingDependencies} but
    * we do need use it in a couple places, for those we create this adapter.
    */
-  private final class RetryDependenciesAdapter implements RetryingDependencies, Serializable {
-
+  private final class RetryDependenciesAdapter implements RetryingDependencies {
     private RetryDependenciesAdapter() {}
 
     @Override
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/Notification.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/Notification.java
@@ -26,6 +26,7 @@
  * details.
  */
 public class Notification extends NotificationInfo {
+  private static final long serialVersionUID = 3150928330690874200L;
 
   private final StorageOptions options;
   private transient Storage storage;
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageOptions.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageOptions.java
@@ -63,6 +63,8 @@ public abstract class StorageOptions extends ServiceOptions<Storage, StorageOpti
   /** @deprecated Use {@link HttpStorageFactory} */
   @Deprecated
   public static class DefaultStorageFactory extends HttpStorageFactory {
+    private static final long serialVersionUID = -7856840922014956661L;
+
     /** @deprecated Use {@link HttpStorageDefaults#getDefaultServiceFactory()} */
     @Deprecated
     public DefaultStorageFactory() {
@@ -73,6 +75,7 @@ public DefaultStorageFactory() {
   /** @deprecated Use {@link HttpStorageRpcFactory} */
   @Deprecated
   public static class DefaultStorageRpcFactory extends HttpStorageRpcFactory {
+    private static final long serialVersionUID = -7856840922014956661L;
 
     /** @deprecated Use {@link HttpStorageDefaults#getDefaultRpcFactory()} */
     @Deprecated
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/UnifiedOpts.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/UnifiedOpts.java
@@ -2540,6 +2540,7 @@ private static CommonObjectRequestParams.Builder customerSuppliedKey(
   }
 
   private static final class PrefixedNamedField implements NamedField {
+    private static long serialVersionUID = -4899304145424680141L;
 
     private final String prefix;
     private final NamedField delegate;
@@ -2586,6 +2587,7 @@ public String toString() {
   }
 
   private static final class LiteralNamedField implements NamedField {
+    private static long serialVersionUID = 1422947423774466409L;
 
     private final String name;
 
@@ -2627,6 +2629,7 @@ public String toString() {
   }
 
   private static final class NestedNamedField implements NamedField {
+    private static long serialVersionUID = -7623005572810688221L;
     private final NamedField parent;
     private final NamedField child;
 

Original file line number	Diff line number	Diff line change
`@@ -2540,6 +2540,7 @@ private static CommonObjectRequestParams.Builder customerSuppliedKey(`
`2540`	`2540`	`}`
`2541`	`2541`
`2542`	`2542`	`private static final class PrefixedNamedField implements NamedField {`
	`2543`	`+ private static long serialVersionUID = -4899304145424680141L;`
`2543`	`2544`
`2544`	`2545`	`private final String prefix;`
`2545`	`2546`	`private final NamedField delegate;`
`@@ -2586,6 +2587,7 @@ public String toString() {`
`2586`	`2587`	`}`
`2587`	`2588`
`2588`	`2589`	`private static final class LiteralNamedField implements NamedField {`
	`2590`	`+ private static long serialVersionUID = 1422947423774466409L;`
`2589`	`2591`
`2590`	`2592`	`private final String name;`
`2591`	`2593`
`@@ -2627,6 +2629,7 @@ public String toString() {`
`2627`	`2629`	`}`
`2628`	`2630`
`2629`	`2631`	`private static final class NestedNamedField implements NamedField {`
	`2632`	`+ private static long serialVersionUID = -7623005572810688221L;`
`2630`	`2633`	`private final NamedField parent;`
`2631`	`2634`	`private final NamedField child;`
`2632`	`2635`