From b689cc3ebcf9031780f7fc644317b7335f232ed1 Mon Sep 17 00:00:00 2001 From: Janak Ramakrishnan Date: Mon, 27 Jul 2015 15:43:43 +0000 Subject: Remove unused constructor and inline create method. -- Change-Id: Ica96bd719fe9d7e152fbe78e71669fddefe12e92 Reviewed-on: https://bazel-review.googlesource.com/#/c/1640/ MOS_MIGRATED_REVID=99182210 --- .../lib/skyframe/SequencedSkyframeExecutor.java | 59 ++++++++-------------- 1 file changed, 20 insertions(+), 39 deletions(-) (limited to 'src/main/java/com/google/devtools') diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java index a1ac8e2116..4d6fffcbd9 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java @@ -110,8 +110,11 @@ public final class SequencedSkyframeExecutor extends SkyframeExecutor { this.diffAwarenessManager = new DiffAwarenessManager(diffAwarenessFactories, reporter); } - private SequencedSkyframeExecutor(Reporter reporter, PackageFactory pkgFactory, - TimestampGranularityMonitor tsgm, BlazeDirectories directories, + public static SequencedSkyframeExecutor create( + Reporter reporter, + PackageFactory pkgFactory, + TimestampGranularityMonitor tsgm, + BlazeDirectories directories, Factory workspaceStatusActionFactory, ImmutableList buildInfoFactories, Set immutableDirectories, @@ -120,47 +123,25 @@ public final class SequencedSkyframeExecutor extends SkyframeExecutor { Preprocessor.Factory.Supplier preprocessorFactorySupplier, ImmutableMap extraSkyFunctions, ImmutableList extraPrecomputedValues) { - this(reporter, InMemoryMemoizingEvaluator.SUPPLIER, pkgFactory, tsgm, - directories, workspaceStatusActionFactory, buildInfoFactories, immutableDirectories, - diffAwarenessFactories, allowedMissingInputs, preprocessorFactorySupplier, - extraSkyFunctions, extraPrecomputedValues); - } - - private static SequencedSkyframeExecutor create(Reporter reporter, - EvaluatorSupplier evaluatorSupplier, PackageFactory pkgFactory, - TimestampGranularityMonitor tsgm, BlazeDirectories directories, - Factory workspaceStatusActionFactory, ImmutableList buildInfoFactories, - Set immutableDirectories, - Iterable diffAwarenessFactories, - Predicate allowedMissingInputs, - Preprocessor.Factory.Supplier preprocessorFactorySupplier, - ImmutableMap extraSkyFunctions, - ImmutableList extraPrecomputedValues) { - SequencedSkyframeExecutor skyframeExecutor = new SequencedSkyframeExecutor(reporter, - evaluatorSupplier, pkgFactory, tsgm, directories, workspaceStatusActionFactory, - buildInfoFactories, immutableDirectories, diffAwarenessFactories, allowedMissingInputs, - preprocessorFactorySupplier, - extraSkyFunctions, extraPrecomputedValues); + SequencedSkyframeExecutor skyframeExecutor = + new SequencedSkyframeExecutor( + reporter, + InMemoryMemoizingEvaluator.SUPPLIER, + pkgFactory, + tsgm, + directories, + workspaceStatusActionFactory, + buildInfoFactories, + immutableDirectories, + diffAwarenessFactories, + allowedMissingInputs, + preprocessorFactorySupplier, + extraSkyFunctions, + extraPrecomputedValues); skyframeExecutor.init(); return skyframeExecutor; } - public static SequencedSkyframeExecutor create(Reporter reporter, PackageFactory pkgFactory, - TimestampGranularityMonitor tsgm, BlazeDirectories directories, - Factory workspaceStatusActionFactory, - ImmutableList buildInfoFactories, - Set immutableDirectories, - Iterable diffAwarenessFactories, - Predicate allowedMissingInputs, - Preprocessor.Factory.Supplier preprocessorFactorySupplier, - ImmutableMap extraSkyFunctions, - ImmutableList extraPrecomputedValues) { - return create(reporter, InMemoryMemoizingEvaluator.SUPPLIER, pkgFactory, tsgm, - directories, workspaceStatusActionFactory, buildInfoFactories, immutableDirectories, - diffAwarenessFactories, allowedMissingInputs, preprocessorFactorySupplier, - extraSkyFunctions, extraPrecomputedValues); - } - @VisibleForTesting public static SequencedSkyframeExecutor create(Reporter reporter, PackageFactory pkgFactory, TimestampGranularityMonitor tsgm, BlazeDirectories directories, -- cgit v1.2.3