From 029de3d9da0faa879f972837079720387c166244 Mon Sep 17 00:00:00 2001 From: Nathan Harmata Date: Mon, 27 Jul 2015 18:08:09 +0000 Subject: Make some skyframe and lib/skyframe classes public. -- MOS_MIGRATED_REVID=99197069 --- .../devtools/build/lib/skyframe/DirectoryListingFunction.java | 2 +- .../com/google/devtools/build/lib/skyframe/ExternalFilesHelper.java | 5 ++--- .../java/com/google/devtools/build/lib/skyframe/GlobFunction.java | 2 +- .../google/devtools/build/lib/skyframe/PackageLookupFunction.java | 4 ++-- .../com/google/devtools/build/lib/skyframe/PrecomputedValue.java | 6 +++--- .../google/devtools/build/lib/skyframe/WorkspaceFileFunction.java | 2 +- src/main/java/com/google/devtools/build/skyframe/Differencer.java | 2 +- 7 files changed, 11 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/DirectoryListingFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/DirectoryListingFunction.java index 93c3d752bf..46eb6f36ae 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/DirectoryListingFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/DirectoryListingFunction.java @@ -24,7 +24,7 @@ import javax.annotation.Nullable; /** * A {@link SkyFunction} for {@link DirectoryListingValue}s. */ -final class DirectoryListingFunction implements SkyFunction { +public final class DirectoryListingFunction implements SkyFunction { @Override public SkyValue compute(SkyKey skyKey, Environment env) diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ExternalFilesHelper.java b/src/main/java/com/google/devtools/build/lib/skyframe/ExternalFilesHelper.java index 745df2874b..ab25cd8145 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/ExternalFilesHelper.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/ExternalFilesHelper.java @@ -26,14 +26,13 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicReference; /** Common utilities for dealing with files outside the package roots. */ -class ExternalFilesHelper { +public class ExternalFilesHelper { private final AtomicReference pkgLocator; private final Set immutableDirs; private final boolean errorOnExternalFiles; - @VisibleForTesting - ExternalFilesHelper(AtomicReference pkgLocator) { + public ExternalFilesHelper(AtomicReference pkgLocator) { this(pkgLocator, ImmutableSet.of(), /*errorOnExternalFiles=*/false); } diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/GlobFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/GlobFunction.java index 942a201770..7e80689b72 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/GlobFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/GlobFunction.java @@ -39,7 +39,7 @@ import javax.annotation.Nullable; * *

This code drives the glob matching process. */ -final class GlobFunction implements SkyFunction { +public final class GlobFunction implements SkyFunction { private final Cache regexPatternCache = CacheBuilder.newBuilder().concurrencyLevel(4).build(); diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PackageLookupFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/PackageLookupFunction.java index 2c8cc8e83c..40bbdb6c7d 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/PackageLookupFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/PackageLookupFunction.java @@ -39,11 +39,11 @@ import javax.annotation.Nullable; /** * SkyFunction for {@link PackageLookupValue}s. */ -class PackageLookupFunction implements SkyFunction { +public class PackageLookupFunction implements SkyFunction { private final AtomicReference> deletedPackages; - PackageLookupFunction(AtomicReference> deletedPackages) { + public PackageLookupFunction(AtomicReference> deletedPackages) { this.deletedPackages = deletedPackages; } diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PrecomputedValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/PrecomputedValue.java index 8b0d0adbcb..e94cfdbc23 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/PrecomputedValue.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/PrecomputedValue.java @@ -72,10 +72,10 @@ public class PrecomputedValue implements SkyValue { return new Injected(precomputed, Suppliers.ofInstance(value)); } - static final Precomputed DEFAULTS_PACKAGE_CONTENTS = + public static final Precomputed DEFAULTS_PACKAGE_CONTENTS = new Precomputed<>(new SkyKey(SkyFunctions.PRECOMPUTED, "default_pkg")); - static final Precomputed DEFAULT_VISIBILITY = + public static final Precomputed DEFAULT_VISIBILITY = new Precomputed<>(new SkyKey(SkyFunctions.PRECOMPUTED, "default_visibility")); static final Precomputed BUILD_ID = @@ -173,7 +173,7 @@ public class PrecomputedValue implements SkyValue { /** * Injects a new variable value. */ - void set(Injectable injectable, T value) { + public void set(Injectable injectable, T value) { injectable.inject(ImmutableMap.of(key, new PrecomputedValue(value))); } } 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 59d864a826..945ce4294e 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 @@ -41,7 +41,7 @@ public class WorkspaceFileFunction implements SkyFunction { private final Path installDir; private final RuleClassProvider ruleClassProvider; - WorkspaceFileFunction( + public WorkspaceFileFunction( RuleClassProvider ruleClassProvider, PackageFactory packageFactory, BlazeDirectories directories) { diff --git a/src/main/java/com/google/devtools/build/skyframe/Differencer.java b/src/main/java/com/google/devtools/build/skyframe/Differencer.java index b520f16203..6658eb1cb6 100644 --- a/src/main/java/com/google/devtools/build/skyframe/Differencer.java +++ b/src/main/java/com/google/devtools/build/skyframe/Differencer.java @@ -24,7 +24,7 @@ public interface Differencer { /** * Represents a set of changed values. */ - interface Diff { + public interface Diff { /** * Returns the value keys whose values have changed, but for which we don't have the new values. */ -- cgit v1.2.3