Cleanup in PackageFactory, inline createPackage function.
createPackage was hard to read (both the definition and the call site) and
did nothing useful (just call another function). The name was also confusing:
it's not the standard way to create a package, since it's used only for tests.
#codehealth
--
MOS_MIGRATED_REVID=96288514
diff --git a/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java b/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java
index f42a21b..d2ec065 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java
@@ -996,29 +996,9 @@
* <p>Executes {@code globber.onCompletion()} on completion and executes
* {@code globber.onInterrupt()} on an {@link InterruptedException}.
*/
- private Package.LegacyBuilder createPackage(ExternalPackage externalPkg,
- PackageIdentifier packageId, Path buildFile, List<Statement> preludeStatements,
- ParserInputSource inputSource, Map<PathFragment, SkylarkEnvironment> imports,
- ImmutableList<Label> skylarkFileDependencies, CachingPackageLocator locator,
- RuleVisibility defaultVisibility, Globber globber)
- throws InterruptedException {
- StoredEventHandler localReporter = new StoredEventHandler();
- Preprocessor.Result preprocessingResult = preprocess(packageId, buildFile, inputSource, globber,
- localReporter);
- return createPackageFromPreprocessingResult(externalPkg, packageId, buildFile,
- preprocessingResult, localReporter.getEvents(), preludeStatements, imports,
- skylarkFileDependencies, locator, defaultVisibility, globber);
- }
-
- /**
- * Same as {@link #createPackage}, but using a {@link Preprocessor.Result} from
- * {@link #preprocess}.
- *
- * <p>Executes {@code globber.onCompletion()} on completion and executes
- * {@code globber.onInterrupt()} on an {@link InterruptedException}.
- */
// Used outside of bazel!
- public Package.LegacyBuilder createPackageFromPreprocessingResult(Package externalPkg,
+ public Package.LegacyBuilder createPackageFromPreprocessingResult(
+ Package externalPkg,
PackageIdentifier packageId,
Path buildFile,
Preprocessor.Result preprocessingResult,
@@ -1079,11 +1059,27 @@
throw new BuildFileContainsErrorsException(packageId, "IOException occured");
}
- Package result = createPackage((new ExternalPackage.Builder(
- buildFile.getRelative("WORKSPACE"))).build(), packageId, buildFile,
- ImmutableList.<Statement>of(), inputSource, ImmutableMap.<PathFragment,
- SkylarkEnvironment>of(), ImmutableList.<Label>of(), locator, ConstantRuleVisibility.PUBLIC,
- createLegacyGlobber(buildFile.getParentDirectory(), packageId, locator)).build();
+ StoredEventHandler localReporter = new StoredEventHandler();
+ Globber globber = createLegacyGlobber(buildFile.getParentDirectory(), packageId, locator);
+ Preprocessor.Result preprocessingResult =
+ preprocess(packageId, buildFile, inputSource, globber, localReporter);
+ ExternalPackage externalPkg =
+ new ExternalPackage.Builder(buildFile.getRelative("WORKSPACE")).build();
+
+ Package result =
+ createPackageFromPreprocessingResult(
+ externalPkg,
+ packageId,
+ buildFile,
+ preprocessingResult,
+ localReporter.getEvents(), /* preprocessingEvents */
+ ImmutableList.<Statement>of(), /* preludeStatements */
+ ImmutableMap.<PathFragment, SkylarkEnvironment>of(), /* imports */
+ ImmutableList.<Label>of(), /* skylarkFileDependencies */
+ locator,
+ ConstantRuleVisibility.PUBLIC, /* defaultVisibility */
+ globber)
+ .build();
Event.replayEventsOn(eventHandler, result.getEvents());
return result;
}
