Automatic code cleanup.

PiperOrigin-RevId: 425873532

Author: Googler

src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdeInfoProvider.java

@@ -310,7 +310,7 @@ public ImmutableMap<String, Depset> getNativeLibsStarlark() {
     for (Map.Entry<String, NestedSet<Artifact>> entry : getNativeLibs().entrySet()) {
       builder.put(entry.getKey(), Depset.of(Artifact.TYPE, entry.getValue()));
     }
-    return builder.build();
+    return builder.buildOrThrow();
   }
 
   /** Provider class for {@link AndroidIdeInfoProvider} objects. */
@@ -360,7 +360,7 @@ public AndroidIdeInfoProvider createInfo(
           ImmutableList.copyOf(
               Sequence.cast(idlGeneratedJavaFiles, Artifact.class, "idl_generated_java_files")),
           ImmutableList.copyOf(Sequence.cast(apksUnderTest, Artifact.class, "apks_under_test")),
-          builder.build(),
+          builder.buildOrThrow(),
           fromNoneable(resourceApk, Artifact.class));
     }
   }

src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdlHelper.java

@@ -272,7 +272,7 @@ private static ImmutableMap<Artifact, Artifact> generateTranslatedIdlArtifacts(
       Artifact output = ruleContext.getGenfilesArtifact(javaOutputPath.getPathString());
       outputJavaSources.put(idl, output);
     }
-    return outputJavaSources.build();
+    return outputJavaSources.buildOrThrow();
   }
 
   /**

src/main/java/com/google/devtools/build/lib/rules/android/AndroidManifest.java

@@ -285,11 +285,12 @@ private static Map<Artifact, Label> getMergeeManifests(
     }
     switch (manifestMergerOrder) {
       case ALPHABETICAL:
-        return ImmutableSortedMap.copyOf(builder.build(), Artifact.EXEC_PATH_COMPARATOR);
+        return ImmutableSortedMap.copyOf(builder.buildOrThrow(), Artifact.EXEC_PATH_COMPARATOR);
       case ALPHABETICAL_BY_CONFIGURATION:
-        return ImmutableSortedMap.copyOf(builder.build(), Artifact.ROOT_RELATIVE_PATH_COMPARATOR);
+        return ImmutableSortedMap.copyOf(
+            builder.buildOrThrow(), Artifact.ROOT_RELATIVE_PATH_COMPARATOR);
       case DEPENDENCY:
-        return builder.build();
+        return builder.buildOrThrow();
     }
     throw new AssertionError(manifestMergerOrder);
   }

src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuntimeJarProvider.java

@@ -64,7 +64,8 @@ public Builder addDesugaredJar(Artifact jar, Artifact desugared) {
 
     /** Returns the finished {@link AndroidRuntimeJarProvider}. */
     public AndroidRuntimeJarProvider build() {
-      return new AndroidRuntimeJarProvider(transitiveMappings.add(newlyDesugared.build()).build());
+      return new AndroidRuntimeJarProvider(
+          transitiveMappings.add(newlyDesugared.buildOrThrow()).build());
     }
   }
 

src/main/java/com/google/devtools/build/lib/rules/android/AndroidSplitTransition.java

@@ -146,7 +146,7 @@ private ImmutableMap<String, BuildOptions> handleAndroidPlatforms(
 
       addNonCpuSplits(result, platform.getName(), splitOptions);
     }
-    return result.build();
+    return result.buildOrThrow();
   }
 
   /** Returns a single-split transition that uses the "--cpu" and does not change any flags. */
