Apply error-prone fixes for MethodCanBeStatic in Skfyrame.
PiperOrigin-RevId: 305711825
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/DynamicCodec.java b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/DynamicCodec.java
index 4cc843f..2248b71 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/DynamicCodec.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/DynamicCodec.java
@@ -168,7 +168,7 @@
* @param type class of the field to deserialize
* @param offset unsafe offset into obj where the field should be written
*/
- private void deserializeField(
+ private static void deserializeField(
DeserializationContext context,
CodedInputStream codedIn,
Object obj,
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/JavaSerializableCodec.java b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/JavaSerializableCodec.java
index 8e304e5..987bd57 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/JavaSerializableCodec.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/JavaSerializableCodec.java
@@ -28,7 +28,7 @@
/** Naive ObjectCodec using Java native Serialization. Not performant, but a good fallback */
class JavaSerializableCodec implements ObjectCodec<Object> {
- private boolean isBlacklistedForJavaSerialization(Class<?> clazz) {
+ private static boolean isBlacklistedForJavaSerialization(Class<?> clazz) {
return MessageLite.class.isAssignableFrom(clazz);
}
@@ -87,6 +87,7 @@
}
/** Disables auto-registration. */
+ @SuppressWarnings("unused") // Used reflectively.
private static class JavaSerializableCodecRegisterer
implements CodecRegisterer<JavaSerializableCodec> {}
}
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/Memoizer.java b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/Memoizer.java
index 897242e..452bc55 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/Memoizer.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/Memoizer.java
@@ -263,7 +263,7 @@
return Preconditions.checkNotNull(memo.lookup(memoIndex), memoIndex);
}
- private <T> T safeCast(Object obj, ObjectCodec<T> codec) throws SerializationException {
+ private static <T> T safeCast(Object obj, ObjectCodec<T> codec) throws SerializationException {
if (obj == null) {
return null;
}
@@ -295,7 +295,7 @@
+ expectedTypes);
}
- private <T> T castedDeserialize(
+ private static <T> T castedDeserialize(
DeserializationContext context, ObjectCodec<T> codec, CodedInputStream codedIn)
throws IOException, SerializationException {
return safeCast(codec.deserialize(context, codedIn), codec);
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/ObjectCodecs.java b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/ObjectCodecs.java
index ea66921..9667d23 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/ObjectCodecs.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/ObjectCodecs.java
@@ -96,7 +96,7 @@
return deserializeImpl(codedIn, /*memoize=*/ true);
}
- private void serializeImpl(
+ private static void serializeImpl(
Object subject, CodedOutputStream codedOut, SerializationContext serializationContext)
throws SerializationException {
try {
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec/AutoCodecProcessor.java b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec/AutoCodecProcessor.java
index 583fc4f..1d5c0b75 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec/AutoCodecProcessor.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec/AutoCodecProcessor.java
@@ -285,7 +285,7 @@
return result;
}
- private String getNameFromGetter(ExecutableElement method) {
+ private static String getNameFromGetter(ExecutableElement method) {
String name = method.getSimpleName().toString();
if (name.startsWith("get")) {
return name.substring(3, 4).toLowerCase() + name.substring(4);
diff --git a/src/main/java/com/google/devtools/build/skyframe/EvaluationResult.java b/src/main/java/com/google/devtools/build/skyframe/EvaluationResult.java
index 0b32cb0..f9fc32a 100644
--- a/src/main/java/com/google/devtools/build/skyframe/EvaluationResult.java
+++ b/src/main/java/com/google/devtools/build/skyframe/EvaluationResult.java
@@ -117,11 +117,11 @@
* the keys in {@link #errorMap}.
*/
public <S> Collection<? extends S> keyNames() {
- return this.<S>getNames(resultMap.keySet());
+ return EvaluationResult.<S>getNames(resultMap.keySet());
}
@SuppressWarnings("unchecked")
- private <S> Collection<? extends S> getNames(Collection<SkyKey> keys) {
+ private static <S> Collection<? extends S> getNames(Collection<SkyKey> keys) {
Collection<S> names = Lists.newArrayListWithCapacity(keys.size());
for (SkyKey key : keys) {
names.add((S) key.argument());
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ActionExecutionInactivityWatchdogTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ActionExecutionInactivityWatchdogTest.java
index 986166b..ad4d828 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/ActionExecutionInactivityWatchdogTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/ActionExecutionInactivityWatchdogTest.java
@@ -28,7 +28,7 @@
@RunWith(JUnit4.class)
public class ActionExecutionInactivityWatchdogTest {
- private void assertInactivityWatchdogReports(final boolean shouldReport) throws Exception {
+ private static void assertInactivityWatchdogReports(final boolean shouldReport) throws Exception {
// The monitor implementation below is a state machine. This variable indicates which state
// it is in.
final int[] monitorState = new int[] {0};
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTest.java
index 0044761..28e4fef 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTest.java
@@ -295,7 +295,7 @@
.runTests();
}
- private void file(Path path, String contents) throws Exception {
+ private static void file(Path path, String contents) throws Exception {
FileSystemUtils.createDirectoryAndParents(path.getParentDirectory());
writeFile(path, contents);
}
@@ -333,11 +333,8 @@
ArtifactRoot.asDerivedRoot(root, "out"), execPath, ALL_OWNER, SpecialArtifactType.TREE);
}
- private TreeFileArtifact createFakeTreeFileArtifact(
- SpecialArtifact treeArtifact,
- String parentRelativePath,
- String content)
- throws Exception {
+ private static TreeFileArtifact createFakeTreeFileArtifact(
+ SpecialArtifact treeArtifact, String parentRelativePath, String content) throws Exception {
TreeFileArtifact treeFileArtifact =
ActionsTestUtil.createTreeFileArtifactWithNoGeneratingAction(
treeArtifact, parentRelativePath);
@@ -347,7 +344,7 @@
return treeFileArtifact;
}
- private void assertValueMatches(FileStatus file, byte[] digest, FileArtifactValue value)
+ private static void assertValueMatches(FileStatus file, byte[] digest, FileArtifactValue value)
throws IOException {
assertThat(value.getSize()).isEqualTo(file.getSize());
if (digest == null) {
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsTest.java
index 986fa1d..d0d73a4 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsTest.java
@@ -284,7 +284,7 @@
internalTestPutOnlyEntry(ArrayListMultimap.<String, String>create());
}
- private void internalTestPutOnlyEntry(Multimap<String, String> map) throws Exception {
+ private static void internalTestPutOnlyEntry(Multimap<String, String> map) throws Exception {
ConfigurationResolver.putOnlyEntry(map, "foo", "bar");
ConfigurationResolver.putOnlyEntry(map, "baz", "bar");
VerifyException e =
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java
index 5ea78f8..93efbec 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java
@@ -848,7 +848,7 @@
// TODO(bazel-team): Add some tests for FileSystemValueChecker#changedKeys*() methods.
// Presently these appear to be untested.
- private ActionExecutionValue actionValue(Action action) {
+ private static ActionExecutionValue actionValue(Action action) {
Map<Artifact, FileArtifactValue> artifactData = new HashMap<>();
for (Artifact output : action.getOutputs()) {
try {
@@ -874,7 +874,7 @@
/*actionDependsOnBuildId=*/ false);
}
- private ActionExecutionValue actionValueWithEmptyDirectory(Artifact emptyDir) {
+ private static ActionExecutionValue actionValueWithEmptyDirectory(Artifact emptyDir) {
TreeArtifactValue emptyValue = TreeArtifactValue.create
(ImmutableMap.<TreeFileArtifact, FileArtifactValue>of());
@@ -886,7 +886,8 @@
/*actionDependsOnBuildId=*/ false);
}
- private ActionExecutionValue actionValueWithTreeArtifacts(List<TreeFileArtifact> contents) {
+ private static ActionExecutionValue actionValueWithTreeArtifacts(
+ List<TreeFileArtifact> contents) {
Map<Artifact, FileArtifactValue> fileData = new HashMap<>();
Map<Artifact, Map<TreeFileArtifact, FileArtifactValue>> directoryData = new HashMap<>();
@@ -928,7 +929,7 @@
/*actionDependsOnBuildId=*/ false);
}
- private ActionExecutionValue actionValueWithRemoteTreeArtifact(
+ private static ActionExecutionValue actionValueWithRemoteTreeArtifact(
SpecialArtifact output, Map<PathFragment, RemoteFileArtifactValue> children) {
ImmutableMap.Builder<TreeFileArtifact, FileArtifactValue> childFileValues =
ImmutableMap.builder();
@@ -947,7 +948,7 @@
/* actionDependsOnBuildId= */ false);
}
- private ActionExecutionValue actionValueWithRemoteArtifact(
+ private static ActionExecutionValue actionValueWithRemoteArtifact(
Artifact output, RemoteFileArtifactValue value) {
return ActionExecutionValue.create(
Collections.singletonMap(output, value),
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunctionTest.java
index e8eeced..37933ce 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunctionTest.java
@@ -131,7 +131,7 @@
differencer, Optional.<RootedPath>absent());
}
- private SkyKey createKey(RootedPath directory) {
+ private static SkyKey createKey(RootedPath directory) {
return LocalRepositoryLookupValue.key(directory);
}
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/PlatformMappingFunctionParserTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/PlatformMappingFunctionParserTest.java
index dd039fe..70fa9dc 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/PlatformMappingFunctionParserTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/PlatformMappingFunctionParserTest.java
@@ -391,7 +391,7 @@
.contains("--compilation_mode=dbg");
}
- private PlatformMappingFunction.Mappings parse(String... lines)
+ private static PlatformMappingFunction.Mappings parse(String... lines)
throws PlatformMappingFunction.PlatformMappingException {
return new PlatformMappingFunction.Parser(ImmutableList.copyOf(lines).iterator()).parse();
}
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/PlatformMappingFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/PlatformMappingFunctionTest.java
index 5078061..141870d 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/PlatformMappingFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/PlatformMappingFunctionTest.java
@@ -259,7 +259,7 @@
return result.get(key);
}
- private BuildOptions toMappedOptions(BuildConfigurationValue.Key mapped) {
+ private static BuildOptions toMappedOptions(BuildConfigurationValue.Key mapped) {
return DEFAULT_BUILD_CONFIG_PLATFORM_OPTIONS.applyDiff(mapped.getOptionsDiff());
}
@@ -271,7 +271,7 @@
}
}
- private BuildConfigurationValue.Key keyForOptions(BuildOptions modifiedOptions) {
+ private static BuildConfigurationValue.Key keyForOptions(BuildOptions modifiedOptions) {
BuildOptions.OptionsDiffForReconstruction diff =
BuildOptions.diffForReconstruction(DEFAULT_BUILD_CONFIG_PLATFORM_OPTIONS, modifiedOptions);
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/PlatformMappingValueTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/PlatformMappingValueTest.java
index 8af34bf..eead1e7 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/PlatformMappingValueTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/PlatformMappingValueTest.java
@@ -30,7 +30,6 @@
import com.google.devtools.build.lib.vfs.PathFragment;
import com.google.devtools.common.options.OptionsParsingException;
import java.util.Collection;
-import java.util.Set;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@@ -42,8 +41,8 @@
// We don't actually care about the contents of this set other than that it is passed intact
// through the mapping logic. The platform fragment in it is purely an example, it could be any
// set of fragments.
- private static final Set<Class<? extends BuildConfiguration.Fragment>> PLATFORM_FRAGMENT_CLASS =
- ImmutableSet.of(PlatformConfiguration.class);
+ private static final ImmutableSet<Class<? extends BuildConfiguration.Fragment>>
+ PLATFORM_FRAGMENT_CLASS = ImmutableSet.of(PlatformConfiguration.class);
private static final ImmutableList<Class<? extends FragmentOptions>>
BUILD_CONFIG_PLATFORM_OPTIONS = ImmutableList.of(CoreOptions.class, PlatformOptions.class);
@@ -222,7 +221,7 @@
assertThat(key.wasExplicitlySetByUser()).isTrue();
}
- private BuildOptions toMappedOptions(BuildConfigurationValue.Key mapped) {
+ private static BuildOptions toMappedOptions(BuildConfigurationValue.Key mapped) {
return DEFAULT_BUILD_CONFIG_PLATFORM_OPTIONS.applyDiff(mapped.getOptionsDiff());
}
@@ -234,7 +233,7 @@
}
}
- private BuildConfigurationValue.Key keyForOptions(BuildOptions modifiedOptions) {
+ private static BuildConfigurationValue.Key keyForOptions(BuildOptions modifiedOptions) {
BuildOptions.OptionsDiffForReconstruction diff =
BuildOptions.diffForReconstruction(DEFAULT_BUILD_CONFIG_PLATFORM_OPTIONS, modifiedOptions);
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternFunctionTest.java
index b8ef67d..ee1335c 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternFunctionTest.java
@@ -37,12 +37,12 @@
@RunWith(JUnit4.class)
public final class PrepareDepsOfPatternFunctionTest extends BuildViewTestCase {
- private PrepareDepsOfPatternSkyKeysAndExceptions createPrepDepsKeysMaybe(
+ private static PrepareDepsOfPatternSkyKeysAndExceptions createPrepDepsKeysMaybe(
ImmutableList<String> patterns) {
return PrepareDepsOfPatternValue.keys(patterns, "");
}
- private SkyKey createPrepDepsKey(String pattern) {
+ private static SkyKey createPrepDepsKey(String pattern) {
PrepareDepsOfPatternSkyKeysAndExceptions keysAndExceptions =
PrepareDepsOfPatternValue.keys(ImmutableList.of(pattern), "");
assertThat(keysAndExceptions.getExceptions()).isEmpty();
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfTargetsUnderDirectoryFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfTargetsUnderDirectoryFunctionTest.java
index 0828077..2dc7541 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfTargetsUnderDirectoryFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfTargetsUnderDirectoryFunctionTest.java
@@ -45,26 +45,29 @@
@RunWith(JUnit4.class)
public class PrepareDepsOfTargetsUnderDirectoryFunctionTest extends BuildViewTestCase {
- private SkyKey createCollectPackagesKey(
+ private static SkyKey createCollectPackagesKey(
Path root, PathFragment rootRelativePath, ImmutableSet<PathFragment> excludedPaths) {
RootedPath rootedPath = RootedPath.toRootedPath(Root.fromPath(root), rootRelativePath);
return CollectPackagesUnderDirectoryValue.key(
RepositoryName.MAIN, rootedPath, excludedPaths);
}
- private SkyKey createPrepDepsKey(Path root, PathFragment rootRelativePath) {
+ private static SkyKey createPrepDepsKey(Path root, PathFragment rootRelativePath) {
return createPrepDepsKey(root, rootRelativePath, ImmutableSet.<PathFragment>of());
}
- private SkyKey createPrepDepsKey(Path root, PathFragment rootRelativePath,
- ImmutableSet<PathFragment> excludedPaths) {
+ private static SkyKey createPrepDepsKey(
+ Path root, PathFragment rootRelativePath, ImmutableSet<PathFragment> excludedPaths) {
RootedPath rootedPath = RootedPath.toRootedPath(Root.fromPath(root), rootRelativePath);
return PrepareDepsOfTargetsUnderDirectoryValue.key(
RepositoryName.MAIN, rootedPath, excludedPaths);
}
- private SkyKey createPrepDepsKey(Path root, PathFragment rootRelativePath,
- ImmutableSet<PathFragment> excludedPaths, FilteringPolicy filteringPolicy) {
+ private static SkyKey createPrepDepsKey(
+ Path root,
+ PathFragment rootRelativePath,
+ ImmutableSet<PathFragment> excludedPaths,
+ FilteringPolicy filteringPolicy) {
RootedPath rootedPath = RootedPath.toRootedPath(Root.fromPath(root), rootRelativePath);
return PrepareDepsOfTargetsUnderDirectoryValue.key(
RepositoryName.MAIN, rootedPath, excludedPaths, filteringPolicy);
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java
index c4043f2..4e24559 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java
@@ -349,7 +349,7 @@
}
@SafeVarargs
- private final void assertExpectedResolvedFilesPresent(
+ private static final void assertExpectedResolvedFilesPresent(
Map<PathFragment, ResolvedFile> nameToActualResolvedFiles,
ResolvedFile... expectedFilesIgnoringMetadata)
throws Exception {
@@ -447,9 +447,9 @@
}
}
- private void assertTraversalRootHashesAre(
+ private static void assertTraversalRootHashesAre(
boolean equal, RecursiveFilesystemTraversalValue a, RecursiveFilesystemTraversalValue b)
- throws Exception {
+ throws Exception {
if (equal) {
assertThat(a.getResolvedRoot().get().hashCode())
.isEqualTo(b.getResolvedRoot().get().hashCode());
@@ -459,12 +459,12 @@
}
}
- private void assertTraversalRootHashesAreEqual(
+ private static void assertTraversalRootHashesAreEqual(
RecursiveFilesystemTraversalValue a, RecursiveFilesystemTraversalValue b) throws Exception {
assertTraversalRootHashesAre(true, a, b);
}
- private void assertTraversalRootHashesAreNotEqual(
+ private static void assertTraversalRootHashesAreNotEqual(
RecursiveFilesystemTraversalValue a, RecursiveFilesystemTraversalValue b) throws Exception {
assertTraversalRootHashesAre(false, a, b);
}
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/RecursivePkgFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/RecursivePkgFunctionTest.java
index 517930e..63836ec 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/RecursivePkgFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/RecursivePkgFunctionTest.java
@@ -45,7 +45,7 @@
@RunWith(JUnit4.class)
public class RecursivePkgFunctionTest extends BuildViewTestCase {
- private SkyKey buildRecursivePkgKey(
+ private static SkyKey buildRecursivePkgKey(
Path root, PathFragment rootRelativePath, ImmutableSet<PathFragment> excludedPaths) {
RootedPath rootedPath = RootedPath.toRootedPath(Root.fromPath(root), rootRelativePath);
return RecursivePkgValue.key(
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutorTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutorTest.java
index 4ed7512..6b05df4 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutorTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutorTest.java
@@ -2227,7 +2227,7 @@
eventCollector, ".*after scanning.*\n.*Scanning.*\n.*Test dir/top.*");
}
- private AnalysisProtos.Artifact getArtifact(
+ private static AnalysisProtos.Artifact getArtifact(
String execPath, ActionGraphContainer actionGraphContainer) {
for (AnalysisProtos.Artifact artifact : actionGraphContainer.getArtifactsList()) {
if (execPath.equals(artifact.getExecPath())) {
@@ -2248,7 +2248,7 @@
actionGraphContainer);
}
- private AnalysisProtos.Action getGeneratingAction(
+ private static AnalysisProtos.Action getGeneratingAction(
String outputArtifactId, ActionGraphContainer actionGraphContainer) {
for (AnalysisProtos.Action action : actionGraphContainer.getActionsList()) {
for (String outputId : action.getOutputIdsList()) {
@@ -2260,7 +2260,8 @@
return null;
}
- private AnalysisProtos.Target getTarget(String label, ActionGraphContainer actionGraphContainer) {
+ private static AnalysisProtos.Target getTarget(
+ String label, ActionGraphContainer actionGraphContainer) {
for (AnalysisProtos.Target target : actionGraphContainer.getTargetsList()) {
if (label.equals(target.getLabel())) {
return target;
@@ -2269,7 +2270,7 @@
return null;
}
- private AnalysisProtos.AspectDescriptor getAspectDescriptor(
+ private static AnalysisProtos.AspectDescriptor getAspectDescriptor(
String aspectDescriptorId, ActionGraphContainer actionGraphContainer) {
for (AnalysisProtos.AspectDescriptor aspectDescriptor :
actionGraphContainer.getAspectDescriptorsList()) {
@@ -2280,7 +2281,7 @@
return null;
}
- private AnalysisProtos.RuleClass getRuleClass(
+ private static AnalysisProtos.RuleClass getRuleClass(
String ruleClassId, ActionGraphContainer actionGraphContainer) {
for (AnalysisProtos.RuleClass ruleClass : actionGraphContainer.getRuleClassesList()) {
if (ruleClassId.equals(ruleClass.getId())) {
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeAwareActionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeAwareActionTest.java
index 6c64bc9..4374c38 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeAwareActionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeAwareActionTest.java
@@ -364,7 +364,7 @@
}
/** Sanity check: ensure that a file's ctime was updated from an older value. */
- private void checkCtimeUpdated(Path path, long oldCtime) throws IOException {
+ private static void checkCtimeUpdated(Path path, long oldCtime) throws IOException {
if (oldCtime >= path.stat().getLastChangeTime()) {
throw new IllegalStateException(String.format("path=(%s), ctime=(%d)", path, oldCtime));
}
@@ -500,7 +500,7 @@
return RootedPath.toRootedPath(Root.fromPath(rootDirectory), PathFragment.create("action.dep"));
}
- private void appendToFile(Path path) throws Exception {
+ private static void appendToFile(Path path) throws Exception {
try (OutputStream stm = path.getOutputStream(/*append=*/ true)) {
stm.write("blah".getBytes(StandardCharsets.UTF_8));
}
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkFileContentHashTests.java b/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkFileContentHashTests.java
index 320f35f..72f8339 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkFileContentHashTests.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkFileContentHashTests.java
@@ -149,7 +149,7 @@
assertThat(getHash("pkg", "foo2")).isEqualTo(foo2);
}
- private void assertNotEquals(String hash, String hash2) {
+ private static void assertNotEquals(String hash, String hash2) {
assertThat(hash.equals(hash2)).isFalse();
}
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunctionTest.java
index 7cf3796..16fa8a9 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunctionTest.java
@@ -167,7 +167,7 @@
return result;
}
- private SkyKey key(String label) {
+ private static SkyKey key(String label) {
return SkylarkImportLookupValue.key(Label.parseAbsoluteUnchecked(label));
}
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/TargetPatternPhaseKeyTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/TargetPatternPhaseKeyTest.java
index e924375..2a764e0 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/TargetPatternPhaseKeyTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/TargetPatternPhaseKeyTest.java
@@ -85,9 +85,13 @@
.testEquals();
}
- private TargetPatternPhaseKey of(ImmutableList<String> targetPatterns, String offset,
+ private static TargetPatternPhaseKey of(
+ ImmutableList<String> targetPatterns,
+ String offset,
ImmutableList<String> buildTagFilter,
- boolean includeManualTests, boolean expandTestSuites, @Nullable TestFilter testFilter,
+ boolean includeManualTests,
+ boolean expandTestSuites,
+ @Nullable TestFilter testFilter,
Flag... flags) {
ImmutableSet<Flag> set = ImmutableSet.copyOf(flags);
boolean compileOneDependency = set.contains(Flag.COMPILE_ONE_DEPENDENCY);
@@ -97,11 +101,11 @@
determineTests, buildTagFilter, includeManualTests, expandTestSuites, testFilter);
}
- private TargetPatternPhaseKey of(ImmutableList<String> targetPatterns, String offset) {
+ private static TargetPatternPhaseKey of(ImmutableList<String> targetPatterns, String offset) {
return of(targetPatterns, offset, ImmutableList.<String>of(), false, true, null);
}
- private TestFilter emptyTestFilter() {
+ private static TestFilter emptyTestFilter() {
LoadingOptions options = Options.getDefaults(LoadingOptions.class);
return TestFilter.forOptions(options, NullEventHandler.INSTANCE, ImmutableSet.<String>of());
}
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactMetadataTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactMetadataTest.java
index e3dd1d7..60d89bf 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactMetadataTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactMetadataTest.java
@@ -222,7 +222,7 @@
assertThat(Throwables.getRootCause(e)).hasMessageThat().contains(exception.getMessage());
}
- private void file(Path path, String contents) throws Exception {
+ private static void file(Path path, String contents) throws Exception {
FileSystemUtils.createDirectoryAndParents(path.getParentDirectory());
writeFile(path, contents);
}
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunctionTest.java
index cc93fc8..2ad6bf2 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunctionTest.java
@@ -154,7 +154,7 @@
return ImmutableList.of();
}
- private Label getLabelMapping(Package pkg, String name) throws NoSuchTargetException {
+ private static Label getLabelMapping(Package pkg, String name) throws NoSuchTargetException {
return (Label) ((Rule) pkg.getTarget(name)).getAttributeContainer().getAttr("actual");
}
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/packages/BazelPackageLoaderTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/packages/BazelPackageLoaderTest.java
index 6bf3681..a783b76 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/packages/BazelPackageLoaderTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/packages/BazelPackageLoaderTest.java
@@ -58,7 +58,7 @@
fetchExternalRepo(RepositoryName.create("@bazel_tools"));
}
- private void mockEmbeddedTools(Path embeddedBinaries) throws IOException {
+ private static void mockEmbeddedTools(Path embeddedBinaries) throws IOException {
Path tools = embeddedBinaries.getRelative("embedded_tools");
tools.getRelative("tools/cpp").createDirectoryAndParents();
tools.getRelative("tools/osx").createDirectoryAndParents();
diff --git a/src/test/java/com/google/devtools/build/skyframe/ErrorInfoTest.java b/src/test/java/com/google/devtools/build/skyframe/ErrorInfoTest.java
index 7dc4f91..1298e64 100644
--- a/src/test/java/com/google/devtools/build/skyframe/ErrorInfoTest.java
+++ b/src/test/java/com/google/devtools/build/skyframe/ErrorInfoTest.java
@@ -46,7 +46,8 @@
}
}
- private void runTestFromException(boolean isDirectlyTransient, boolean isTransitivelyTransient) {
+ private static void runTestFromException(
+ boolean isDirectlyTransient, boolean isTransitivelyTransient) {
Exception exception = new IOException("ehhhhh");
SkyKey causeOfException = GraphTester.toSkyKey("CAUSE, 1234");
DummySkyFunctionException dummyException =
