Skip to content

Commit efd8b08

Browse files
mziccardmziccard
committed
---
yaml --- r: 2459 b: refs/heads/update-datastore c: b8defb8 h: refs/heads/master i: 2457: deb3342 2455: 0c2d6f6
1 parent 82ecf48 commit efd8b08

2 files changed

Lines changed: 31 additions & 19 deletions

File tree

  • [refs]
  • branches/update-datastore/gcloud-java-storage/src/main/java/com/google/gcloud/storage

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/gh-pages: 4e0561bb4504bf647db669a14417b2b2c87ba45d
55
refs/heads/bigquery: 762fa5830e6c398c0396177e3e7fd243bd62cfc3
66
refs/heads/pubsub-alpha: 1a0e970f265af871e02274085b9662b3fe29058b
77
refs/heads/resource-manager: ebf4adc5ee835cd2086c4ac5b4e78d01a5a005a7
8-
refs/heads/update-datastore: 67bfcdd00e1c475eb74f222d1ea59ef7b0b3e130
8+
refs/heads/update-datastore: b8defb8e585468e0b95142080248a9f00be87c18
99
refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
1010
refs/tags/v0.0.10: 207ebd2a3472fddee69fe1298eb90429e3306efd
1111
refs/tags/v0.0.11: ffbfba48a6426ff63c08ff2117e58681f251fbf2

‎branches/update-datastore/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BucketInfo.java‎

Lines changed: 30 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ public static class IsLiveDeleteRule extends DeleteRule {
300300
* Creates an {@code IsLiveDeleteRule} object.
301301
*
302302
* @param isLive if set to {@code true} live blobs meet the delete condition. If set to
303-
* {@code false} delete condition is met by archived objects.
303+
* {@code false} delete condition is met by archived blobs.
304304
*/
305305
public IsLiveDeleteRule(boolean isLive) {
306306
super(Type.IS_LIVE);
@@ -362,31 +362,33 @@ Builder selfLink(String selfLink) {
362362
}
363363

364364
/**
365-
* Sets whether blob versioning should be enabled or not for the bucket.
365+
* Sets whether versioning should be enabled for this bucket. When set to true, versioning is
366+
* fully enabled.
366367
*/
367368
public Builder versioningEnabled(Boolean enable) {
368369
this.versioningEnabled = firstNonNull(enable, Data.<Boolean>nullOf(Boolean.class));
369370
return this;
370371
}
371372

372373
/**
373-
* Sets the bucket's website index page.
374+
* Sets the bucket's website index page. Behaves as the bucket's directory index where missing
375+
* blobs are treated as potential directories.
374376
*/
375377
public Builder indexPage(String indexPage) {
376378
this.indexPage = indexPage;
377379
return this;
378380
}
379381

380382
/**
381-
* Sets the bucket's website page to return when a resource is not found.
383+
* Sets the custom object to return when a requested resource is not found.
382384
*/
383385
public Builder notFoundPage(String notFoundPage) {
384386
this.notFoundPage = notFoundPage;
385387
return this;
386388
}
387389

388390
/**
389-
* Sets bucket's delete rules.
391+
* Sets the bucket's lifecycle configuration as a number of delete rules.
390392
*
391393
* @see <a href="https://cloud.google.com/storage/docs/lifecycle">Lifecycle Management</a>
392394
*/
@@ -396,18 +398,18 @@ public Builder deleteRules(Iterable<? extends DeleteRule> rules) {
396398
}
397399

398400
/**
399-
* Sets the bucket's storage class. A list of supported values is available
400-
* <a href="https://cloud.google.com/storage/docs/json_api/v1/buckets#resource">here</a>.
401-
*
402-
* @see <a href="https://cloud.google.com/storage/docs/storage-classes">Storage Classes</a>
401+
* Sets the bucket's storage class. This defines how blobs in the bucket are stored and
402+
* determines the SLA and the cost of storage. A list of supported values is available
403+
* <a href="https://cloud.google.com/storage/docs/storage-classes">here</a>.
403404
*/
404405
public Builder storageClass(String storageClass) {
405406
this.storageClass = storageClass;
406407
return this;
407408
}
408409

409410
/**
410-
* Sets the bucket's location. A list of supported values is available
411+
* Sets the bucket's location. Data for blobs in the bucket resides in physical storage within
412+
* this region. A list of supported values is available
411413
* <a href="https://cloud.google.com/storage/docs/bucket-locations">here</a>.
412414
*/
413415
public Builder location(String location) {
@@ -507,7 +509,7 @@ public String name() {
507509
}
508510

509511
/**
510-
* Returns the bucket's owner.
512+
* Returns the bucket's owner. This is always the project team's owner group.
511513
*/
512514
public Entity owner() {
513515
return owner;
@@ -521,35 +523,40 @@ public String selfLink() {
521523
}
522524

523525
/**
524-
* Returns {@code true} if blob versioning is enabled for this bucket, {@code false} otherwise.
526+
* Returns {@code true} if versioning is fully enabled for this bucket, {@code false} otherwise.
525527
*/
526528
public Boolean versioningEnabled() {
527529
return Data.isNull(versioningEnabled) ? null : versioningEnabled;
528530
}
529531

530532
/**
531-
* Returns bucket's website index page.
533+
* Returns bucket's website index page. Behaves as the bucket's directory index where missing
534+
* blobs are treated as potential directories.
532535
*/
533536
public String indexPage() {
534537
return indexPage;
535538
}
536539

537540
/**
538-
* Returns bucket's website not found page, used we a resource could not be found.
541+
* Returns the custom object to return when a requested resource is not found.
539542
*/
540543
public String notFoundPage() {
541544
return notFoundPage;
542545
}
543546

544547
/**
545-
* Returns bucket's delete rules.
548+
* Returns bucket's lifecycle configuration as a number of delete rules.
549+
*
550+
* @see <a href="https://cloud.google.com/storage/docs/lifecycle">Lifecycle Management</a>
546551
*/
547552
public List<? extends DeleteRule> deleteRules() {
548553
return deleteRules;
549554
}
550555

551556
/**
552-
* Returns bucket resource's entity tag.
557+
* Returns HTTP 1.1 Entity tag for the bucket.
558+
*
559+
* @see <a href="http://tools.ietf.org/html/rfc2616#section-3.11">Entity Tags</a>
553560
*/
554561
public String etag() {
555562
return etag;
@@ -570,7 +577,8 @@ public Long metageneration() {
570577
}
571578

572579
/**
573-
* Returns the bucket's location.
580+
* Returns the bucket's location. Data for blobs in the bucket resides in physical storage within
581+
* this region.
574582
*
575583
* @see <a href="https://cloud.google.com/storage/docs/bucket-locations">Bucket Locations</a>
576584
*/
@@ -579,7 +587,8 @@ public String location() {
579587
}
580588

581589
/**
582-
* Returns the bucket's storage class.
590+
* Returns the bucket's storage class. This defines how blobs in the bucket are stored and
591+
* determines the SLA and the cost of storage.
583592
*
584593
* @see <a href="https://cloud.google.com/storage/docs/storage-classes">Storage Classes</a>
585594
*/
@@ -589,6 +598,9 @@ public String storageClass() {
589598

590599
/**
591600
* Returns the bucket's Cross-Origin Resource Sharing (CORS) configuration.
601+
*
602+
* @see <a href="https://cloud.google.com/storage/docs/cross-origin">
603+
* Cross-Origin Resource Sharing (CORS)</a>
592604
*/
593605
public List<Cors> cors() {
594606
return cors;

0 commit comments

Comments
 (0)