Skip to content

Commit 6670b70

Browse files
mziccardmziccard
committed
Favor renaming over deprecation for package-private methods
1 parent ac2921b commit 6670b70

8 files changed

Lines changed: 43 additions & 366 deletions

File tree

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

Lines changed: 1 addition & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ public static class Builder extends BlobInfo.Builder {
199199
private final BlobInfo.BuilderImpl infoBuilder;
200200

201201
Builder(Blob blob) {
202-
this.storage = blob.storage();
202+
this.storage = blob.getStorage();
203203
this.infoBuilder = new BlobInfo.BuilderImpl(blob);
204204
}
205205

@@ -216,13 +216,6 @@ public Builder setBlobId(BlobId blobId) {
216216
return this;
217217
}
218218

219-
@Override
220-
@Deprecated
221-
Builder generatedId(String generatedId) {
222-
infoBuilder.setGeneratedId(generatedId);
223-
return this;
224-
}
225-
226219
@Override
227220
Builder setGeneratedId(String generatedId) {
228221
infoBuilder.setGeneratedId(generatedId);
@@ -281,13 +274,6 @@ public Builder setContentEncoding(String contentEncoding) {
281274
return this;
282275
}
283276

284-
@Override
285-
@Deprecated
286-
Builder componentCount(Integer componentCount) {
287-
infoBuilder.setComponentCount(componentCount);
288-
return this;
289-
}
290-
291277
@Override
292278
Builder setComponentCount(Integer componentCount) {
293279
infoBuilder.setComponentCount(componentCount);
@@ -320,52 +306,24 @@ public Builder setAcl(List<Acl> acl) {
320306
return this;
321307
}
322308

323-
@Override
324-
@Deprecated
325-
Builder owner(Entity owner) {
326-
infoBuilder.setOwner(owner);
327-
return this;
328-
}
329-
330309
@Override
331310
Builder setOwner(Entity owner) {
332311
infoBuilder.setOwner(owner);
333312
return this;
334313
}
335314

336-
@Override
337-
@Deprecated
338-
Builder size(Long size) {
339-
infoBuilder.setSize(size);
340-
return this;
341-
}
342-
343315
@Override
344316
Builder setSize(Long size) {
345317
infoBuilder.setSize(size);
346318
return this;
347319
}
348320

349-
@Override
350-
@Deprecated
351-
Builder etag(String etag) {
352-
infoBuilder.setEtag(etag);
353-
return this;
354-
}
355-
356321
@Override
357322
Builder setEtag(String etag) {
358323
infoBuilder.setEtag(etag);
359324
return this;
360325
}
361326

362-
@Override
363-
@Deprecated
364-
Builder selfLink(String selfLink) {
365-
infoBuilder.setSelfLink(selfLink);
366-
return this;
367-
}
368-
369327
@Override
370328
Builder setSelfLink(String selfLink) {
371329
infoBuilder.setSelfLink(selfLink);
@@ -398,13 +356,6 @@ public Builder setCrc32c(String crc32c) {
398356
return this;
399357
}
400358

401-
@Override
402-
@Deprecated
403-
Builder mediaLink(String mediaLink) {
404-
infoBuilder.setMediaLink(mediaLink);
405-
return this;
406-
}
407-
408359
@Override
409360
Builder setMediaLink(String mediaLink) {
410361
infoBuilder.setMediaLink(mediaLink);
@@ -424,78 +375,36 @@ public Builder setMetadata(Map<String, String> metadata) {
424375
return this;
425376
}
426377

427-
@Override
428-
@Deprecated
429-
Builder metageneration(Long metageneration) {
430-
infoBuilder.setMetageneration(metageneration);
431-
return this;
432-
}
433-
434378
@Override
435379
Builder setMetageneration(Long metageneration) {
436380
infoBuilder.setMetageneration(metageneration);
437381
return this;
438382
}
439383

440-
@Override
441-
@Deprecated
442-
Builder deleteTime(Long deleteTime) {
443-
infoBuilder.setDeleteTime(deleteTime);
444-
return this;
445-
}
446-
447384
@Override
448385
Builder setDeleteTime(Long deleteTime) {
449386
infoBuilder.setDeleteTime(deleteTime);
450387
return this;
451388
}
452389

453-
@Override
454-
@Deprecated
455-
Builder updateTime(Long updateTime) {
456-
infoBuilder.setUpdateTime(updateTime);
457-
return this;
458-
}
459-
460390
@Override
461391
Builder setUpdateTime(Long updateTime) {
462392
infoBuilder.setUpdateTime(updateTime);
463393
return this;
464394
}
465395

466-
@Override
467-
@Deprecated
468-
Builder createTime(Long createTime) {
469-
infoBuilder.setCreateTime(createTime);
470-
return this;
471-
}
472-
473396
@Override
474397
Builder setCreateTime(Long createTime) {
475398
infoBuilder.setCreateTime(createTime);
476399
return this;
477400
}
478401

479-
@Override
480-
@Deprecated
481-
Builder isDirectory(boolean isDirectory) {
482-
infoBuilder.setIsDirectory(isDirectory);
483-
return this;
484-
}
485-
486402
@Override
487403
Builder setIsDirectory(boolean isDirectory) {
488404
infoBuilder.setIsDirectory(isDirectory);
489405
return this;
490406
}
491407

492-
@Override
493-
@Deprecated
494-
Builder customerEncryption(CustomerEncryption customerEncryption) {
495-
infoBuilder.setCustomerEncryption(customerEncryption);
496-
return this;
497-
}
498-
499408
@Override
500409
Builder setCustomerEncryption(CustomerEncryption customerEncryption) {
501410
infoBuilder.setCustomerEncryption(customerEncryption);

0 commit comments

Comments
 (0)