@@ -156,7 +156,7 @@ private ImmutableMap<String, BuildOptions> handleDefaultSplit(
     ImmutableMap.Builder<String, BuildOptions> result = ImmutableMap.builder();
     result.put(cpu, buildOptions.underlying());
     addNonCpuSplits(result, cpu, buildOptions);
-    return result.build();
+    return result.buildOrThrow();
   }
 
   /**
@@ -196,7 +196,7 @@ private ImmutableMap<String, BuildOptions> handleFatApkCpus(
       result.put(cpu, splitOptions.underlying());
       addNonCpuSplits(result, cpu, splitOptions);
     }
-    return result.build();
+    return result.buildOrThrow();
   }
 
   private void setCcFlagsFromAndroid(

src/main/java/com/google/devtools/build/lib/rules/android/BusyBoxActionBuilder.java

@@ -352,7 +352,7 @@ public void buildAndRegister(String message, String mnemonic) {
       spawnActionBuilder.addCommandLine(commandLine.build(), FORCED_PARAM_FILE_INFO);
     }
 
-    spawnActionBuilder.setExecutionInfo(executionInfo.build());
+    spawnActionBuilder.setExecutionInfo(executionInfo.buildOrThrow());
 
     dataContext.registerAction(spawnActionBuilder);
   }

src/main/java/com/google/devtools/build/lib/runtime/BlazeServerStartupOptions.java

@@ -54,7 +54,7 @@ private String unescape(String input) {
     public Map<String, String> convert(String input) {
       ImmutableMap.Builder<String, String> builder = ImmutableMap.builder();
       if (input.isEmpty()) {
-        return builder.build();
+        return builder.buildOrThrow();
       }
 
       String[] elements = input.split(":");
@@ -66,7 +66,7 @@ public Map<String, String> convert(String input) {
         }
         builder.put(unescape(name), unescape(value));
       }
-      return builder.build();
+      return builder.buildOrThrow();
     }
 
     @Override

src/main/java/com/google/devtools/build/lib/runtime/BuildEventStreamer.java

@@ -370,14 +370,14 @@ private synchronized void close(@Nullable AbortReason reason) {
     for (BuildEventTransport transport : transports) {
       closeFuturesMapBuilder.put(transport, transport.close());
     }
-    closeFuturesMap = closeFuturesMapBuilder.build();
+    closeFuturesMap = closeFuturesMapBuilder.buildOrThrow();
 
     ImmutableMap.Builder<BuildEventTransport, ListenableFuture<Void>> halfCloseFuturesMapBuilder =
         ImmutableMap.builder();
     for (BuildEventTransport transport : transports) {
       halfCloseFuturesMapBuilder.put(transport, transport.getHalfCloseFuture());
     }
-    halfCloseFuturesMap = halfCloseFuturesMapBuilder.build();
+    halfCloseFuturesMap = halfCloseFuturesMapBuilder.buildOrThrow();
   }
 
   private void maybeReportArtifactSet(CompletionContext ctx, NestedSet<?> set) {

src/main/java/com/google/devtools/build/lib/runtime/GCStatsRecorder.java

@@ -35,7 +35,7 @@ public GCStatsRecorder(Iterable<GarbageCollectorMXBean> mxBeans) {
       initialData.put(name, new GCStat(name, mxBean.getCollectionCount(),
           mxBean.getCollectionTime()));
     }
-    this.initialData = initialData.build();
+    this.initialData = initialData.buildOrThrow();
   }
 
   public Iterable<GCStat> getCurrentGcStats() {

src/main/java/com/google/devtools/build/lib/runtime/ServerBuilder.java

@@ -60,7 +60,7 @@ InvocationPolicy getInvocationPolicy() {
   }
 
   ImmutableMap<String, InfoItem> getInfoItems() {
-    return infoItems.build();
+    return infoItems.buildOrThrow();
   }
 
   ImmutableList<QueryFunction> getQueryFunctions() {
@@ -196,6 +196,6 @@ public ServerBuilder addAuthHeadersProvider(
 
   /** Returns a map of all registered {@link AuthHeadersProvider}s. */
   public ImmutableMap<String, AuthHeadersProvider> getAuthHeadersProvidersMap() {
-    return authHeadersProvidersMap.build();
+    return authHeadersProvidersMap.buildOrThrow();
   }
 }