commit be83f13d14fe090b111ced12c835b4c092184ac9
author ulfjack <ulfjack@google.com> Tue Jul 18 18:12:09 2017 +0200
committer Klaus Aehlig <aehlig@google.com> Wed Jul 19 10:20:40 2017 +0200
tree 3eba07d8aa913aab9d49e7ee4d74bbdbde462326
parent 96b4081b29c639c24660411cc2d326afb826d9a7

Now that SkyKey is an interface, accept Iterable<? extends SkyKey>

A subsequent CL makes TargetPatternKey implement SkyKey, and it's much nicer
if I can pass lists of TargetPatternKey to the various Skyframe APIs.

PiperOrigin-RevId: 162359843

src/main/java/com/google/devtools/build/skyframe/AbstractSkyFunctionEnvironment.java

diff --git a/src/main/java/com/google/devtools/build/skyframe/AbstractSkyFunctionEnvironment.java b/src/main/java/com/google/devtools/build/skyframe/AbstractSkyFunctionEnvironment.java
index 7ddd11b..7c5deab 100644
--- a/src/main/java/com/google/devtools/build/skyframe/AbstractSkyFunctionEnvironment.java
+++ b/src/main/java/com/google/devtools/build/skyframe/AbstractSkyFunctionEnvironment.java
@@ -105,7 +105,7 @@
           E4 extends Exception,
           E5 extends Exception>
       Map<SkyKey, ValueOrException5<E1, E2, E3, E4, E5>> getValueOrExceptions(
-          Iterable<SkyKey> depKeys,
+          Iterable<? extends SkyKey> depKeys,
           final Class<E1> exceptionClass1,
           final Class<E2> exceptionClass2,
           final Class<E3> exceptionClass3,
@@ -169,7 +169,7 @@
 
   /** Implementations should set {@link #valuesMissing} as necessary. */
   protected abstract Map<SkyKey, ValueOrUntypedException> getValueOrUntypedExceptions(
-      Iterable<SkyKey> depKeys) throws InterruptedException;
+      Iterable<? extends SkyKey> depKeys) throws InterruptedException;
 
   @Override
   @Nullable
@@ -257,7 +257,7 @@
 
   @Override
   public <E extends Exception> Map<SkyKey, ValueOrException<E>> getValuesOrThrow(
-      Iterable<SkyKey> depKeys, Class<E> exceptionClass) throws InterruptedException {
+      Iterable<? extends SkyKey> depKeys, Class<E> exceptionClass) throws InterruptedException {
     return Maps.transformValues(
         getValuesOrThrow(depKeys, exceptionClass, BottomException.class),
         makeSafeDowncastToVOEFunction(exceptionClass));
@@ -266,8 +266,8 @@
   @Override
   public <E1 extends Exception, E2 extends Exception>
       Map<SkyKey, ValueOrException2<E1, E2>> getValuesOrThrow(
-          Iterable<SkyKey> depKeys, Class<E1> exceptionClass1, Class<E2> exceptionClass2)
-          throws InterruptedException {
+          Iterable<? extends SkyKey> depKeys, Class<E1> exceptionClass1, Class<E2> exceptionClass2)
+              throws InterruptedException {
     return Maps.transformValues(
         getValuesOrThrow(depKeys, exceptionClass1, exceptionClass2, BottomException.class),
         makeSafeDowncastToVOE2Function(exceptionClass1, exceptionClass2));
@@ -276,11 +276,11 @@
   @Override
   public <E1 extends Exception, E2 extends Exception, E3 extends Exception>
       Map<SkyKey, ValueOrException3<E1, E2, E3>> getValuesOrThrow(
-          Iterable<SkyKey> depKeys,
+          Iterable<? extends SkyKey> depKeys,
           Class<E1> exceptionClass1,
           Class<E2> exceptionClass2,
           Class<E3> exceptionClass3)
-          throws InterruptedException {
+              throws InterruptedException {
     return Maps.transformValues(
         getValuesOrThrow(depKeys, exceptionClass1, exceptionClass2, exceptionClass3,
             BottomException.class),
@@ -290,12 +290,12 @@
   @Override
   public <E1 extends Exception, E2 extends Exception, E3 extends Exception, E4 extends Exception>
       Map<SkyKey, ValueOrException4<E1, E2, E3, E4>> getValuesOrThrow(
-          Iterable<SkyKey> depKeys,
+          Iterable<? extends SkyKey> depKeys,
           Class<E1> exceptionClass1,
           Class<E2> exceptionClass2,
           Class<E3> exceptionClass3,
           Class<E4> exceptionClass4)
-          throws InterruptedException {
+           throws InterruptedException {
     return Maps.transformValues(
         getValuesOrThrow(depKeys, exceptionClass1, exceptionClass2, exceptionClass3,
             exceptionClass4, BottomException.class),
@@ -311,13 +311,13 @@
           E4 extends Exception,
           E5 extends Exception>
       Map<SkyKey, ValueOrException5<E1, E2, E3, E4, E5>> getValuesOrThrow(
-          Iterable<SkyKey> depKeys,
+          Iterable<? extends SkyKey> depKeys,
           Class<E1> exceptionClass1,
           Class<E2> exceptionClass2,
           Class<E3> exceptionClass3,
           Class<E4> exceptionClass4,
           Class<E5> exceptionClass5)
-          throws InterruptedException {
+              throws InterruptedException {
     Map<SkyKey, ValueOrException5<E1, E2, E3, E4, E5>> result =
         getValueOrExceptions(
             depKeys,