diff options
Diffstat (limited to 'src/main/java/com/google')
8 files changed, 3 insertions, 36 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/cmdline/Label.java b/src/main/java/com/google/devtools/build/lib/cmdline/Label.java index d1dcce76e7..f8e5643491 100644 --- a/src/main/java/com/google/devtools/build/lib/cmdline/Label.java +++ b/src/main/java/com/google/devtools/build/lib/cmdline/Label.java @@ -521,11 +521,6 @@ public final class Label implements Comparable<Label>, Serializable, SkylarkValu } @Override - public Label argument() { - return this; - } - - @Override public int hashCode() { return hashCode; } diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ArtifactSkyKey.java b/src/main/java/com/google/devtools/build/lib/skyframe/ArtifactSkyKey.java index 770fecc4e2..ebb910bdfa 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/ArtifactSkyKey.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/ArtifactSkyKey.java @@ -139,11 +139,6 @@ public final class ArtifactSkyKey { } @Override - public OwnedArtifact argument() { - return this; - } - - @Override public int hashCode() { // We use the hash code caching strategy employed by java.lang.String. There are three subtle // things going on here: diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternPhaseValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternPhaseValue.java index f59e884918..5d237076a1 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternPhaseValue.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternPhaseValue.java @@ -181,11 +181,6 @@ public final class TargetPatternPhaseValue implements SkyValue { return SkyFunctions.TARGET_PATTERN_PHASE; } - @Override - public Object argument() { - return this; - } - public ImmutableList<String> getTargetPatterns() { return targetPatterns; } diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternValue.java index 9d9ac22066..f36a4396d2 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternValue.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternValue.java @@ -188,11 +188,6 @@ public final class TargetPatternValue implements SkyValue { return SkyFunctions.TARGET_PATTERN; } - @Override - public Object argument() { - return this; - } - public String getPattern() { return parsedPattern.getOriginalPattern(); } diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TestSuiteExpansionValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/TestSuiteExpansionValue.java index cc2e04c9a0..1da1feeffb 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/TestSuiteExpansionValue.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/TestSuiteExpansionValue.java @@ -89,11 +89,6 @@ public final class TestSuiteExpansionValue implements SkyValue { return SkyFunctions.TEST_SUITE_EXPANSION; } - @Override - public Object argument() { - return this; - } - public ImmutableSet<Label> getTargets() { return targets; } diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TestsInSuiteValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/TestsInSuiteValue.java index 8a95b0b9d9..bed1646217 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/TestsInSuiteValue.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/TestsInSuiteValue.java @@ -89,11 +89,6 @@ final class TestsInSuiteValue implements SkyValue { return SkyFunctions.TESTS_IN_SUITE; } - @Override - public Object argument() { - return this; - } - public Rule getTestSuite() { return testSuite; } diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ToolchainResolutionValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/ToolchainResolutionValue.java index 1f553e6350..01909e6e8e 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/ToolchainResolutionValue.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/ToolchainResolutionValue.java @@ -44,11 +44,6 @@ public abstract class ToolchainResolutionValue implements SkyValue { return SkyFunctions.TOOLCHAIN_RESOLUTION; } - @Override - public ToolchainResolutionKey argument() { - return this; - } - public abstract BuildConfiguration configuration(); public abstract Label toolchainType(); diff --git a/src/main/java/com/google/devtools/build/skyframe/SkyKey.java b/src/main/java/com/google/devtools/build/skyframe/SkyKey.java index 2428f9cf80..814d478141 100644 --- a/src/main/java/com/google/devtools/build/skyframe/SkyKey.java +++ b/src/main/java/com/google/devtools/build/skyframe/SkyKey.java @@ -29,5 +29,7 @@ import java.io.Serializable; public interface SkyKey extends Serializable { SkyFunctionName functionName(); - Object argument(); + default Object argument() { + return this; + } } |