Skip to content

Commit 11e54c3

Browse files
mziccardmziccard
committed
---
yaml --- r: 6159 b: refs/heads/tswast-patch-1 c: 90dd070 h: refs/heads/master i: 6157: 0ef71d4 6155: 44dfd25 6151: 11ffb2a 6143: b81efd6
1 parent f13d903 commit 11e54c3

6 files changed

Lines changed: 83 additions & 46 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: 23ebbecd63eb7901f1564c45b0d4a3064fe13bb5
60+
refs/heads/tswast-patch-1: 90dd0709ee844da91e19dca2adce75ff219fa29e
6161
refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b

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

Lines changed: 43 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -441,23 +441,49 @@ public static Builder builder(String bucket, String name) {
441441
}
442442

443443
static BlobInfo fromPb(StorageObject storageObject) {
444-
Builder builder = new Builder()
445-
.bucket(storageObject.getBucket())
446-
.cacheControl(storageObject.getCacheControl())
447-
.contentEncoding(storageObject.getContentEncoding())
448-
.crc32c(storageObject.getCrc32c())
449-
.contentType(storageObject.getContentType())
450-
.generation(storageObject.getGeneration())
451-
.md5(storageObject.getMd5Hash())
452-
.mediaLink(storageObject.getMediaLink())
453-
.metageneration(storageObject.getMetageneration())
454-
.name(storageObject.getName())
455-
.contentDisposition(storageObject.getContentDisposition())
456-
.componentCount(storageObject.getComponentCount())
457-
.contentLanguage(storageObject.getContentLanguage())
458-
.etag(storageObject.getEtag())
459-
.id(storageObject.getId())
460-
.selfLink(storageObject.getSelfLink());
444+
Builder builder = new Builder().bucket(storageObject.getBucket()).name(storageObject.getName());
445+
if (storageObject.getCacheControl() != null) {
446+
builder.cacheControl(storageObject.getCacheControl());
447+
}
448+
if (storageObject.getContentEncoding() != null) {
449+
builder.contentEncoding(storageObject.getContentEncoding());
450+
}
451+
if (storageObject.getCrc32c() != null) {
452+
builder.crc32c(storageObject.getCrc32c());
453+
}
454+
if (storageObject.getContentType() != null) {
455+
builder.contentType(storageObject.getContentType());
456+
}
457+
if (storageObject.getGeneration() != null) {
458+
builder.generation(storageObject.getGeneration());
459+
}
460+
if (storageObject.getMd5Hash() != null) {
461+
builder.md5(storageObject.getMd5Hash());
462+
}
463+
if (storageObject.getMediaLink() != null) {
464+
builder.mediaLink(storageObject.getMediaLink());
465+
}
466+
if (storageObject.getMetageneration() != null) {
467+
builder.metageneration(storageObject.getMetageneration());
468+
}
469+
if (storageObject.getContentDisposition() != null) {
470+
builder.contentDisposition(storageObject.getContentDisposition());
471+
}
472+
if (storageObject.getComponentCount() != null) {
473+
builder.componentCount(storageObject.getComponentCount());
474+
}
475+
if (storageObject.getContentLanguage() != null) {
476+
builder.contentLanguage(storageObject.getContentLanguage());
477+
}
478+
if (storageObject.getEtag() != null) {
479+
builder.etag(storageObject.getEtag());
480+
}
481+
if (storageObject.getId() != null) {
482+
builder.id(storageObject.getId());
483+
}
484+
if (storageObject.getSelfLink() != null) {
485+
builder.selfLink(storageObject.getSelfLink());
486+
}
461487
if (storageObject.getMetadata() != null) {
462488
builder.metadata(storageObject.getMetadata());
463489
}

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

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -692,14 +692,25 @@ public static Builder builder(String name) {
692692
}
693693

694694
static BucketInfo fromPb(com.google.api.services.storage.model.Bucket bucketPb) {
695-
Builder builder = new Builder()
696-
.name(bucketPb.getName())
697-
.id(bucketPb.getId())
698-
.etag(bucketPb.getEtag())
699-
.metageneration(bucketPb.getMetageneration())
700-
.createTime(bucketPb.getTimeCreated().getValue())
701-
.location(Location.of(bucketPb.getLocation()))
702-
.selfLink(bucketPb.getSelfLink());
695+
Builder builder = new Builder().name(bucketPb.getName());
696+
if (bucketPb.getId() != null) {
697+
builder.id(bucketPb.getId());
698+
}
699+
if (bucketPb.getEtag() != null) {
700+
builder.etag(bucketPb.getEtag());
701+
}
702+
if (bucketPb.getMetageneration() != null) {
703+
builder.metageneration(bucketPb.getMetageneration());
704+
}
705+
if (bucketPb.getSelfLink() != null) {
706+
builder.selfLink(bucketPb.getSelfLink());
707+
}
708+
if (bucketPb.getTimeCreated() != null) {
709+
builder.createTime(bucketPb.getTimeCreated().getValue());
710+
}
711+
if (bucketPb.getLocation() != null) {
712+
builder.location(Location.of(bucketPb.getLocation()));
713+
}
703714
if (bucketPb.getStorageClass() != null) {
704715
builder.storageClass(StorageClass.of(bucketPb.getStorageClass()));
705716
}

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

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import com.google.api.services.storage.model.StorageObject;
3535
import com.google.common.base.Function;
3636
import com.google.common.base.Functions;
37-
import com.google.common.collect.ImmutableList;
3837
import com.google.common.collect.ImmutableMap;
3938
import com.google.common.collect.Iterables;
4039
import com.google.common.collect.Lists;
@@ -235,16 +234,14 @@ public Tuple<String, Iterable<com.google.api.services.storage.model.Bucket>> cal
235234
}
236235
}, serviceOptions.retryParams(), EXCEPTION_HANDLER);
237236
String cursor = result.x();
238-
Iterable<BucketInfo> buckets =
239-
result.y() == null ? ImmutableList.<BucketInfo>of() : Iterables.transform(result.y(),
237+
return new BaseListResult<>(new BucketPageFetcher(serviceOptions, cursor, optionsMap), cursor,
238+
Iterables.transform(result.y(),
240239
new Function<com.google.api.services.storage.model.Bucket, BucketInfo>() {
241240
@Override
242241
public BucketInfo apply(com.google.api.services.storage.model.Bucket bucketPb) {
243242
return BucketInfo.fromPb(bucketPb);
244243
}
245-
});
246-
return new BaseListResult<>(new BucketPageFetcher(serviceOptions, cursor, optionsMap), cursor,
247-
buckets);
244+
}));
248245
}
249246

