clirr and fmt

google-cloud-storage/clirr-ignored-differences.xml

@@ -15,6 +15,12 @@
     <method>* writeAndClose(*)</method>
   </difference>
 
+  <difference>
+    <differenceType>7013</differenceType>
+    <className>com/google/cloud/storage/BlobInfo$Builder</className>
+    <method>com.google.cloud.storage.BlobInfo$Builder setRetention(com.google.cloud.storage.BlobInfo$Retention)</method>
+  </difference>
+
   <!-- @BetaApi members -->
   <difference>
     <differenceType>7009</differenceType>

google-cloud-storage/src/test/java/com/google/cloud/storage/TestUtils.java

@@ -310,9 +310,9 @@ public static boolean isOnComputeEngine() {
    * supported by GRPC.
    */
   public static Storage.BucketField[] filterOutHttpOnlyBucketFields(Storage.BucketField[] fields) {
-    return  Arrays.stream(fields)
-            .filter(f -> !f.equals(Storage.BucketField.OBJECT_RETENTION))
-            .collect(ImmutableSet.toImmutableSet())
-            .toArray(new Storage.BucketField[0]);
+    return Arrays.stream(fields)
+        .filter(f -> !f.equals(Storage.BucketField.OBJECT_RETENTION))
+        .collect(ImmutableSet.toImmutableSet())
+        .toArray(new Storage.BucketField[0]);
   }
 }

google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITAccessTest.java

