Add more type annotations for the benefit of Java 7

--
Change-Id: I034fe094038a8fa62bcea3f410ae70174b947d79
Reviewed-on: https://bazel-review.googlesource.com/#/c/6432
MOS_MIGRATED_REVID=135210595

1 files changed, 11 insertions, 6 deletions

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 a0829826ab..4e258a9379 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
@@ -35,6 +35,7 @@ import com.google.devtools.build.lib.analysis.util.AnalysisTestCase;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
 import com.google.devtools.build.lib.packages.Attribute;
+import com.google.devtools.build.lib.packages.Package;
 import com.google.devtools.build.lib.packages.RuleClassProvider;
 import com.google.devtools.build.lib.packages.Target;
 import com.google.devtools.build.lib.skyframe.util.SkyframeExecutorTestUtils;
@@ -114,11 +115,15 @@ public class ConfigurationsForTargetsTest extends AnalysisTestCase {
       try {
         OrderedSetMultimap<Attribute, ConfiguredTarget> depMap =
             ConfiguredTargetFunction.computeDependencies(
-                env, new SkyframeDependencyResolver(env),
-                (TargetAndConfiguration) skyKey.argument(), null,
+                env,
+                new SkyframeDependencyResolver(env),
+                (TargetAndConfiguration) skyKey.argument(),
+                null,
                 ImmutableMap.<Label, ConfigMatchingProvider>of(),
-                stateProvider.lateBoundRuleClassProvider(), stateProvider.lateBoundHostConfig(),
-                NestedSetBuilder.stableOrder(), NestedSetBuilder.stableOrder());
+                stateProvider.lateBoundRuleClassProvider(),
+                stateProvider.lateBoundHostConfig(),
+                NestedSetBuilder.<Package>stableOrder(),
+                NestedSetBuilder.<Label>stableOrder());
         return env.valuesMissing() ? null : new Value(depMap);
       } catch (Exception e) {
         throw new EvalException(e);
@@ -216,7 +221,7 @@ public class ConfigurationsForTargetsTest extends AnalysisTestCase {
 
   @Test
   public void putOnlyEntryCorrectWithSetMultimap() throws Exception {
-    internalTestPutOnlyEntry(HashMultimap.create());
+    internalTestPutOnlyEntry(HashMultimap.<String, String>create());
   }
 
   /**
@@ -225,7 +230,7 @@ public class ConfigurationsForTargetsTest extends AnalysisTestCase {
    */
   @Test
   public void putOnlyEntryCorrectWithListMultimap() throws Exception {
-    internalTestPutOnlyEntry(ArrayListMultimap.create());
+    internalTestPutOnlyEntry(ArrayListMultimap.<String, String>create());
   }
 
   private void internalTestPutOnlyEntry(Multimap<String, String> map) throws Exception {