Merge pull request #167 from mziccard/fix-bucketinfo-tobuilder

aozarov · aozarov · commit 3739a1a32091 · 2015-09-18T13:43:26.000-07:00
BucketInfo: add null check for rules in builder
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BucketInfo.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BucketInfo.java
@@ -453,7 +453,7 @@ public Builder notFoundPage(String notFoundPage) {
     }
 
     public Builder deleteRules(Iterable<? extends DeleteRule> rules) {
-      this.deleteRules = ImmutableList.copyOf(rules);
+      this.deleteRules = rules != null ? ImmutableList.copyOf(rules) : null;
       return this;
     }
 
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketInfoTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketInfoTest.java
@@ -90,6 +90,12 @@ public void testToBuilder() {
     compareBuckets(BUCKET_INFO, bucketInfo);
   }
 
+  @Test
+  public void testToBuilderIncomplete() {
+    BucketInfo incompleteBucketInfo = BucketInfo.builder("b").build();
+    assertEquals(incompleteBucketInfo.name(), incompleteBucketInfo.toBuilder().build().name());
+  }
+
   @Test
   public void testOf() {
     BucketInfo bucketInfo = BucketInfo.of("bucket");

Original file line number	Diff line number	Diff line change
`@@ -453,7 +453,7 @@ public Builder notFoundPage(String notFoundPage) {`
`453`	`453`	`}`
`454`	`454`
`455`	`455`	`public Builder deleteRules(Iterable<? extends DeleteRule> rules) {`
`456`		`- this.deleteRules = ImmutableList.copyOf(rules);`
	`456`	`+ this.deleteRules = rules != null ? ImmutableList.copyOf(rules) : null;`
`457`	`457`	`return this;`
`458`	`458`	`}`
`459`	`459`