commit b6590823c23b96a6b17502c7fc3b149e12e14152
author jhorvitz <jhorvitz@google.com> Fri Aug 13 15:18:27 2021 -0700
committer Copybara-Service <copybara-worker@google.com> Fri Aug 13 15:20:00 2021 -0700
tree 33324f75ef359cba1e71bb882ef4360c64dce366
parent 7e01f401367960c28f67adf88572d2ab7dcd693f

Fix code warnings in various configuration-related classes.

PiperOrigin-RevId: 390704010

src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspect.java

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspect.java b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspect.java
index bc93f36..cfd539e 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspect.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspect.java
@@ -105,7 +105,7 @@
   }
 
   public static ConfiguredAspect forAlias(ConfiguredAspect real) {
-    return new ConfiguredAspect(real.getActions(), real.getProviders());
+    return new ConfiguredAspect(real.actions, real.providers);
   }
 
   public static ConfiguredAspect forNonapplicableTarget() {
@@ -148,7 +148,7 @@
       return this;
     }
 
-    private void checkProviderClass(Class<? extends TransitiveInfoProvider> providerClass) {
+    private static void checkProviderClass(Class<? extends TransitiveInfoProvider> providerClass) {
       Preconditions.checkNotNull(providerClass);
     }
 
@@ -175,12 +175,9 @@
      * Adds a set of files to an output group.
      */
     public Builder addOutputGroup(String name, NestedSet<Artifact> artifacts) {
-      NestedSetBuilder<Artifact> nestedSetBuilder = outputGroupBuilders.get(name);
-      if (nestedSetBuilder == null) {
-        nestedSetBuilder = NestedSetBuilder.<Artifact>stableOrder();
-        outputGroupBuilders.put(name, nestedSetBuilder);
-      }
-      nestedSetBuilder.addTransitive(artifacts);
+      outputGroupBuilders
+          .computeIfAbsent(name, k -> NestedSetBuilder.stableOrder())
+          .addTransitive(artifacts);
       return this;
     }
 
@@ -236,9 +233,7 @@
       }
 
       addProvider(
-          createExtraActionProvider(
-              /* actionsWithoutExtraAction= */ ImmutableSet.<ActionAnalysisMetadata>of(),
-              ruleContext));
+          createExtraActionProvider(/*actionsWithoutExtraAction=*/ ImmutableSet.of(), ruleContext));
 
       AnalysisEnvironment analysisEnvironment = ruleContext.getAnalysisEnvironment();
       GeneratingActions generatingActions =