Skip to content

Commit 0a8bbea

Browse files
ShreyasSinhaShreyasSinha
committed
feat: modifying getters and setters to be more inline with s3 interface.
1 parent 3a95990 commit 0a8bbea

File tree

8 files changed

+231
-85
lines changed

8 files changed

+231
-85
lines changed

‎google-cloud-storage/clirr-ignored-differences.xml‎

Lines changed: 146 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,5 +197,151 @@
197197
<method>void flush()</method>
198198
</difference>
199199

200+
<!-- CreateMultipartUploadRequest -->
201+
<difference>
202+
<differenceType>7002</differenceType>
203+
<className>com/google/cloud/storage/multipartupload/model/CreateMultipartUploadRequest</className>
204+
<method>com.google.cloud.storage.Storage$PredefinedAcl getCannedAcl()</method>
205+
</difference>
206+
<difference>
207+
<differenceType>7002</differenceType>
208+
<className>com/google/cloud/storage/multipartupload/model/CreateMultipartUploadRequest</className>
209+
<method>java.lang.String getContentType()</method>
210+
</difference>
211+
<difference>
212+
<differenceType>7002</differenceType>
213+
<className>com/google/cloud/storage/multipartupload/model/CreateMultipartUploadRequest</className>
214+
<method>java.time.OffsetDateTime getCustomTime()</method>
215+
</difference>
216+
<difference>
217+
<differenceType>7002</differenceType>
218+
<className>com/google/cloud/storage/multipartupload/model/CreateMultipartUploadRequest</className>
219+
<method>java.lang.String getKmsKeyName()</method>
220+
</difference>
221+
<difference>
222+
<differenceType>7002</differenceType>
223+
<className>com/google/cloud/storage/multipartupload/model/CreateMultipartUploadRequest</className>
224+
<method>java.util.Map getMetadata()</method>
225+
</difference>
226+
<difference>
227+
<differenceType>7002</differenceType>
228+
<className>com/google/cloud/storage/multipartupload/model/CreateMultipartUploadRequest</className>
229+
<method>com.google.cloud.storage.multipartupload.model.ObjectLockMode getObjectLockMode()</method>
230+
</difference>
231+
<difference>
232+
<differenceType>7002</differenceType>
233+
<className>com/google/cloud/storage/multipartupload/model/CreateMultipartUploadRequest</className>
234+
<method>java.time.OffsetDateTime getObjectLockRetainUntilDate()</method>
235+
</difference>
236+
<difference>
237+
<differenceType>7002</differenceType>
238+
<className>com/google/cloud/storage/multipartupload/model/CreateMultipartUploadRequest</className>
239+
<method>com.google.cloud.storage.StorageClass getStorageClass()</method>
240+
</difference>
241+
242+
<!-- ListPartsRequest -->
243+
<difference>
244+
<differenceType>7002</differenceType>
245+
<className>com/google/cloud/storage/multipartupload/model/ListPartsRequest</className>
246+
<method>java.lang.Integer getMaxParts()</method>
247+
</difference>
248+
<difference>
249+
<differenceType>7002</differenceType>
250+
<className>com/google/cloud/storage/multipartupload/model/ListPartsRequest</className>
251+
<method>java.lang.Integer getPartNumberMarker()</method>
252+
</difference>
253+
254+
<!-- ListPartsResponse -->
255+
<difference>
256+
<differenceType>7002</differenceType>
257+
<className>com/google/cloud/storage/multipartupload/model/ListPartsResponse</className>
258+
<method>java.lang.String getBucket()</method>
259+
</difference>
260+
<difference>
261+
<differenceType>7002</differenceType>
262+
<className>com/google/cloud/storage/multipartupload/model/ListPartsResponse</className>
263+
<method>java.lang.String getKey()</method>
264+
</difference>
265+
<difference>
266+
<differenceType>7002</differenceType>
267+
<className>com/google/cloud/storage/multipartupload/model/ListPartsResponse</className>
268+
<method>int getMaxParts()</method>
269+
</difference>
270+
<difference>
271+
<differenceType>7002</differenceType>
272+
<className>com/google/cloud/storage/multipartupload/model/ListPartsResponse</className>
273+
<method>int getNextPartNumberMarker()</method>
274+
</difference>
275+
<difference>
276+
<differenceType>7002</differenceType>
277+
<className>com/google/cloud/storage/multipartupload/model/ListPartsResponse</className>
278+
<method>int getPartNumberMarker()</method>
279+
</difference>
280+
<difference>
281+
<differenceType>7002</differenceType>
282+
<className>com/google/cloud/storage/multipartupload/model/ListPartsResponse</className>
283+
<method>java.util.List getParts()</method>
284+
</difference>
285+
<difference>
286+
<differenceType>7002</differenceType>
287+
<className>com/google/cloud/storage/multipartupload/model/ListPartsResponse</className>
288+
<method>com.google.cloud.storage.StorageClass getStorageClass()</method>
289+
</difference>
290+
<difference>
291+
<differenceType>7002</differenceType>
292+
<className>com/google/cloud/storage/multipartupload/model/ListPartsResponse</className>
293+
<method>java.lang.String getUploadId()</method>
294+
</difference>
295+
<difference>
296+
<differenceType>7002</differenceType>
297+
<className>com/google/cloud/storage/multipartupload/model/ListPartsResponse</className>
298+
<method>boolean isTruncated()</method>
299+
</difference>
200300