@@ -151,7 +151,10 @@ public void bucket_defaultAcl_create() throws Exception {
       assertThat(actual.getEtag()).isNotEmpty();
 
       Bucket bucketUpdated =
-          storage.get(bucket.getName(), BucketGetOption.fields(TestUtils.filterOutHttpOnlyBucketFields(BucketField.values())));
+          storage.get(
+              bucket.getName(),
+              BucketGetOption.fields(
+                  TestUtils.filterOutHttpOnlyBucketFields(BucketField.values())));
       assertThat(bucketUpdated.getMetageneration()).isNotEqualTo(bucket.getMetageneration());
 
       // etags change when updates happen, drop before our comparison
@@ -204,7 +207,10 @@ public void bucket_defaultAcl_update() throws Exception {
       assertThat(actual.getEtag()).isNotEmpty();
 
       Bucket bucketUpdated =
-          storage.get(bucket.getName(), BucketGetOption.fields(TestUtils.filterOutHttpOnlyBucketFields(BucketField.values())));
+          storage.get(
+              bucket.getName(),
+              BucketGetOption.fields(
+                  TestUtils.filterOutHttpOnlyBucketFields(BucketField.values())));
       assertThat(bucketUpdated.getMetageneration()).isNotEqualTo(bucket.getMetageneration());
 
       // etags change when updates happen, drop before our comparison
@@ -256,7 +262,10 @@ public void bucket_defaultAcl_delete() throws Exception {
       assertThat(actual).isTrue();
 
       Bucket bucketUpdated =
-          storage.get(bucket.getName(), BucketGetOption.fields(TestUtils.filterOutHttpOnlyBucketFields(BucketField.values())));
+          storage.get(
+              bucket.getName(),
+              BucketGetOption.fields(
+                  TestUtils.filterOutHttpOnlyBucketFields(BucketField.values())));
       assertThat(bucketUpdated.getMetageneration()).isNotEqualTo(bucket.getMetageneration());
 
       // etags change when deletes happen, drop before our comparison

google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITBucketAclTest.java

@@ -128,7 +128,10 @@ public void bucket_acl_create() throws Exception {
       assertThat(actual.getEtag()).isNotEmpty();
 
       Bucket bucketUpdated =
-          storage.get(bucket.getName(), BucketGetOption.fields(TestUtils.filterOutHttpOnlyBucketFields(BucketField.values())));
+          storage.get(
+              bucket.getName(),
+              BucketGetOption.fields(
+                  TestUtils.filterOutHttpOnlyBucketFields(BucketField.values())));
       assertThat(bucketUpdated.getMetageneration()).isNotEqualTo(bucket.getMetageneration());
 
       // etags change when updates happen, drop before our comparison
@@ -178,7 +181,10 @@ public void bucket_acl_update() throws Exception {
       assertThat(actual.getEtag()).isNotEmpty();
 
       Bucket bucketUpdated =
-          storage.get(bucket.getName(), BucketGetOption.fields(TestUtils.filterOutHttpOnlyBucketFields(BucketField.values())));
+          storage.get(
+              bucket.getName(),
+              BucketGetOption.fields(
+                  TestUtils.filterOutHttpOnlyBucketFields(BucketField.values())));
       assertThat(bucketUpdated.getMetageneration()).isNotEqualTo(bucket.getMetageneration());
 
       // etags change when updates happen, drop before our comparison
@@ -221,7 +227,11 @@ public void bucket_acl_404_acl_update() throws Exception {
       assertThat(actual.getRole()).isEqualTo(readAll.getRole());
       assertThat(actual.getEtag()).isNotEmpty();
 
-      Bucket updated = storage.get(mgen1.getName(), BucketGetOption.fields(TestUtils.filterOutHttpOnlyBucketFields(BucketField.values())));
+      Bucket updated =
+          storage.get(
+              mgen1.getName(),
+              BucketGetOption.fields(
+                  TestUtils.filterOutHttpOnlyBucketFields(BucketField.values())));
       assertThat(updated.getMetageneration()).isNotEqualTo(bucket.getMetageneration());
 
       // etags change when updates happen, drop before our comparison
@@ -255,7 +265,10 @@ public void bucket_acl_delete() throws Exception {
       assertThat(actual).isTrue();
 
       Bucket bucketUpdated =
-          storage.get(bucket.getName(), BucketGetOption.fields(TestUtils.filterOutHttpOnlyBucketFields(BucketField.values())));
+          storage.get(
+              bucket.getName(),
+              BucketGetOption.fields(
+                  TestUtils.filterOutHttpOnlyBucketFields(BucketField.values())));
       assertThat(bucketUpdated.getMetageneration()).isNotEqualTo(bucket.getMetageneration());
 
       // etags change when deletes happen, drop before our comparison

google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITBucketReadMaskTest.java

@@ -139,7 +139,10 @@ public ImmutableList<?> parameters() {
           args.stream().map(Args::getField).map(Enum::name).sorted().collect(Collectors.toList());
 
       List<String> definedFields =
-          Arrays.stream(TestUtils.filterOutHttpOnlyBucketFields(BucketField.values())).map(Enum::name).sorted().collect(Collectors.toList());
+          Arrays.stream(TestUtils.filterOutHttpOnlyBucketFields(BucketField.values()))
+              .map(Enum::name)
+              .sorted()
+              .collect(Collectors.toList());
 
       assertThat(argsDefined).containsExactlyElementsIn(definedFields);
       return args;

google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITBucketTest.java

@@ -114,7 +114,10 @@ public void testGetBucketSelectedFields() {
   @Test
   public void testGetBucketAllSelectedFields() {
     Bucket remoteBucket =
-        storage.get(bucket.getName(), Storage.BucketGetOption.fields(TestUtils.filterOutHttpOnlyBucketFields(BucketField.values())));
+        storage.get(
+            bucket.getName(),
+            Storage.BucketGetOption.fields(
+                TestUtils.filterOutHttpOnlyBucketFields(BucketField.values())));
     assertEquals(bucket.getName(), remoteBucket.getName());
     assertNotNull(remoteBucket.getCreateTime());
   }

google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITOptionRegressionTest.java

@@ -327,7 +327,9 @@ public void storage_BucketGetOption_fields_BucketField() {
             "updated",
             "versioning",
             "website");
-    s.get(b.getName(), BucketGetOption.fields(TestUtils.filterOutHttpOnlyBucketFields(BucketField.values())));
+    s.get(
+        b.getName(),
+        BucketGetOption.fields(TestUtils.filterOutHttpOnlyBucketFields(BucketField.values())));
     requestAuditing.assertQueryParam("fields", expected, splitOnCommaToSet());
   }