250247
@Override
@@ -262,17 +259,14 @@ public Tuple<String, Iterable<StorageObject>> call() {
262259
}
263260
}, serviceOptions.retryParams(), EXCEPTION_HANDLER);
264261
String cursor = result.x();
265-
Iterable<BlobInfo> blobs =
266-
result.y() == null ? ImmutableList.<BlobInfo>of() : Iterables.transform(result.y(),
262+
return new BaseListResult<>(new BlobPageFetcher(bucket, serviceOptions, cursor, optionsMap), cursor,
263+
Iterables.transform(result.y(),
267264
new Function<StorageObject, BlobInfo>() {
268265
@Override
269266
public BlobInfo apply(StorageObject storageObject) {
270267
return BlobInfo.fromPb(storageObject);
271268
}
272-
});
273-
return new BaseListResult<>(new BlobPageFetcher(bucket, serviceOptions, cursor, optionsMap),
274-
cursor,
275-
blobs);
269+
}));
276270
}
277271

278272
@Override
@@ -440,7 +434,7 @@ public BlobReadChannel reader(String bucket, String blob, BlobSourceOption... op
440434
return new BlobReadChannelImpl(options(), BlobInfo.of(bucket, blob), optionsMap);
441435
}
442436

443-
@Override
437+
@Override
444438
public BlobWriteChannel writer(BlobInfo blobInfo, BlobTargetOption... options) {
445439
final Map<StorageRpc.Option, ?> optionsMap = optionMap(blobInfo, options);
446440
return new BlobWriterChannelImpl(options(), blobInfo, optionsMap);
@@ -467,12 +461,12 @@ public URL signUrl(BlobInfo blobInfo, long expiration, SignUrlOption... options)
467461
stBuilder.append(HttpMethod.GET);
468462
}
469463
stBuilder.append('\n');
470-
if (firstNonNull((Boolean) optionMap.get(SignUrlOption.Option.MD5), false)) {
464+
if (firstNonNull((Boolean) optionMap.get(SignUrlOption.Option.MD5) , false)) {
471465
checkArgument(blobInfo.md5() != null, "Blob is missing a value for md5");
472466
stBuilder.append(blobInfo.md5());
473467
}
474468
stBuilder.append('\n');
475-
if (firstNonNull((Boolean) optionMap.get(SignUrlOption.Option.CONTENT_TYPE), false)) {
469+
if (firstNonNull((Boolean) optionMap.get(SignUrlOption.Option.CONTENT_TYPE) , false)) {
476470
checkArgument(blobInfo.contentType() != null, "Blob is missing a value for content-type");
477471
stBuilder.append(blobInfo.contentType());
478472
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,5 +151,7 @@ private void compareBlobs(BlobInfo expected, BlobInfo value) {
151151
@Test
152152
public void testToPbAndFromPb() {
153153
compareBlobs(BLOB_INFO, BlobInfo.fromPb(BLOB_INFO.toPb()));
154+
BlobInfo blobInfo = BlobInfo.of("b", "n");
155+
compareBlobs(blobInfo, BlobInfo.fromPb(blobInfo.toPb()));
154156
}
155157
}

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,8 @@ public void testBuilder() {
125125
@Test
126126
public void testToPbAndFromPb() {
127127
compareBuckets(BUCKET_INFO, BucketInfo.fromPb(BUCKET_INFO.toPb()));
128+
BucketInfo bucketInfo = BucketInfo.of("b");
129+
compareBuckets(bucketInfo, BucketInfo.fromPb(bucketInfo.toPb()));
128130
}
129131

130132
private void compareBuckets(BucketInfo expected, BucketInfo value) {
@@ -147,21 +149,23 @@ private void compareBuckets(BucketInfo expected, BucketInfo value) {
147149
assertEquals(expected.versioningEnabled(), value.versioningEnabled());
148150
}
149151

152+
@Test
150153
public void testLocation() {
151154
assertEquals("ASIA", Location.asia().value());
152-
assertEquals("EN", Location.eu().value());
155+
assertEquals("EU", Location.eu().value());
153156
assertEquals("US", Location.us().value());
154157
assertSame(Location.asia(), Location.of("asia"));
155-
assertSame(Location.asia(), Location.of("EU"));
156-
assertSame(Location.asia(), Location.of("uS"));
158+
assertSame(Location.eu(), Location.of("EU"));
159+
assertSame(Location.us(), Location.of("uS"));
157160
}
158161

162+
@Test
159163
public void testDeleteRules() {
160164
AgeDeleteRule ageRule = new AgeDeleteRule(10);
161165
assertEquals(10, ageRule.daysToLive());
162166
assertEquals(Type.AGE, ageRule.type());
163167
CreatedBeforeDeleteRule createBeforeRule = new CreatedBeforeDeleteRule(1);
164-
assertEquals(10, createBeforeRule.timeMillis());
168+
assertEquals(1, createBeforeRule.timeMillis());
165169
assertEquals(Type.CREATE_BEFORE, createBeforeRule.type());
166170
NumNewerVersionsDeleteRule versionsRule = new NumNewerVersionsDeleteRule(2);
167171
assertEquals(2, versionsRule.numNewerVersions());
@@ -171,7 +175,7 @@ public void testDeleteRules() {
171175
assertEquals(Type.IS_LIVE, isLiveRule.type());
172176
Rule rule = new Rule().set("a", "b");
173177
RawDeleteRule rawRule = new RawDeleteRule(rule);
174-
assertEquals(Type.UNKNOWN, isLiveRule.type());
178+
assertEquals(Type.UNKNOWN, rawRule.type());
175179
ImmutableList<DeleteRule> rules = ImmutableList
176180
.of(ageRule, createBeforeRule, versionsRule, isLiveRule, rawRule);
177181
for (DeleteRule delRule : rules) {

0 commit comments

Comments
 (0)