diff options
author | Nathan Harmata <nharmata@google.com> | 2015-11-09 22:10:56 +0000 |
---|---|---|
committer | Damien Martin-Guillerez <dmarting@google.com> | 2015-11-10 10:28:24 +0000 |
commit | 34f95d79a606348596c1dec0bd6b283a7514ece3 (patch) | |
tree | d04002cec439b890624ffeb4edd642a3826fb9eb /src/main/java/com/google/devtools/build | |
parent | 6edbf3b3fd0a6f2f49e08f74785571d4ff61185e (diff) |
Update @Nullable annotations for FilesystemValueChecker related stuff.
--
MOS_MIGRATED_REVID=107420673
Diffstat (limited to 'src/main/java/com/google/devtools/build')
4 files changed, 12 insertions, 15 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/BazelRepositoryModule.java b/src/main/java/com/google/devtools/build/lib/bazel/BazelRepositoryModule.java index ebd4efccb7..6a6be4399d 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/BazelRepositoryModule.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/BazelRepositoryModule.java @@ -139,14 +139,13 @@ public class BazelRepositoryModule extends BlazeModule { } @Override - public SkyValue createNewValue(SkyKey key, TimestampGranularityMonitor tsgm) { + public SkyValue createNewValue(SkyKey key, @Nullable TimestampGranularityMonitor tsgm) { throw new UnsupportedOperationException(); } @Override - @Nullable public DirtyResult check( - SkyKey skyKey, SkyValue skyValue, TimestampGranularityMonitor tsgm) { + SkyKey skyKey, SkyValue skyValue, @Nullable TimestampGranularityMonitor tsgm) { HttpDownloadValue httpDownloadValue = (HttpDownloadValue) skyValue; Path path = httpDownloadValue.getPath(); try { diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/DirtinessCheckerUtils.java b/src/main/java/com/google/devtools/build/lib/skyframe/DirtinessCheckerUtils.java index ed0c854d1a..eddbd9e3f7 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/DirtinessCheckerUtils.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/DirtinessCheckerUtils.java @@ -41,7 +41,7 @@ class DirtinessCheckerUtils { @Override @Nullable - public SkyValue createNewValue(SkyKey key, TimestampGranularityMonitor tsgm) { + public SkyValue createNewValue(SkyKey key, @Nullable TimestampGranularityMonitor tsgm) { RootedPath rootedPath = (RootedPath) key.argument(); try { return FileStateValue.create(rootedPath, tsgm); @@ -62,7 +62,7 @@ class DirtinessCheckerUtils { @Override @Nullable - public SkyValue createNewValue(SkyKey key, TimestampGranularityMonitor tsgm) { + public SkyValue createNewValue(SkyKey key, @Nullable TimestampGranularityMonitor tsgm) { RootedPath rootedPath = (RootedPath) key.argument(); try { return DirectoryListingStateValue.create(rootedPath); @@ -85,7 +85,7 @@ class DirtinessCheckerUtils { @Override @Nullable - public SkyValue createNewValue(SkyKey key, TimestampGranularityMonitor tsgm) { + public SkyValue createNewValue(SkyKey key, @Nullable TimestampGranularityMonitor tsgm) { return checker.createNewValue(key, tsgm); } } @@ -129,14 +129,13 @@ class DirtinessCheckerUtils { @Override @Nullable - public SkyValue createNewValue(SkyKey key, TimestampGranularityMonitor tsgm) { + public SkyValue createNewValue(SkyKey key, @Nullable TimestampGranularityMonitor tsgm) { return Preconditions.checkNotNull(getChecker(key), key).createNewValue(key, tsgm); } @Override - @Nullable public DirtyResult check(SkyKey key, @Nullable SkyValue oldValue, - TimestampGranularityMonitor tsgm) { + @Nullable TimestampGranularityMonitor tsgm) { return Preconditions.checkNotNull(getChecker(key), key).check(key, oldValue, tsgm); } } diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/FilesystemValueChecker.java b/src/main/java/com/google/devtools/build/lib/skyframe/FilesystemValueChecker.java index 57f64c4614..4c7efc36a0 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/FilesystemValueChecker.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/FilesystemValueChecker.java @@ -77,14 +77,14 @@ class FilesystemValueChecker { private AtomicInteger modifiedOutputFilesIntraBuildCounter = new AtomicInteger(0); FilesystemValueChecker(Supplier<Map<SkyKey, SkyValue>> valuesSupplier, - TimestampGranularityMonitor tsgm, @Nullable Range<Long> lastExecutionTimeRange) { + @Nullable TimestampGranularityMonitor tsgm, @Nullable Range<Long> lastExecutionTimeRange) { this.valuesSupplier = valuesSupplier; this.tsgm = tsgm; this.lastExecutionTimeRange = lastExecutionTimeRange; } - FilesystemValueChecker(final MemoizingEvaluator evaluator, TimestampGranularityMonitor tsgm, - @Nullable Range<Long> lastExecutionTimeRange) { + FilesystemValueChecker(final MemoizingEvaluator evaluator, + @Nullable TimestampGranularityMonitor tsgm, @Nullable Range<Long> lastExecutionTimeRange) { this.tsgm = tsgm; this.lastExecutionTimeRange = lastExecutionTimeRange; diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyValueDirtinessChecker.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyValueDirtinessChecker.java index 8fa15e1282..01e2272019 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyValueDirtinessChecker.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyValueDirtinessChecker.java @@ -34,14 +34,13 @@ public abstract class SkyValueDirtinessChecker { * was unable to create a new value. */ @Nullable - public abstract SkyValue createNewValue(SkyKey key, TimestampGranularityMonitor tsgm); + public abstract SkyValue createNewValue(SkyKey key, @Nullable TimestampGranularityMonitor tsgm); /** * If {@code applies(key)}, returns the result of checking whether this key's value is up to date. */ - @Nullable public DirtyResult check(SkyKey key, @Nullable SkyValue oldValue, - TimestampGranularityMonitor tsgm) { + @Nullable TimestampGranularityMonitor tsgm) { SkyValue newValue = createNewValue(key, tsgm); if (newValue == null) { return DirtyResult.dirty(oldValue); |