Skip to content

Commit 736865b

Browse files
fix: missing serialVersionUID of serializable classes (#2344)
* fix: add missing serial_version_uid to serializable classes * chore: make HttpStorageOptions.RetryDependenciesAdapter transient * chore: fmt --------- Co-authored-by: BenWhitehead <[email protected]>
1 parent d99b978 commit 736865b

File tree

5 files changed

+17
-3
lines changed

5 files changed

+17
-3
lines changed

google-cloud-storage/src/main/java/com/google/cloud/storage/GrpcStorageOptions.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -767,6 +767,7 @@ protected StorageSettings.Builder setInternalHeaderProvider(
767767

768768
private static final class NoopGrpcInterceptorProvider
769769
implements GrpcInterceptorProvider, Serializable {
770+
private static long serialVersionUID = -8523033236999805349L;
770771
private static final NoopGrpcInterceptorProvider INSTANCE = new NoopGrpcInterceptorProvider();
771772

772773
@Override

google-cloud-storage/src/main/java/com/google/cloud/storage/HttpStorageOptions.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636
import com.google.cloud.storage.spi.v1.StorageRpc;
3737
import com.google.common.base.MoreObjects;
3838
import com.google.common.collect.ImmutableSet;
39+
import java.io.IOException;
40+
import java.io.ObjectInputStream;
3941
import java.io.Serializable;
4042
import java.util.Set;
4143

@@ -52,7 +54,7 @@ public class HttpStorageOptions extends StorageOptions {
5254
private static final String DEFAULT_HOST = "https://storage.googleapis.com";
5355

5456
private final HttpRetryAlgorithmManager retryAlgorithmManager;
55-
private final RetryDependenciesAdapter retryDepsAdapter;
57+
private transient RetryDependenciesAdapter retryDepsAdapter;
5658

5759
private HttpStorageOptions(Builder builder, StorageDefaults serviceDefaults) {
5860
super(builder, serviceDefaults);
@@ -93,6 +95,11 @@ public boolean equals(Object obj) {
9395
return obj instanceof HttpStorageOptions && baseEquals((HttpStorageOptions) obj);
9496
}
9597

98+
private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
99+
in.defaultReadObject();
100+
this.retryDepsAdapter = new RetryDependenciesAdapter();
101+
}
102+
96103
public static HttpStorageOptions.Builder newBuilder() {
97104
return new HttpStorageOptions.Builder().setHost(DEFAULT_HOST);
98105
}
@@ -345,8 +352,7 @@ public ServiceRpc create(StorageOptions options) {
345352
* We don't yet want to make HttpStorageOptions itself implement {@link RetryingDependencies} but
346353
* we do need use it in a couple places, for those we create this adapter.
347354
*/
348-
private final class RetryDependenciesAdapter implements RetryingDependencies, Serializable {
349-
355+
private final class RetryDependenciesAdapter implements RetryingDependencies {
350356
private RetryDependenciesAdapter() {}
351357

352358
@Override

google-cloud-storage/src/main/java/com/google/cloud/storage/Notification.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
* details.
2727
*/
2828
public class Notification extends NotificationInfo {
29+
private static final long serialVersionUID = 3150928330690874200L;
2930

3031
private final StorageOptions options;
3132
private transient Storage storage;

google-cloud-storage/src/main/java/com/google/cloud/storage/StorageOptions.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ public abstract class StorageOptions extends ServiceOptions<Storage, StorageOpti
6363
/** @deprecated Use {@link HttpStorageFactory} */
6464
@Deprecated
6565
public static class DefaultStorageFactory extends HttpStorageFactory {
66+
private static final long serialVersionUID = -7856840922014956661L;
67+
6668
/** @deprecated Use {@link HttpStorageDefaults#getDefaultServiceFactory()} */
6769
@Deprecated
6870
public DefaultStorageFactory() {
@@ -73,6 +75,7 @@ public DefaultStorageFactory() {
7375
/** @deprecated Use {@link HttpStorageRpcFactory} */
7476
@Deprecated
7577
public static class DefaultStorageRpcFactory extends HttpStorageRpcFactory {
78+
private static final long serialVersionUID = -7856840922014956661L;
7679

7780
/** @deprecated Use {@link HttpStorageDefaults#getDefaultRpcFactory()} */
7881
@Deprecated

google-cloud-storage/src/main/java/com/google/cloud/storage/UnifiedOpts.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2540,6 +2540,7 @@ private static CommonObjectRequestParams.Builder customerSuppliedKey(
25402540
}
25412541

25422542
private static final class PrefixedNamedField implements NamedField {
2543+
private static long serialVersionUID = -4899304145424680141L;
25432544

25442545
private final String prefix;
25452546
private final NamedField delegate;
@@ -2586,6 +2587,7 @@ public String toString() {
25862587
}
25872588

25882589
private static final class LiteralNamedField implements NamedField {
2590+
private static long serialVersionUID = 1422947423774466409L;
25892591

25902592
private final String name;
25912593

@@ -2627,6 +2629,7 @@ public String toString() {
26272629
}
26282630

26292631
private static final class NestedNamedField implements NamedField {
2632+
private static long serialVersionUID = -7623005572810688221L;
26302633
private final NamedField parent;
26312634
private final NamedField child;
26322635

0 commit comments

Comments
 (0)