Skip to content

Commit bda8df6

Browse files
author
Dhriti Chopra
committed
fix: using MoreObjects helper
1 parent e14725e commit bda8df6

File tree

3 files changed

+31
-56
lines changed

3 files changed

+31
-56
lines changed

google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/ListMultipartUploadsRequest.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package com.google.cloud.storage.multipartupload.model;
1818

1919
import com.google.api.core.BetaApi;
20+
import com.google.common.base.MoreObjects;
2021
import java.util.Objects;
2122

2223
/**
@@ -159,16 +160,15 @@ public int hashCode() {
159160

160161
@Override
161162
public String toString() {
162-
StringBuilder sb = new StringBuilder("ListMultipartUploadsRequest{");
163-
sb.append("bucket='").append(bucket).append("'");
164-
sb.append(", delimiter='").append(delimiter).append("'");
165-
sb.append(", encodingType='").append(encodingType).append(",");
166-
sb.append(", keyMarker='").append(keyMarker).append(",");
167-
sb.append(", maxUploads=").append(maxUploads);
168-
sb.append(", prefix='").append(prefix).append(",");
169-
sb.append(", uploadIdMarker='").append(uploadIdMarker).append(",");
170-
sb.append('}');
171-
return sb.toString();
163+
return MoreObjects.toStringHelper(this)
164+
.add("bucket", bucket)
165+
.add("delimiter", delimiter)
166+
.add("encodingType", encodingType)
167+
.add("keyMarker", keyMarker)
168+
.add("maxUploads", maxUploads)
169+
.add("prefix", prefix)
170+
.add("uploadIdMarker", uploadIdMarker)
171+
.toString();
172172
}
173173

174174
/**

google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/ListMultipartUploadsResponse.java

Lines changed: 15 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
2121
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
2222
import com.google.api.core.BetaApi;
23+
import com.google.common.base.MoreObjects;
2324
import com.google.common.collect.ImmutableList;
2425
import java.util.ArrayList;
2526
import java.util.List;
@@ -288,40 +289,20 @@ public int hashCode() {
288289

289290
@Override
290291
public String toString() {
291-
return "ListMultipartUploadsResponse{"
292-
+ "uploads="
293-
+ getUploads()
294-
+ ", bucket='"
295-
+ bucket
296-
+ "'"
297-
+ ", delimiter='"
298-
+ delimiter
299-
+ "'"
300-
+ ", encodingType='"
301-
+ encodingType
302-
+ "'"
303-
+ ", keyMarker='"
304-
+ keyMarker
305-
+ "'"
306-
+ ", uploadIdMarker='"
307-
+ uploadIdMarker
308-
+ "'"
309-
+ ", nextKeyMarker='"
310-
+ nextKeyMarker
311-
+ "'"
312-
+ ", nextUploadIdMarker='"
313-
+ nextUploadIdMarker
314-
+ "'"
315-
+ ", maxUploads="
316-
+ maxUploads
317-
+ ", prefix='"
318-
+ prefix
319-
+ "'"
320-
+ ", isTruncated="
321-
+ isTruncated
322-
+ ", commonPrefixes="
323-
+ getCommonPrefixes()
324-
+ '}';
292+
return MoreObjects.toStringHelper(this)
293+
.add("uploads", getUploads())
294+
.add("bucket", bucket)
295+
.add("delimiter", delimiter)
296+
.add("encodingType", encodingType)
297+
.add("keyMarker", keyMarker)
298+
.add("uploadIdMarker", uploadIdMarker)
299+
.add("nextKeyMarker", nextKeyMarker)
300+
.add("nextUploadIdMarker", nextUploadIdMarker)
301+
.add("maxUploads", maxUploads)
302+
.add("prefix", prefix)
303+
.add("isTruncated", isTruncated)
304+
.add("commonPrefixes", getCommonPrefixes())
305+
.toString();
325306
}
326307

327308
/**

google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/MultipartUpload.java

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
2020
import com.google.api.core.BetaApi;
2121
import com.google.cloud.storage.StorageClass;
22+
import com.google.common.base.MoreObjects;
2223
import java.time.OffsetDateTime;
2324
import java.util.Objects;
2425

@@ -118,18 +119,11 @@ public int hashCode() {
118119

119120
@Override
120121
public String toString() {
121-
return new StringBuilder("MultipartUpload{")
122-
.append("key='")
123-
.append(key)
124-
.append('\'')
125-
.append(", uploadId='")
126-
.append(uploadId)
127-
.append('\'')
128-
.append(", storageClass=")
129-
.append(storageClass)
130-
.append(", initiated=")
131-
.append(initiated)
132-
.append('}')
122+
return MoreObjects.toStringHelper(this)
123+
.add("key", key)
124+
.add("uploadId", uploadId)
125+
.add("storageClass", storageClass)
126+
.add("initiated", initiated)
133127
.toString();
134128
}
135129

0 commit comments

Comments
 (0)