301+
<!-- ListPartsResponse$Builder -->
302+
<difference>
303+
<differenceType>7002</differenceType>
304+
<className>com/google/cloud/storage/multipartupload/model/ListPartsResponse$Builder</className>
305+
<method>com.google.cloud.storage.multipartupload.model.ListPartsResponse$Builder setBucket(java.lang.String)</method>
306+
</difference>
307+
<difference>
308+
<differenceType>7002</differenceType>
309+
<className>com/google/cloud/storage/multipartupload/model/ListPartsResponse$Builder</className>
310+
<method>com.google.cloud.storage.multipartupload.model.ListPartsResponse$Builder setIsTruncated(boolean)</method>
311+
</difference>
312+
<difference>
313+
<differenceType>7002</differenceType>
314+
<className>com/google/cloud/storage/multipartupload/model/ListPartsResponse$Builder</className>
315+
<method>com.google.cloud.storage.multipartupload.model.ListPartsResponse$Builder setKey(java.lang.String)</method>
316+
</difference>
317+
<difference>
318+
<differenceType>7002</differenceType>
319+
<className>com/google/cloud/storage/multipartupload/model/ListPartsResponse$Builder</className>
320+
<method>com.google.cloud.storage.multipartupload.model.ListPartsResponse$Builder setMaxParts(int)</method>
321+
</difference>
322+
<difference>
323+
<differenceType>7002</differenceType>
324+
<className>com/google/cloud/storage/multipartupload/model/ListPartsResponse$Builder</className>
325+
<method>com.google.cloud.storage.multipartupload.model.ListPartsResponse$Builder setNextPartNumberMarker(int)</method>
326+
</difference>
327+
<difference>
328+
<differenceType>7002</differenceType>
329+
<className>com/google/cloud/storage/multipartupload/model/ListPartsResponse$Builder</className>
330+
<method>com.google.cloud.storage.multipartupload.model.ListPartsResponse$Builder setPartNumberMarker(int)</method>
331+
</difference>
332+
<difference>
333+
<differenceType>7002</differenceType>
334+
<className>com/google/cloud/storage/multipartupload/model/ListPartsResponse$Builder</className>
335+
<method>com.google.cloud.storage.multipartupload.model.ListPartsResponse$Builder setParts(java.util.List)</method>
336+
</difference>
337+
<difference>
338+
<differenceType>7002</differenceType>
339+
<className>com/google/cloud/storage/multipartupload/model/ListPartsResponse$Builder</className>
340+
<method>com.google.cloud.storage.multipartupload.model.ListPartsResponse$Builder setStorageClass(com.google.cloud.storage.StorageClass)</method>
341+
</difference>
342+
<difference>
343+
<differenceType>7002</differenceType>
344+
<className>com/google/cloud/storage/multipartupload/model/ListPartsResponse$Builder</className>
345+
<method>com.google.cloud.storage.multipartupload.model.ListPartsResponse$Builder setUploadId(java.lang.String)</method>
346+
</difference>
201347
</differences>

