From 3ab940b72bdd13b2eea83c5480b96893bba2b285 Mon Sep 17 00:00:00 2001 From: Al Arafat Tanin | arafattanin Date: Wed, 3 Jan 2024 15:24:01 +0600 Subject: [PATCH 1/3] fix: add missing serial_version_uid to serializable classes --- .../main/java/com/google/cloud/storage/GrpcStorageOptions.java | 1 + .../main/java/com/google/cloud/storage/HttpStorageOptions.java | 2 +- .../src/main/java/com/google/cloud/storage/Notification.java | 1 + .../src/main/java/com/google/cloud/storage/StorageOptions.java | 3 +++ .../src/main/java/com/google/cloud/storage/UnifiedOpts.java | 3 +++ 5 files changed, 9 insertions(+), 1 deletion(-) 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 index dcadfb401e..841343d311 100644 --- 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 index 9d4873e2b4..cce8ff63c0 100644 --- 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 @@ -346,7 +346,7 @@ public ServiceRpc create(StorageOptions options) { * we do need use it in a couple places, for those we create this adapter. */ private final class RetryDependenciesAdapter implements RetryingDependencies, Serializable { - + private static long serialVersionUID = -7446566394108158974L; 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 index f3e2bb81a6..f3e0738d5c 100644 --- 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 index 74a6ffb3df..5167971277 100644 --- 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 Date: Wed, 13 Mar 2024 12:40:59 -0400 Subject: [PATCH 2/3] chore: make HttpStorageOptions.RetryDependenciesAdapter transient --- .../com/google/cloud/storage/HttpStorageOptions.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) 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 index cce8ff63c0..fd2a573119 100644 --- 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 static long serialVersionUID = -7446566394108158974L; + private final class RetryDependenciesAdapter implements RetryingDependencies { private RetryDependenciesAdapter() {} @Override From 2727339731e0ab938cbc5bd6de6052debaaea89f Mon Sep 17 00:00:00 2001 From: BenWhitehead Date: Wed, 13 Mar 2024 12:55:59 -0400 Subject: [PATCH 3/3] chore: fmt --- .../src/main/java/com/google/cloud/storage/StorageOptions.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 5167971277..53ad6142e9 100644 --- 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 @@ -64,7 +64,7 @@ public abstract class StorageOptions extends ServiceOptions