Skip to content

Commit 66d54e2

Browse files
ShreyasSinhaShreyasSinha
authored
feat(mpu): breaking change modifying getters and setters in MPU to be more inline with s3 interface.
2 parents 52bfddf + 21fd77f commit 66d54e2

File tree

8 files changed

+230
-85
lines changed

8 files changed

+230
-85
lines changed

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

Lines changed: 145 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,47 @@
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>
200241
<!-- MultipartUploadClient is @InternalExtensionOnly -->
201242
<difference>
202243
<!-- allow new method to be added at any time -->
@@ -205,5 +246,109 @@
205246
<method>* *(*)</method>
206247
</difference>
207248

249+
<!-- ListPartsRequest -->
250+
<difference>
251+
<differenceType>7002</differenceType>
252+
<className>com/google/cloud/storage/multipartupload/model/ListPartsRequest</className>
253+
<method>java.lang.Integer getMaxParts()</method>
254+
</difference>
255+
<difference>
256+
<differenceType>7002</differenceType>
257+
<className>com/google/cloud/storage/multipartupload/model/ListPartsRequest</className>
258+
<method>java.lang.Integer getPartNumberMarker()</method>
259+
</difference>
208260

261+
<!-- ListPartsResponse -->
262+
<difference>
263+
<differenceType>7002</differenceType>
264+
<className>com/google/cloud/storage/multipartupload/model/ListPartsResponse</className>
265+
<method>java.lang.String getBucket()</method>
266+
</difference>
267+
<difference>
268+
<differenceType>7002</differenceType>
269+
<className>com/google/cloud/storage/multipartupload/model/ListPartsResponse</className>
270+
<method>java.lang.String getKey()</method>
271+
</difference>
272+
<difference>
273+
<differenceType>7002</differenceType>
274+
<className>com/google/cloud/storage/multipartupload/model/ListPartsResponse</className>
275+
<method>int getMaxParts()</method>
276+
</difference>
277+
<difference>
278+
<differenceType>7002</differenceType>
279+
<className>com/google/cloud/storage/multipartupload/model/ListPartsResponse</className>
280+
<method>int getNextPartNumberMarker()</method>
281+
</difference>
282+
<difference>
283+
<differenceType>7002</differenceType>
284+
<className>com/google/cloud/storage/multipartupload/model/ListPartsResponse</className>
285+
<method>int getPartNumberMarker()</method>
286+
</difference>
287+
<difference>
288+
<differenceType>7002</differenceType>
289+
<className>com/google/cloud/storage/multipartupload/model/ListPartsResponse</className>
290+
<method>java.util.List getParts()</method>
291+
</difference>
292+
<difference>
293+
<differenceType>7002</differenceType>
294+
<className>com/google/cloud/storage/multipartupload/model/ListPartsResponse</className>
295+
<method>com.google.cloud.storage.StorageClass getStorageClass()</method>
296+
</difference>
297+
<difference>
298+
<differenceType>7002</differenceType>
299+
<className>com/google/cloud/storage/multipartupload/model/ListPartsResponse</className>
300+
<method>java.lang.String getUploadId()</method>
301+
</difference>
302+
<difference>
303+
<differenceType>7002</differenceType>
304+
<className>com/google/cloud/storage/multipartupload/model/ListPartsResponse</className>
305+
<method>boolean isTruncated()</method>
306+
</difference>
307+
308+
<!-- ListPartsResponse$Builder -->
309+
<difference>
310+
<differenceType>7002</differenceType>
311+
<className>com/google/cloud/storage/multipartupload/model/ListPartsResponse$Builder</className>
312+
<method>com.google.cloud.storage.multipartupload.model.ListPartsResponse$Builder setBucket(java.lang.String)</method>
313+
</difference>
314+
<difference>
315+
<differenceType>7002</differenceType>
316+
<className>com/google/cloud/storage/multipartupload/model/ListPartsResponse$Builder</className>
317+
<method>com.google.cloud.storage.multipartupload.model.ListPartsResponse$Builder setIsTruncated(boolean)</method>
318+
</difference>
319+
<difference>
320+
<differenceType>7002</differenceType>
321+
<className>com/google/cloud/storage/multipartupload/model/ListPartsResponse$Builder</className>
322+
<method>com.google.cloud.storage.multipartupload.model.ListPartsResponse$Builder setKey(java.lang.String)</method>
323+
</difference>
324+
<difference>
325+
<differenceType>7002</differenceType>
326+
<className>com/google/cloud/storage/multipartupload/model/ListPartsResponse$Builder</className>
327+
<method>com.google.cloud.storage.multipartupload.model.ListPartsResponse$Builder setMaxParts(int)</method>
328+
</difference>
329+
<difference>
330+
<differenceType>7002</differenceType>
331+
<className>com/google/cloud/storage/multipartupload/model/ListPartsResponse$Builder</className>
332+
<method>com.google.cloud.storage.multipartupload.model.ListPartsResponse$Builder setNextPartNumberMarker(int)</method>
333+
</difference>
334+
<difference>
335+
<differenceType>7002</differenceType>
336+
<className>com/google/cloud/storage/multipartupload/model/ListPartsResponse$Builder</className>
337+
<method>com.google.cloud.storage.multipartupload.model.ListPartsResponse$Builder setPartNumberMarker(int)</method>
338+
</difference>
339+
<difference>
340+
<differenceType>7002</differenceType>
341+
<className>com/google/cloud/storage/multipartupload/model/ListPartsResponse$Builder</className>
342+
<method>com.google.cloud.storage.multipartupload.model.ListPartsResponse$Builder setParts(java.util.List)</method>
343+
</difference>
344+
<difference>
345+
<differenceType>7002</differenceType>
346+
<className>com/google/cloud/storage/multipartupload/model/ListPartsResponse$Builder</className>
347+
<method>com.google.cloud.storage.multipartupload.model.ListPartsResponse$Builder setStorageClass(com.google.cloud.storage.StorageClass)</method>
348+
</difference>
349+
<difference>
350+
<differenceType>7002</differenceType>
351+
<className>com/google/cloud/storage/multipartupload/model/ListPartsResponse$Builder</className>
352+
<method>com.google.cloud.storage.multipartupload.model.ListPartsResponse$Builder setUploadId(java.lang.String)</method>
353+
</difference>
209354
</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 =
@@ -258,51 +258,51 @@ private void addChecksumHeader(@Nullable String crc32c, HttpHeaders headers) {
258258

259259
private void addHeadersForCreateMultipartUpload(
260260
CreateMultipartUploadRequest request, HttpHeaders headers) {
261-
if (request.getCannedAcl() != null) {
262-
headers.put("x-goog-acl", request.getCannedAcl().getXmlEntry());
261+
if (request.cannedAcl() != null) {
262+
headers.put("x-goog-acl", request.cannedAcl().getXmlEntry());
263263
}
264-
if (request.getMetadata() != null) {
265-
for (Map.Entry<String, String> entry : request.getMetadata().entrySet()) {
264+
if (request.metadata() != null) {
265+
for (Map.Entry<String, String> entry : request.metadata().entrySet()) {
266266
if (entry.getKey() != null || entry.getValue() != null) {
267267
headers.put("x-goog-meta-" + urlEncode(entry.getKey()), urlEncode(entry.getValue()));
268268
}
269269
}
270270
}
271-
if (request.getContentType() != null) {
272-
headers.put("Content-Type", request.getContentType());
271+
if (request.contentType() != null) {
272+
headers.put("Content-Type", request.contentType());
273273
}
274-
if (request.getContentDisposition() != null) {
275-
headers.put("Content-Disposition", request.getContentDisposition());
274+
if (request.contentDisposition() != null) {
275+
headers.put("Content-Disposition", request.contentDisposition());
276276
}
277-
if (request.getContentEncoding() != null) {
278-
headers.put("Content-Encoding", request.getContentEncoding());
277+
if (request.contentEncoding() != null) {
278+
headers.put("Content-Encoding", request.contentEncoding());
279279
}
280-
if (request.getContentLanguage() != null) {
281-
headers.put("Content-Language", request.getContentLanguage());
280+
if (request.contentLanguage() != null) {
281+
headers.put("Content-Language", request.contentLanguage());
282282
}
283-
if (request.getCacheControl() != null) {
284-
headers.put("Cache-Control", request.getCacheControl());
283+
if (request.cacheControl() != null) {
284+
headers.put("Cache-Control", request.cacheControl());
285285
}
286-
if (request.getStorageClass() != null) {
287-
headers.put("x-goog-storage-class", request.getStorageClass().toString());
286+
if (request.storageClass() != null) {
287+
headers.put("x-goog-storage-class", request.storageClass().toString());
288288
}
289-
if (request.getKmsKeyName() != null && !request.getKmsKeyName().isEmpty()) {
290-
headers.put("x-goog-encryption-kms-key-name", request.getKmsKeyName());
289+
if (request.kmsKeyName() != null && !request.kmsKeyName().isEmpty()) {
290+
headers.put("x-goog-encryption-kms-key-name", request.kmsKeyName());
291291
}
292-
if (request.getObjectLockMode() != null) {
293-
headers.put("x-goog-object-lock-mode", request.getObjectLockMode().toString());
292+
if (request.objectLockMode() != null) {
293+
headers.put("x-goog-object-lock-mode", request.objectLockMode().toString());
294294
}
295-
if (request.getObjectLockRetainUntilDate() != null) {
295+
if (request.objectLockRetainUntilDate() != null) {
296296
headers.put(
297297
"x-goog-object-lock-retain-until-date",
298-
Utils.offsetDateTimeRfc3339Codec.encode(request.getObjectLockRetainUntilDate()));
298+
Utils.offsetDateTimeRfc3339Codec.encode(request.objectLockRetainUntilDate()));
299299
}
300-
if (request.getCustomTime() != null) {
300+
if (request.customTime() != null) {
301301
headers.put(
302-
"x-goog-custom-time", Utils.offsetDateTimeRfc3339Codec.encode(request.getCustomTime()));
302+
"x-goog-custom-time", Utils.offsetDateTimeRfc3339Codec.encode(request.customTime()));
303303
}
304-
if (request.getUserProject() != null) {
305-
headers.put("x-goog-user-project", request.getUserProject());
304+
if (request.userProject() != null) {
305+
headers.put("x-goog-user-project", request.userProject());
306306
}
307307
}
308308

‎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)