‎google-cloud-storage/src/main/java/com/google/cloud/storage/MultipartUploadHttpRequestManager.java‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ CreateMultipartUploadResponse sendCreateMultipartUploadRequest(
8383

8484
HttpRequest httpRequest =
8585
requestFactory.buildPostRequest(
86-
new GenericUrl(createUri), new ByteArrayContent(request.getContentType(), new byte[0]));
86+
new GenericUrl(createUri), new ByteArrayContent(request.contentType(), new byte[0]));
8787
httpRequest.getHeaders().putAll(headerProvider.getHeaders());
8888
addHeadersForCreateMultipartUpload(request, httpRequest.getHeaders());
8989
httpRequest.setParser(objectParser);
@@ -98,11 +98,11 @@ ListPartsResponse sendListPartsRequest(ListPartsRequest request) throws IOExcept
9898
.put("bucket", request.bucket())
9999
.put("key", request.key())
100100
.put("uploadId", request.uploadId());
101-
if (request.getMaxParts() != null) {
102-
params.put("max-parts", request.getMaxParts());
101+
if (request.maxParts() != null) {
102+
params.put("max-parts", request.maxParts());
103103
}
104-
if (request.getPartNumberMarker() != null) {
105-
params.put("part-number-marker", request.getPartNumberMarker());
104+
if (request.partNumberMarker() != null) {
105+
params.put("part-number-marker", request.partNumberMarker());
106106
}
107107

108108
String listUri =
@@ -220,51 +220,51 @@ private void addChecksumHeader(@Nullable String crc32c, HttpHeaders headers) {
220220

221221
private void addHeadersForCreateMultipartUpload(
222222
CreateMultipartUploadRequest request, HttpHeaders headers) {
223-
if (request.getCannedAcl() != null) {
224-
headers.put("x-goog-acl", request.getCannedAcl().getXmlEntry());
223+
if (request.cannedAcl() != null) {
224+
headers.put("x-goog-acl", request.cannedAcl().getXmlEntry());
225225
}
226-
if (request.getMetadata() != null) {
227-
for (Map.Entry<String, String> entry : request.getMetadata().entrySet()) {
226+
if (request.metadata() != null) {
227+
for (Map.Entry<String, String> entry : request.metadata().entrySet()) {
228228
if (entry.getKey() != null || entry.getValue() != null) {
229229
headers.put("x-goog-meta-" + urlEncode(entry.getKey()), urlEncode(entry.getValue()));
230230
}
231231
}
232232
}
233-
if (request.getContentType() != null) {
234-
headers.put("Content-Type", request.getContentType());
233+
if (request.contentType() != null) {
234+
headers.put("Content-Type", request.contentType());
235235
}
236-
if (request.getContentDisposition() != null) {
237-
headers.put("Content-Disposition", request.getContentDisposition());
236+
if (request.contentDisposition() != null) {
237+
headers.put("Content-Disposition", request.contentDisposition());
238238
}
239-
if (request.getContentEncoding() != null) {
240-
headers.put("Content-Encoding", request.getContentEncoding());
239+
if (request.contentEncoding() != null) {
240+
headers.put("Content-Encoding", request.contentEncoding());
241241
}
242-
if (request.getContentLanguage() != null) {
243-
headers.put("Content-Language", request.getContentLanguage());
242+
if (request.contentLanguage() != null) {
243+
headers.put("Content-Language", request.contentLanguage());
244244
}
245-
if (request.getCacheControl() != null) {
246-
headers.put("Cache-Control", request.getCacheControl());
245+
if (request.cacheControl() != null) {
246+
headers.put("Cache-Control", request.cacheControl());
247247
}
248-
if (request.getStorageClass() != null) {
249-
headers.put("x-goog-storage-class", request.getStorageClass().toString());
248+
if (request.storageClass() != null) {
249+
headers.put("x-goog-storage-class", request.storageClass().toString());
250250
}
251-
if (request.getKmsKeyName() != null && !request.getKmsKeyName().isEmpty()) {
252-
headers.put("x-goog-encryption-kms-key-name", request.getKmsKeyName());
251+
if (request.kmsKeyName() != null && !request.kmsKeyName().isEmpty()) {
252+
headers.put("x-goog-encryption-kms-key-name", request.kmsKeyName());
253253
}
254-
if (request.getObjectLockMode() != null) {
255-
headers.put("x-goog-object-lock-mode", request.getObjectLockMode().toString());
254+
if (request.objectLockMode() != null) {
255+
headers.put("x-goog-object-lock-mode", request.objectLockMode().toString());
256256
}
257-
if (request.getObjectLockRetainUntilDate() != null) {
257+
if (request.objectLockRetainUntilDate() != null) {
258258
headers.put(
259259
"x-goog-object-lock-retain-until-date",
260-
Utils.offsetDateTimeRfc3339Codec.encode(request.getObjectLockRetainUntilDate()));
260+
Utils.offsetDateTimeRfc3339Codec.encode(request.objectLockRetainUntilDate()));
261261
}
262-
if (request.getCustomTime() != null) {
262+
if (request.customTime() != null) {
263263
headers.put(
264-
"x-goog-custom-time", Utils.offsetDateTimeRfc3339Codec.encode(request.getCustomTime()));
264+
"x-goog-custom-time", Utils.offsetDateTimeRfc3339Codec.encode(request.customTime()));
265265
}
266-
if (request.getUserProject() != null) {
267-
headers.put("x-goog-user-project", request.getUserProject());
266+
if (request.userProject() != null) {
267+
headers.put("x-goog-user-project", request.userProject());
268268
}
269269
}
270270

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public String key() {
9696
* @since 2.60.0 This new api is in preview and is subject to breaking changes.
9797
*/
9898
@BetaApi
99-
public PredefinedAcl getCannedAcl() {
99+
public PredefinedAcl cannedAcl() {
100100
return cannedAcl;
101101
}
102102

@@ -107,7 +107,7 @@ public PredefinedAcl getCannedAcl() {
107107
* @since 2.60.0 This new api is in preview and is subject to breaking changes.
108108
*/
109109
@BetaApi
110-
public String getContentType() {
110+
public String contentType() {
111111
return contentType;
112112
}
113113

@@ -118,7 +118,7 @@ public String getContentType() {
118118
* @since 2.61.0 This new api is in preview and is subject to breaking changes.
119119
*/
120120
@BetaApi
121-
public String getContentDisposition() {
121+
public String contentDisposition() {
122122
return contentDisposition;
123123
}
124124

@@ -129,7 +129,7 @@ public String getContentDisposition() {
129129
* @since 2.61.0 This new api is in preview and is subject to breaking changes.
130130
*/
131131
@BetaApi
132-
public String getContentEncoding() {
132+
public String contentEncoding() {
133133
return contentEncoding;
134134
}
135135

@@ -140,7 +140,7 @@ public String getContentEncoding() {
140140
* @since 2.61.0 This new api is in preview and is subject to breaking changes.
141141
*/
142142
@BetaApi
143-
public String getContentLanguage() {
143+
public String contentLanguage() {
144144
return contentLanguage;
145145
}
146146

@@ -152,7 +152,7 @@ public String getContentLanguage() {
152152
* @since 2.61.0 This new api is in preview and is subject to breaking changes.
153153
*/
154154
@BetaApi
155-
public String getCacheControl() {
155+
public String cacheControl() {
156156
return cacheControl;
157157
}
158158

@@ -163,7 +163,7 @@ public String getCacheControl() {
163163
* @since 2.60.0 This new api is in preview and is subject to breaking changes.
164164
*/
165165
@BetaApi
166-
public Map<String, String> getMetadata() {
166+
public Map<String, String> metadata() {
167167
return metadata;
168168
}
169169

@@ -174,7 +174,7 @@ public Map<String, String> getMetadata() {
174174
* @since 2.60.0 This new api is in preview and is subject to breaking changes.
175175
*/
176176
@BetaApi
177-
public StorageClass getStorageClass() {
177+
public StorageClass storageClass() {
178178
return storageClass;
179179
}
180180

@@ -185,7 +185,7 @@ public StorageClass getStorageClass() {
185185
* @since 2.60.0 This new api is in preview and is subject to breaking changes.
186186
*/
187187
@BetaApi
188-
public OffsetDateTime getCustomTime() {
188+
public OffsetDateTime customTime() {
189189
return customTime;
190190
}
191191

@@ -196,7 +196,7 @@ public OffsetDateTime getCustomTime() {
196196
* @since 2.60.0 This new api is in preview and is subject to breaking changes.
197197
*/
198198
@BetaApi
199-
public String getKmsKeyName() {
199+
public String kmsKeyName() {
200200
return kmsKeyName;
201201
}
202202

@@ -207,7 +207,7 @@ public String getKmsKeyName() {
207207
* @since 2.60.0 This new api is in preview and is subject to breaking changes.
208208
*/
209209
@BetaApi
210-
public ObjectLockMode getObjectLockMode() {
210+
public ObjectLockMode objectLockMode() {
211211
return objectLockMode;
212212
}
213213

@@ -218,7 +218,7 @@ public ObjectLockMode getObjectLockMode() {
218218
* @since 2.60.0 This new api is in preview and is subject to breaking changes.
219219
*/
220220
@BetaApi
221-
public OffsetDateTime getObjectLockRetainUntilDate() {
221+
public OffsetDateTime objectLockRetainUntilDate() {
222222
return objectLockRetainUntilDate;
223223
}
224224

@@ -228,7 +228,7 @@ public OffsetDateTime getObjectLockRetainUntilDate() {
228228
* @return The user project
229229
* @since 2.61.0 This new api is in preview and is subject to breaking changes.
230230
*/
231-
public String getUserProject() {
231+
public String userProject() {
232232
return userProject;
233233
}
234234

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public String uploadId() {
8585
* @since 2.60.0 This new api is in preview and is subject to breaking changes.
8686
*/
8787
@BetaApi
88-
public Integer getMaxParts() {
88+
public Integer maxParts() {
8989
return maxParts;
9090
}
9191

@@ -96,7 +96,7 @@ public Integer getMaxParts() {
9696
* @since 2.60.0 This new api is in preview and is subject to breaking changes.
9797
*/
9898
@BetaApi
99-
public Integer getPartNumberMarker() {
99+
public Integer partNumberMarker() {
100100
return partNumberMarker;
101101
}
102102

0 commit comments

Comments
 (0)