Automatic code cleanup.
PiperOrigin-RevId: 425495619
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionFunction.java
index f646fb8..27add1d 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionFunction.java
@@ -197,7 +197,7 @@
builder.put((String) entry.getKey().argument(), envValue.getValue());
}
}
- clientEnv = builder.build();
+ clientEnv = builder.buildOrThrow();
} else {
clientEnv = ImmutableMap.of();
}
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionValue.java
index d75e6fd..ab125f1 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionValue.java
@@ -257,7 +257,7 @@
action);
result.put(newArtifact, transform.apply(newArtifact, entry.getValue()));
}
- return result.build();
+ return result.buildOrThrow();
}
/** Transforms the children of a {@link TreeArtifactValue} so that owners are consistent. */
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/CollectPackagesUnderDirectoryFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/CollectPackagesUnderDirectoryFunction.java
index c71df9b..f73cb01 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/CollectPackagesUnderDirectoryFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/CollectPackagesUnderDirectoryFunction.java
@@ -91,7 +91,7 @@
builder.put(recursivePkgKey.getRootedPath(), packagesOrErrorsInSubdirectory);
}
- ImmutableMap<RootedPath, Boolean> subdirectories = builder.build();
+ ImmutableMap<RootedPath, Boolean> subdirectories = builder.buildOrThrow();
String errorMessage = consumer.getErrorMessage();
if (errorMessage != null) {
return CollectPackagesUnderDirectoryValue.ofError(errorMessage, subdirectories);
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java
index c2938be..84d4e7c 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java
@@ -941,7 +941,8 @@
}
}
- return ConfigConditions.create(asConfiguredTargets.build(), asConfigConditions.build());
+ return ConfigConditions.create(
+ asConfiguredTargets.buildOrThrow(), asConfigConditions.buildOrThrow());
}
/**
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/EnvironmentBackedRecursivePackageProvider.java b/src/main/java/com/google/devtools/build/lib/skyframe/EnvironmentBackedRecursivePackageProvider.java
index acb616e..9bef1c7 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/EnvironmentBackedRecursivePackageProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/EnvironmentBackedRecursivePackageProvider.java
@@ -135,7 +135,7 @@
for (PackageIdentifier pkgId : pkgIds) {
builder.put(pkgId, getPackage(env.getListener(), pkgId));
}
- return builder.build();
+ return builder.buildOrThrow();
}
@SuppressWarnings("ThrowsUncheckedException") // Good for callers to know about MissingDep.
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/GraphBackedRecursivePackageProvider.java b/src/main/java/com/google/devtools/build/lib/skyframe/GraphBackedRecursivePackageProvider.java
index f61cecf..ebff344 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/GraphBackedRecursivePackageProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/GraphBackedRecursivePackageProvider.java
@@ -166,7 +166,7 @@
Throwables.propagateIfInstanceOf(exception, NoSuchPackageException.class);
Throwables.propagate(exception);
}
- return pkgResults.build();
+ return pkgResults.buildOrThrow();
}
@Override
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PlatformMappingFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/PlatformMappingFunction.java
index 63be507..9d68400 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/PlatformMappingFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/PlatformMappingFunction.java
@@ -187,7 +187,7 @@
}
try {
- return platformsToFlags.build();
+ return platformsToFlags.buildOrThrow();
} catch (IllegalArgumentException e) {
throw parsingException(
"Got duplicate platform entries but each platform key must be unique", e);
@@ -204,7 +204,7 @@
}
try {
- return flagsToPlatforms.build();
+ return flagsToPlatforms.buildOrThrow();
} catch (IllegalArgumentException e) {
throw parsingException("Got duplicate flags entries but each flags key must be unique", e);
}
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/RecursiveDirectoryTraversalFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/RecursiveDirectoryTraversalFunction.java
index 130e78b..78b0241 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/RecursiveDirectoryTraversalFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/RecursiveDirectoryTraversalFunction.java
@@ -207,6 +207,6 @@
return ImmutableMap.<SkyKey, SkyValue>builder()
.putAll(subdirectorySkyValuesFromDeps)
.putAll(additionalValuesToAggregate)
- .build();
+ .buildOrThrow();
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/RecursivePackageProviderBackedTargetPatternResolver.java b/src/main/java/com/google/devtools/build/lib/skyframe/RecursivePackageProviderBackedTargetPatternResolver.java
index 56a5a59..1d14e1a 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/RecursivePackageProviderBackedTargetPatternResolver.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/RecursivePackageProviderBackedTargetPatternResolver.java
@@ -164,7 +164,7 @@
Package pkg = pkgs.get(pkgId);
result.put(pkgId, TargetPatternResolverUtil.resolvePackageTargets(pkg, policy));
}
- return result.build();
+ return result.buildOrThrow();
} catch (NoSuchThingException e) {
String message =
TargetPatternResolverUtil.getParsingErrorMessage(e.getMessage(), originalPattern);
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SingleToolchainResolutionFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/SingleToolchainResolutionFunction.java
index 379166f..5fb7636 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SingleToolchainResolutionFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SingleToolchainResolutionFunction.java
@@ -205,7 +205,7 @@
}
}
- ImmutableMap<ConfiguredTargetKey, Label> resolvedToolchainLabels = builder.build();
+ ImmutableMap<ConfiguredTargetKey, Label> resolvedToolchainLabels = builder.buildOrThrow();
if (toolchainType == null || resolvedToolchainLabels.isEmpty()) {
debugMessage(
eventHandler,
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyFunctionEnvironmentForTesting.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyFunctionEnvironmentForTesting.java
index 23579ad..80bf8b7 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyFunctionEnvironmentForTesting.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyFunctionEnvironmentForTesting.java
@@ -55,7 +55,7 @@
for (SkyKey depKey : ImmutableSet.copyOf(depKeys)) {
resultMap.put(depKey, ValueOrUntypedException.ofValueUntyped(evaluationResult.get(depKey)));
}
- return resultMap.build();
+ return resultMap.buildOrThrow();
}
@Override
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java
index ed380a4..470d092 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java
@@ -1263,7 +1263,7 @@
packageRoots.put(pkg.getPackageIdentifier(), pkg.getSourceRoot().get());
}
}
- return packageRoots.build();
+ return packageRoots.buildOrThrow();
}
@Nullable
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternPhaseFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternPhaseFunction.java
index df7bc71..afe22ac 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternPhaseFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternPhaseFunction.java
@@ -243,7 +243,7 @@
expandedTargets.getTargets(),
ImmutableList.copyOf(failedPatterns),
mapOriginalPatternsToLabels(expandedPatterns, targets.getTargets()),
- testSuiteExpansions.build()));
+ testSuiteExpansions.buildOrThrow()));
env.getListener()
.post(new LoadingPhaseCompleteEvent(result.getTargetLabels(), removedTargetLabels));
return result;
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TraversalInfoRootPackageExtractor.java b/src/main/java/com/google/devtools/build/lib/skyframe/TraversalInfoRootPackageExtractor.java
index 978a382..cdaa014 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/TraversalInfoRootPackageExtractor.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/TraversalInfoRootPackageExtractor.java
@@ -148,7 +148,8 @@
CollectPackagesUnderDirectoryValue.key(
repository, traversalInfo.rootedDir, traversalInfo.forbiddenSubdirectories));
}
- ImmutableMap<TraversalInfo, SkyKey> traversalToKeyMap = traversalToKeyMapBuilder.build();
+ ImmutableMap<TraversalInfo, SkyKey> traversalToKeyMap =
+ traversalToKeyMapBuilder.buildOrThrow();
Map<SkyKey, SkyValue> values = graph.getSuccessfulValues(traversalToKeyMap.values());
// NOTE: Use a TreeSet to ensure a deterministic (sorted) iteration order when we recurse.
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunction.java
index 7da227df..c8e8333 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunction.java
@@ -447,7 +447,7 @@
}
}
}
- return builder.build();
+ return builder.buildOrThrow();
}
private static final class WorkspaceFileFunctionException extends SkyFunctionException {
