Workaround javac 1.7 bug

--
MOS_MIGRATED_REVID=108243881

4 files changed, 13 insertions, 5 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/AnalysisPhaseCompleteEvent.java b/src/main/java/com/google/devtools/build/lib/analysis/AnalysisPhaseCompleteEvent.java
index a876bf0e7c..ab8019ac55 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/AnalysisPhaseCompleteEvent.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/AnalysisPhaseCompleteEvent.java
@@ -34,7 +34,8 @@ public class AnalysisPhaseCompleteEvent {
   public AnalysisPhaseCompleteEvent(Collection<? extends ConfiguredTarget> targets,
       int targetsVisited, long timeInMs) {
     this.timeInMs = timeInMs;
-    this.targets = ImmutableList.copyOf(targets);
+    // Do not remove <ConfiguredTarget>: workaround for Java 7 type inference.
+    this.targets = ImmutableList.<ConfiguredTarget>copyOf(targets);
     this.targetsVisited = targetsVisited;
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
index 53c484c147..85a5555fed 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
@@ -546,8 +546,10 @@ public class BuildView {
     Collection<ConfiguredTarget> allTargetsToTest = null;
     if (testsToRun != null) {
       // Determine the subset of configured targets that are meant to be run as tests.
-      allTargetsToTest = Lists.newArrayList(
-          filterTestsByTargets(configuredTargets, Sets.newHashSet(testsToRun)));
+      // Do not remove <ConfiguredTarget>: workaround for Java 7 type inference.
+      allTargetsToTest =
+          Lists.<ConfiguredTarget>newArrayList(
+              filterTestsByTargets(configuredTargets, Sets.newHashSet(testsToRun)));
     }
 
     Set<Artifact> artifactsToBuild = new HashSet<>();
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/buildinfo/BuildInfoCollection.java b/src/main/java/com/google/devtools/build/lib/analysis/buildinfo/BuildInfoCollection.java
index 3c988d3c2a..39b1d96f94 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/buildinfo/BuildInfoCollection.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/buildinfo/BuildInfoCollection.java
@@ -29,7 +29,8 @@ public final class BuildInfoCollection {
 
   public BuildInfoCollection(List<? extends Action> actions, List<Artifact> stampedBuildInfo,
       List<Artifact> redactedBuildInfo) {
-    this.actions = ImmutableList.copyOf(actions);
+    // Do not remove <Action>: workaround for Java 7 type inference.
+    this.actions = ImmutableList.<Action>copyOf(actions);
     this.stampedBuildInfo = ImmutableList.copyOf(stampedBuildInfo);
     this.redactedBuildInfo = ImmutableList.copyOf(redactedBuildInfo);
   }
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationCollection.java b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationCollection.java
index 00cb6f694b..4478e72548 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationCollection.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationCollection.java
@@ -167,7 +167,11 @@ public final class BuildConfigurationCollection {
         ListMultimap<? extends SplitTransition<?>, BuildConfiguration> splitTransitionTable) {
       this.configuration = configuration;
       this.transitionTable = ImmutableMap.copyOf(transitionTable);
-      this.splitTransitionTable = ImmutableListMultimap.copyOf(splitTransitionTable);
+      // Do not remove <SplitTransition<?>, BuildConfiguration>:
+      // workaround for Java 7 type inference.
+      this.splitTransitionTable =
+          ImmutableListMultimap.<SplitTransition<?>, BuildConfiguration>copyOf(
+              splitTransitionTable);
     }
 
     public Map<? extends Transition, ConfigurationHolder> getTransitionTable() {