Skip to content

fix(storage): use JsonUtils for StorageObject serialization in resumable writes and read channels #13976

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
lqiu96 wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix(storage): use JsonUtils for StorageObject serialization in resumable writes and read channels #13976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions ...d-storage/src/main/java/com/google/cloud/storage/ApiaryUnbufferedReadableByteChannel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,11 @@
import com.google.common.hash.HashingInputStream;
import com.google.common.io.BaseEncoding;
import com.google.common.primitives.Ints;
import com.google.gson.Gson;
import com.google.gson.stream.JsonReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.io.StringReader;
import java.math.BigInteger;
import java.nio.ByteBuffer;
import java.nio.channels.Channels;
Expand Down Expand Up @@ -381,7 +378,6 @@ private static String getHeaderValue(@NonNull HttpHeaders headers, @NonNull Stri
@Immutable
static final class ApiaryReadRequest implements Serializable {
private static final long serialVersionUID = -4059435314115374448L;
private static final Gson gson = new Gson();
@NonNull private transient StorageObject object;
@NonNull private final Map<StorageRpc.Option, ?> options;
@NonNull private final ByteRangeSpec byteRangeSpec;
Expand Down Expand Up @@ -450,7 +446,7 @@ private String getObjectJson() {
if (objectJson == null) {
synchronized (this) {
if (objectJson == null) {
objectJson = gson.toJson(object);
objectJson = JsonUtils.objectToJson(object);
}
}
}
Expand All @@ -464,8 +460,7 @@ private void writeObject(ObjectOutputStream out) throws IOException {

private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
in.defaultReadObject();
JsonReader jsonReader = gson.newJsonReader(new StringReader(this.objectJson));
this.object = gson.fromJson(jsonReader, StorageObject.class);
this.object = JsonUtils.jsonToObject(this.objectJson, StorageObject.class);
}
}
}
10 changes: 2 additions & 8 deletions ...orage/google-cloud-storage/src/main/java/com/google/cloud/storage/JsonResumableWrite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,10 @@
import com.google.cloud.storage.spi.v1.StorageRpc;
import com.google.common.base.MoreObjects;
import com.google.common.collect.ImmutableMap;
import com.google.gson.Gson;
import com.google.gson.stream.JsonReader;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.io.StringReader;
import java.util.Map;
import java.util.Objects;
import org.checkerframework.checker.lock.qual.GuardedBy;
Expand All @@ -37,8 +34,6 @@

final class JsonResumableWrite implements Serializable {
private static final long serialVersionUID = 7934407897802252292L;
private static final Gson gson = new Gson();

@MonotonicNonNull private transient StorageObject object;
@MonotonicNonNull private transient Hasher hasher;
@MonotonicNonNull private transient Crc32cValue<?> cumulativeCrc32c;
Expand Down Expand Up @@ -152,7 +147,7 @@ private String getObjectJson() {
if (objectJson == null) {
synchronized (this) {
if (objectJson == null) {
objectJson = gson.toJson(object);
objectJson = JsonUtils.objectToJson(object);
base64CumulativeCrc32c = Utils.crc32cCodec.encode(cumulativeCrc32c.getValue());
}
}
Expand All @@ -167,8 +162,7 @@ private void writeObject(ObjectOutputStream out) throws IOException {

private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
in.defaultReadObject();
JsonReader jsonReader = gson.newJsonReader(new StringReader(this.objectJson));
this.object = gson.fromJson(jsonReader, StorageObject.class);
this.object = JsonUtils.jsonToObject(this.objectJson, StorageObject.class);
if (base64CumulativeCrc32c != null) {
Integer decode = Utils.crc32cCodec.decode(base64CumulativeCrc32c);
if (decode == 0) {
Expand Down
22 changes: 22 additions & 0 deletions java-storage/google-cloud-storage/src/main/java/com/google/cloud/storage/JsonUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,28 @@ final class JsonUtils {

private JsonUtils() {}

static <T> String objectToJson(T object) {
if (object == null) {
return null;
}
try {
return jop.getJsonFactory().toString(object);
} catch (IOException e) {
throw StorageException.coalesce(e);
}
}

static <T> T jsonToObject(String json, Class<T> clazz) {
if (json == null) {
return null;
}
try {
return jop.parseAndClose(new StringReader(json), clazz);
} catch (IOException e) {
throw StorageException.coalesce(e);
}
}

/**
* Given a GenericJson src, and a list of {@code fieldsForOutput} create a new GenericJson where
* every field specified in {@code fieldsForOutput} is present. If a field exists in {@code src}
Expand Down
Loading