Skip to content

Commit b41d42b

Browse files
mziccardmziccard
committed
---
yaml --- r: 7111 b: refs/heads/tswast-patch-1 c: d4faad3 h: refs/heads/master i: 7109: 6ae56ee 7107: e3eb93e 7103: 0c1fc05
1 parent c1a8cb6 commit b41d42b

10 files changed

Lines changed: 55 additions & 55 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
5757
refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
5858
refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
5959
refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
60-
refs/heads/tswast-patch-1: 3324808be960ddd0b6dbbe696a7e373fe67cbfa8
60+
refs/heads/tswast-patch-1: d4faad32326b9f9043bfc9f405fc00ef4e77690e
6161
refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b

‎branches/tswast-patch-1/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,8 @@ public Builder blobId(BlobId blobId) {
178178
}
179179

180180
@Override
181-
Builder id(String id) {
182-
infoBuilder.id(id);
181+
Builder generatedId(String generatedId) {
182+
infoBuilder.generatedId(generatedId);
183183
return this;
184184
}
185185

‎branches/tswast-patch-1/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobInfo.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ public StorageObject apply(BlobInfo blobInfo) {
5757
}
5858
};
5959

60-
private static final long serialVersionUID = 2228487739943277159L;
60+
private static final long serialVersionUID = -5625857076205028976L;
6161
private final BlobId blobId;
62-
private final String id;
62+
private final String generatedId;
6363
private final String selfLink;
6464
private final String cacheControl;
6565
private final List<Acl> acl;
@@ -101,7 +101,7 @@ public abstract static class Builder {
101101
*/
102102
public abstract Builder blobId(BlobId blobId);
103103

104-
abstract Builder id(String id);
104+
abstract Builder generatedId(String generatedId);
105105

106106
/**
107107
* Sets the blob's data content type.
@@ -199,7 +199,7 @@ public abstract static class Builder {
199199
static final class BuilderImpl extends Builder {
200200

201201
private BlobId blobId;
202-
private String id;
202+
private String generatedId;
203203
private String contentType;
204204
private String contentEncoding;
205205
private String contentDisposition;
@@ -226,7 +226,7 @@ static final class BuilderImpl extends Builder {
226226

227227
BuilderImpl(BlobInfo blobInfo) {
228228
blobId = blobInfo.blobId;
229-
id = blobInfo.id;
229+
generatedId = blobInfo.generatedId;
230230
cacheControl = blobInfo.cacheControl;
231231
contentEncoding = blobInfo.contentEncoding;
232232
contentType = blobInfo.contentType;
@@ -255,8 +255,8 @@ public Builder blobId(BlobId blobId) {
255255
}
256256

257257
@Override
258-
Builder id(String id) {
259-
this.id = id;
258+
Builder generatedId(String generatedId) {
259+
this.generatedId = generatedId;
260260
return this;
261261
}
262262

@@ -384,7 +384,7 @@ public BlobInfo build() {
384384

385385
BlobInfo(BuilderImpl builder) {
386386
blobId = builder.blobId;
387-
id = builder.id;
387+
generatedId = builder.generatedId;
388388
cacheControl = builder.cacheControl;
389389
contentEncoding = builder.contentEncoding;
390390
contentType = builder.contentType;
@@ -421,10 +421,10 @@ public String bucket() {
421421
}
422422

423423
/**
424-
* Returns the blob's id.
424+
* Returns the service-generated for the blob.
425425
*/
426-
public String id() {
427-
return id;
426+
public String generatedId() {
427+
return generatedId;
428428
}
429429

430430
/**
@@ -684,7 +684,7 @@ public ObjectAccessControl apply(Acl acl) {
684684
storageObject.setComponentCount(componentCount);
685685
storageObject.setContentLanguage(contentLanguage);
686686
storageObject.setEtag(etag);
687-
storageObject.setId(id);
687+
storageObject.setId(generatedId);
688688
storageObject.setSelfLink(selfLink);
689689
return storageObject;
690690
}
@@ -757,7 +757,7 @@ static BlobInfo fromPb(StorageObject storageObject) {
757757
builder.etag(storageObject.getEtag());
758758
}
759759
if (storageObject.getId() != null) {
760-
builder.id(storageObject.getId());
760+
builder.generatedId(storageObject.getId());
761761
}
762762
if (storageObject.getSelfLink() != null) {
763763
builder.selfLink(storageObject.getSelfLink());

‎branches/tswast-patch-1/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -427,8 +427,8 @@ public Builder name(String name) {
427427
}
428428

429429
@Override
430-
Builder id(String id) {
431-
infoBuilder.id(id);
430+
Builder generatedId(String generatedId) {
431+
infoBuilder.generatedId(generatedId);
432432
return this;
433433
}
434434

‎branches/tswast-patch-1/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BucketInfo.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ public com.google.api.services.storage.model.Bucket apply(BucketInfo bucketInfo)
6464
return bucketInfo.toPb();
6565
}
6666
};
67-
private static final long serialVersionUID = -3946094202176916586L;
68-
private final String id;
67+
private static final long serialVersionUID = -4712013629621638459L;
68+
private final String generatedId;
6969
private final String name;
7070
private final Acl.Entity owner;
7171
private final String selfLink;
@@ -326,7 +326,7 @@ public abstract static class Builder {
326326
*/
327327
public abstract Builder name(String name);
328328

329-
abstract Builder id(String id);
329+
abstract Builder generatedId(String generatedId);
330330

331331
abstract Builder owner(Acl.Entity owner);
332332

@@ -411,7 +411,7 @@ public abstract static class Builder {
411411

412412
static final class BuilderImpl extends Builder {
413413

414-
private String id;
414+
private String generatedId;
415415
private String name;
416416
private Acl.Entity owner;
417417
private String selfLink;
@@ -433,7 +433,7 @@ static final class BuilderImpl extends Builder {
433433
}
434434

435435
BuilderImpl(BucketInfo bucketInfo) {
436-
id = bucketInfo.id;
436+
generatedId = bucketInfo.generatedId;
437437
name = bucketInfo.name;
438438
etag = bucketInfo.etag;
439439
createTime = bucketInfo.createTime;
@@ -458,8 +458,8 @@ public Builder name(String name) {
458458
}
459459

460460
@Override
461-
Builder id(String id) {
462-
this.id = id;
461+
Builder generatedId(String generatedId) {
462+
this.generatedId = generatedId;
463463
return this;
464464
}
465465

@@ -555,7 +555,7 @@ public BucketInfo build() {
555555
}
556556

557557
BucketInfo(BuilderImpl builder) {
558-
id = builder.id;
558+
generatedId = builder.generatedId;
559559
name = builder.name;
560560
etag = builder.etag;
561561
createTime = builder.createTime;
@@ -574,10 +574,10 @@ public BucketInfo build() {
574574
}
575575

576576
/**
577-
* Returns the bucket's id.
577+
* Returns the service-generated id for the bucket.
578578
*/
579-
public String id() {
580-
return id;
579+
public String generatedId() {
580+
return generatedId;
581581
}
582582

583583
/**
@@ -733,7 +733,7 @@ public String toString() {
733733
com.google.api.services.storage.model.Bucket toPb() {
734734
com.google.api.services.storage.model.Bucket bucketPb =
735735
new com.google.api.services.storage.model.Bucket();
736-
bucketPb.setId(id);
736+
bucketPb.setId(generatedId);
737737
bucketPb.setName(name);
738738
bucketPb.setEtag(etag);
739739
if (createTime != null) {
@@ -810,7 +810,7 @@ public static Builder builder(String name) {
810810
static BucketInfo fromPb(com.google.api.services.storage.model.Bucket bucketPb) {
811811
Builder builder = new BuilderImpl(bucketPb.getName());
812812
if (bucketPb.getId() != null) {
813-
builder.id(bucketPb.getId());
813+
builder.generatedId(bucketPb.getId());
814814
}
815815
if (bucketPb.getEtag() != null) {
816816
builder.etag(bucketPb.getEtag());

‎branches/tswast-patch-1/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobInfoTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public class BlobInfoTest {
5151
private static final Long DELETE_TIME = System.currentTimeMillis();
5252
private static final String ETAG = "0xFF00";
5353
private static final Long GENERATION = 1L;
54-
private static final String ID = "B/N:1";
54+
private static final String GENERATED_ID = "B/N:1";
5555
private static final String MD5 = "0xFF00";
5656
private static final String MEDIA_LINK = "http://media/b/n";
5757
private static final Map<String, String> METADATA = ImmutableMap.of("n1", "v1", "n2", "v2");
@@ -71,7 +71,7 @@ public class BlobInfoTest {
7171
.crc32c(CRC32)
7272
.deleteTime(DELETE_TIME)
7373
.etag(ETAG)
74-
.id(ID)
74+
.generatedId(GENERATED_ID)
7575
.md5(MD5)
7676
.mediaLink(MEDIA_LINK)
7777
.metadata(METADATA)
@@ -118,7 +118,7 @@ public void testBuilder() {
118118
assertEquals(DELETE_TIME, BLOB_INFO.deleteTime());
119119
assertEquals(ETAG, BLOB_INFO.etag());
120120
assertEquals(GENERATION, BLOB_INFO.generation());
121-
assertEquals(ID, BLOB_INFO.id());
121+
assertEquals(GENERATED_ID, BLOB_INFO.generatedId());
122122
assertEquals(MD5, BLOB_INFO.md5());
123123
assertEquals(MEDIA_LINK, BLOB_INFO.mediaLink());
124124
assertEquals(METADATA, BLOB_INFO.metadata());
@@ -141,7 +141,7 @@ public void testBuilder() {
141141
assertNull(DIRECTORY_INFO.deleteTime());
142142
assertNull(DIRECTORY_INFO.etag());
143143
assertNull(DIRECTORY_INFO.generation());
144-
assertNull(DIRECTORY_INFO.id());
144+
assertNull(DIRECTORY_INFO.generatedId());
145145
assertNull(DIRECTORY_INFO.md5());
146146
assertNull(DIRECTORY_INFO.mediaLink());
147147
assertNull(DIRECTORY_INFO.metadata());
@@ -168,7 +168,7 @@ private void compareBlobs(BlobInfo expected, BlobInfo value) {
168168
assertEquals(expected.deleteTime(), value.deleteTime());
169169
assertEquals(expected.etag(), value.etag());
170170
assertEquals(expected.generation(), value.generation());
171-
assertEquals(expected.id(), value.id());
171+
assertEquals(expected.generatedId(), value.generatedId());
172172
assertEquals(expected.md5(), value.md5());
173173
assertEquals(expected.mediaLink(), value.mediaLink());
174174
assertEquals(expected.metadata(), value.metadata());
@@ -203,7 +203,7 @@ public void testToPbAndFromPb() {
203203
assertNull(blobInfo.deleteTime());
204204
assertNull(blobInfo.etag());
205205
assertNull(blobInfo.generation());
206-
assertNull(blobInfo.id());
206+
assertNull(blobInfo.generatedId());
207207
assertNull(blobInfo.md5());
208208
assertNull(blobInfo.mediaLink());
209209
assertNull(blobInfo.metadata());

‎branches/tswast-patch-1/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public class BlobTest {
6464
private static final Long DELETE_TIME = System.currentTimeMillis();
6565
private static final String ETAG = "0xFF00";
6666
private static final Long GENERATION = 1L;
67-
private static final String ID = "B/N:1";
67+
private static final String GENERATED_ID = "B/N:1";
6868
private static final String MD5 = "0xFF00";
6969
private static final String MEDIA_LINK = "http://media/b/n";
7070
private static final Map<String, String> METADATA = ImmutableMap.of("n1", "v1", "n2", "v2");
@@ -84,7 +84,7 @@ public class BlobTest {
8484
.crc32c(CRC32)
8585
.deleteTime(DELETE_TIME)
8686
.etag(ETAG)
87-
.id(ID)
87+
.generatedId(GENERATED_ID)
8888
.md5(MD5)
8989
.mediaLink(MEDIA_LINK)
9090
.metadata(METADATA)
@@ -338,7 +338,7 @@ public void testBuilder() {
338338
.crc32c(CRC32)
339339
.deleteTime(DELETE_TIME)
340340
.etag(ETAG)
341-
.id(ID)
341+
.generatedId(GENERATED_ID)
342342
.md5(MD5)
343343
.mediaLink(MEDIA_LINK)
344344
.metadata(METADATA)
@@ -360,7 +360,7 @@ public void testBuilder() {
360360
assertEquals(CRC32, blob.crc32c());
361361
assertEquals(DELETE_TIME, blob.deleteTime());
362362
assertEquals(ETAG, blob.etag());
363-
assertEquals(ID, blob.id());
363+
assertEquals(GENERATED_ID, blob.generatedId());
364364
assertEquals(MD5, blob.md5());
365365
assertEquals(MEDIA_LINK, blob.mediaLink());
366366
assertEquals(METADATA, blob.metadata());
@@ -387,7 +387,7 @@ public void testBuilder() {
387387
assertNull(blob.crc32c());
388388
assertNull(blob.deleteTime());
389389
assertNull(blob.etag());
390-
assertNull(blob.id());
390+
assertNull(blob.generatedId());
391391
assertNull(blob.md5());
392392
assertNull(blob.mediaLink());
393393
assertNull(blob.metadata());

‎branches/tswast-patch-1/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketInfoTest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public class BucketInfoTest {
4444
Acl.of(User.ofAllAuthenticatedUsers(), Role.READER),
4545
Acl.of(new Project(VIEWERS, "p1"), Role.WRITER));
4646
private static final String ETAG = "0xFF00";
47-
private static final String ID = "B/N:1";
47+
private static final String GENERATED_ID = "B/N:1";
4848
private static final Long META_GENERATION = 10L;
4949
private static final User OWNER = new User("[email protected]");
5050
private static final String SELF_LINK = "http://storage/b/n";
@@ -62,7 +62,7 @@ public class BucketInfoTest {
6262
private static final BucketInfo BUCKET_INFO = BucketInfo.builder("b")
6363
.acl(ACL)
6464
.etag(ETAG)
65-
.id(ID)
65+
.generatedId(GENERATED_ID)
6666
.metageneration(META_GENERATION)
6767
.owner(OWNER)
6868
.selfLink(SELF_LINK)
@@ -80,10 +80,10 @@ public class BucketInfoTest {
8080
@Test
8181
public void testToBuilder() {
8282
compareBuckets(BUCKET_INFO, BUCKET_INFO.toBuilder().build());
83-
BucketInfo bucketInfo = BUCKET_INFO.toBuilder().name("B").id("id").build();
83+
BucketInfo bucketInfo = BUCKET_INFO.toBuilder().name("B").generatedId("id").build();
8484
assertEquals("B", bucketInfo.name());
85-
assertEquals("id", bucketInfo.id());
86-
bucketInfo = bucketInfo.toBuilder().name("b").id(ID).build();
85+
assertEquals("id", bucketInfo.generatedId());
86+
bucketInfo = bucketInfo.toBuilder().name("b").generatedId(GENERATED_ID).build();
8787
compareBuckets(BUCKET_INFO, bucketInfo);
8888
}
8989

@@ -104,7 +104,7 @@ public void testBuilder() {
104104
assertEquals("b", BUCKET_INFO.name());
105105
assertEquals(ACL, BUCKET_INFO.acl());
106106
assertEquals(ETAG, BUCKET_INFO.etag());
107-
assertEquals(ID, BUCKET_INFO.id());
107+
assertEquals(GENERATED_ID, BUCKET_INFO.generatedId());
108108
assertEquals(META_GENERATION, BUCKET_INFO.metageneration());
109109
assertEquals(OWNER, BUCKET_INFO.owner());
110110
assertEquals(SELF_LINK, BUCKET_INFO.selfLink());
@@ -131,7 +131,7 @@ private void compareBuckets(BucketInfo expected, BucketInfo value) {
131131
assertEquals(expected.name(), value.name());
132132
assertEquals(expected.acl(), value.acl());
133133
assertEquals(expected.etag(), value.etag());
134-
assertEquals(expected.id(), value.id());
134+
assertEquals(expected.generatedId(), value.generatedId());
135135
assertEquals(expected.metageneration(), value.metageneration());
136136
assertEquals(expected.owner(), value.owner());
137137
assertEquals(expected.selfLink(), value.selfLink());

‎branches/tswast-patch-1/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public class BucketTest {
5959
private static final List<Acl> ACL = ImmutableList.of(
6060
Acl.of(User.ofAllAuthenticatedUsers(), READER), Acl.of(new Project(VIEWERS, "p1"), WRITER));
6161
private static final String ETAG = "0xFF00";
62-
private static final String ID = "B/N:1";
62+
private static final String GENERATED_ID = "B/N:1";
6363
private static final Long META_GENERATION = 10L;
6464
private static final User OWNER = new User("[email protected]");
6565
private static final String SELF_LINK = "http://storage/b/n";
@@ -77,7 +77,7 @@ public class BucketTest {
7777
private static final BucketInfo FULL_BUCKET_INFO = BucketInfo.builder("b")
7878
.acl(ACL)
7979
.etag(ETAG)
80-
.id(ID)
80+
.generatedId(GENERATED_ID)
8181
.metageneration(META_GENERATION)
8282
.owner(OWNER)
8383
.selfLink(SELF_LINK)
@@ -495,7 +495,7 @@ public void testBuilder() {
495495
new Bucket.Builder(new Bucket(storage, new BucketInfo.BuilderImpl(BUCKET_INFO)));
496496
Bucket bucket = builder.acl(ACL)
497497
.etag(ETAG)
498-
.id(ID)
498+
.generatedId(GENERATED_ID)
499499
.metageneration(META_GENERATION)
500500
.owner(OWNER)
501501
.selfLink(SELF_LINK)
@@ -512,7 +512,7 @@ public void testBuilder() {
512512
assertEquals("b", bucket.name());
513513
assertEquals(ACL, bucket.acl());
514514
assertEquals(ETAG, bucket.etag());
515-
assertEquals(ID, bucket.id());
515+
assertEquals(GENERATED_ID, bucket.generatedId());
516516
assertEquals(META_GENERATION, bucket.metageneration());
517517
assertEquals(OWNER, bucket.owner());
518518
assertEquals(SELF_LINK, bucket.selfLink());

0 commit comments

Comments
 (0)