diff options
Diffstat (limited to 'src/test/java')
5 files changed, 8 insertions, 8 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java b/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java index af9d68f79f..fbab01ae3a 100644 --- a/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java +++ b/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java @@ -155,7 +155,7 @@ public final class ActionsTestUtil { @Override protected Map<SkyKey, ValueOrUntypedException> getValueOrUntypedExceptions( - Iterable<SkyKey> depKeys) { + Iterable<? extends SkyKey> depKeys) { EvaluationResult<SkyValue> evaluationResult; Map<SkyKey, ValueOrUntypedException> result = new HashMap<>(); try { diff --git a/src/test/java/com/google/devtools/build/skyframe/DeterministicHelper.java b/src/test/java/com/google/devtools/build/skyframe/DeterministicHelper.java index 7876d57100..c6123769aa 100644 --- a/src/test/java/com/google/devtools/build/skyframe/DeterministicHelper.java +++ b/src/test/java/com/google/devtools/build/skyframe/DeterministicHelper.java @@ -90,8 +90,8 @@ public class DeterministicHelper extends NotifyingHelper { @Override public Map<SkyKey, ? extends NodeEntry> getBatch( - @Nullable SkyKey requestor, Reason reason, Iterable<SkyKey> keys) - throws InterruptedException { + @Nullable SkyKey requestor, Reason reason, Iterable<? extends SkyKey> keys) + throws InterruptedException { return makeDeterministic(super.getBatch(requestor, reason, keys)); } } @@ -119,8 +119,8 @@ public class DeterministicHelper extends NotifyingHelper { @Override public Map<SkyKey, ? extends NodeEntry> getBatch( - @Nullable SkyKey requestor, Reason reason, Iterable<SkyKey> keys) - throws InterruptedException { + @Nullable SkyKey requestor, Reason reason, Iterable<? extends SkyKey> keys) + throws InterruptedException { return makeDeterministic(super.getBatch(requestor, reason, keys)); } } diff --git a/src/test/java/com/google/devtools/build/skyframe/DeterministicInMemoryGraph.java b/src/test/java/com/google/devtools/build/skyframe/DeterministicInMemoryGraph.java index 786a527013..5314664499 100644 --- a/src/test/java/com/google/devtools/build/skyframe/DeterministicInMemoryGraph.java +++ b/src/test/java/com/google/devtools/build/skyframe/DeterministicInMemoryGraph.java @@ -49,7 +49,7 @@ class DeterministicInMemoryGraph extends DeterministicHelper.DeterministicProces @Override public Map<SkyKey, ? extends NodeEntry> getBatch( - @Nullable SkyKey requestor, Reason reason, Iterable<SkyKey> keys) { + @Nullable SkyKey requestor, Reason reason, Iterable<? extends SkyKey> keys) { try { return super.getBatch(requestor, reason, keys); } catch (InterruptedException e) { diff --git a/src/test/java/com/google/devtools/build/skyframe/NotifyingHelper.java b/src/test/java/com/google/devtools/build/skyframe/NotifyingHelper.java index 0ac49e5382..c24f54e418 100644 --- a/src/test/java/com/google/devtools/build/skyframe/NotifyingHelper.java +++ b/src/test/java/com/google/devtools/build/skyframe/NotifyingHelper.java @@ -88,7 +88,7 @@ public class NotifyingHelper { @Override public Map<SkyKey, ? extends NodeEntry> getBatch( - @Nullable SkyKey requestor, Reason reason, Iterable<SkyKey> keys) + @Nullable SkyKey requestor, Reason reason, Iterable<? extends SkyKey> keys) throws InterruptedException { return Maps.transformEntries( delegate.getBatch(requestor, reason, keys), diff --git a/src/test/java/com/google/devtools/build/skyframe/NotifyingInMemoryGraph.java b/src/test/java/com/google/devtools/build/skyframe/NotifyingInMemoryGraph.java index f1feac2df3..be268793a7 100644 --- a/src/test/java/com/google/devtools/build/skyframe/NotifyingInMemoryGraph.java +++ b/src/test/java/com/google/devtools/build/skyframe/NotifyingInMemoryGraph.java @@ -45,7 +45,7 @@ class NotifyingInMemoryGraph extends NotifyingHelper.NotifyingProcessableGraph @Override public Map<SkyKey, ? extends NodeEntry> getBatch( - @Nullable SkyKey requestor, Reason reason, Iterable<SkyKey> keys) { + @Nullable SkyKey requestor, Reason reason, Iterable<? extends SkyKey> keys) { try { return super.getBatch(requestor, reason, keys); } catch (InterruptedException e) { |