Address PR comments and linter fixes

sydney-munro · sydney-munro · commit 5a7b24f66317 · 2022-05-16T11:42:50.000-07:00
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/BucketInfo.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/BucketInfo.java
@@ -701,10 +701,10 @@ public Integer getDaysSinceCustomTime() {
       }
 
       public List<String> getMatchesPrefix() {
-        return  matchesPrefix;
+        return matchesPrefix;
       }
 
-      public List<String> getMatchesSuffix()  {
+      public List<String> getMatchesSuffix() {
         return matchesSuffix;
       }
 
@@ -820,22 +820,20 @@ public Builder setDaysSinceCustomTime(Integer daysSinceCustomTime) {
         }
 
         /**
-         * Sets the list of prefixes.
-         * If any prefix matches the beginning of the object’s name,
-         * this portion of the condition is satisfied for that object.
+         * Sets the list of prefixes. If any prefix matches the beginning of the object’s name, this
+         * portion of the condition is satisfied for that object.
          */
         public Builder setMatchesPrefix(List<String> matchesPrefix) {
-          this.matchesPrefix = matchesPrefix;
+          this.matchesPrefix = matchesPrefix != null ? ImmutableList.copyOf(matchesPrefix) : null;
           return this;
         }
 
         /**
-         * Sets the list of suffixes.
-         * If any suffix matches the end of the object’s name,
-         * this portion of the condition is satisfied for that object.
+         * Sets the list of suffixes. If any suffix matches the end of the object’s name, this
+         * portion of the condition is satisfied for that object.
          */
         public Builder setMatchesSuffix(List<String> matchesSuffix) {
-          this.matchesSuffix = matchesSuffix;
+          this.matchesSuffix = matchesSuffix != null ? ImmutableList.copyOf(matchesSuffix) : null;
           return this;
         }
 
diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketInfoTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketInfoTest.java
@@ -369,7 +369,7 @@ public void testLifecycleRules() {
     assertEquals(StorageClass.COLDLINE.toString(), lifecycleRule.getAction().getStorageClass());
     assertEquals(30, lifecycleRule.getCondition().getDaysSinceCustomTime().intValue());
     assertNotNull(lifecycleRule.getCondition().getCustomTimeBefore());
-    assertEquals("prefix-",lifecycleRule.getCondition().getMatchesPrefix().get(0));
+    assertEquals("prefix-", lifecycleRule.getCondition().getMatchesPrefix().get(0));
     assertEquals("-suffix", lifecycleRule.getCondition().getMatchesSuffix().get(0));
 
     Rule unsupportedRule =
