commit 6977067e5727bdcbd4f41209bdad20b5018734b3
author ajurkowski <ajurkowski@google.com> Fri Jun 04 04:43:28 2021 -0700
committer Copybara-Service <copybara-worker@google.com> Fri Jun 04 04:44:37 2021 -0700
tree 61666f5522c25ccb338e5beb609f0ecf2528eb8c
parent f8c34080de1f9b935e3f6abf23b2a319e62c9052

Always return `ImmutableList` from `InvocationPolicyEnforcer::expandPolicy`.

Fix an error-prone warning about varying mutability of the returned value.

PiperOrigin-RevId: 377487160

src/main/java/com/google/devtools/common/options/InvocationPolicyEnforcer.java

diff --git a/src/main/java/com/google/devtools/common/options/InvocationPolicyEnforcer.java b/src/main/java/com/google/devtools/common/options/InvocationPolicyEnforcer.java
index 0e4420d..5ae079b 100644
--- a/src/main/java/com/google/devtools/common/options/InvocationPolicyEnforcer.java
+++ b/src/main/java/com/google/devtools/common/options/InvocationPolicyEnforcer.java
@@ -310,10 +310,10 @@
    *
    * <p>None of the flagPolicies returned should be on expansion flags.
    */
-  private static List<FlagPolicyWithContext> expandPolicy(
+  private static ImmutableList<FlagPolicyWithContext> expandPolicy(
       FlagPolicyWithContext originalPolicy, OptionsParser parser, Level loglevel)
       throws OptionsParsingException {
-    List<FlagPolicyWithContext> expandedPolicies = new ArrayList<>();
+    ImmutableList.Builder<FlagPolicyWithContext> expandedPolicies = ImmutableList.builder();
 
     boolean isExpansion = originalPolicy.description.isExpansion();
     ImmutableList<ParsedOptionDescription> subflags =
@@ -396,7 +396,7 @@
       expandedPolicies.add(originalPolicy);
     }
 
-    return expandedPolicies;
+    return expandedPolicies.build();
   }
 
   /**