Remove Java 7 type inference workarounds and TODOs

Found by searching for TODOs mentioning "Java 7". There are plenty of other instances where we can simplify, but I don't want to be responsible for a large blast radius. At least in these cases we're fixing outdated comments.

RELNOTES: None
PiperOrigin-RevId: 161570189

10 files changed, 12 insertions, 34 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 80b0a0b1f8..35b2d7fa2e 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,8 +34,7 @@ public class AnalysisPhaseCompleteEvent {
   public AnalysisPhaseCompleteEvent(Collection<? extends ConfiguredTarget> topLevelTargets,
       int targetsVisited, long timeInMs) {
     this.timeInMs = timeInMs;
-    // Do not remove <ConfiguredTarget>: workaround for Java 7 type inference.
-    this.topLevelTargets = ImmutableList.<ConfiguredTarget>copyOf(topLevelTargets);
+    this.topLevelTargets = ImmutableList.copyOf(topLevelTargets);
     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 94c4f74fff..1680532f8c 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
@@ -611,10 +611,8 @@ public class BuildView {
     Collection<ConfiguredTarget> allTargetsToTest = null;
     if (testsToRun != null) {
       // Determine the subset of configured targets that are meant to be run as tests.
-      // Do not remove <ConfiguredTarget>: workaround for Java 7 type inference.
       allTargetsToTest =
-          Lists.<ConfiguredTarget>newArrayList(
-              filterTestsByTargets(configuredTargets, Sets.newHashSet(testsToRun)));
+          Lists.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 18a147e4bf..258c463784 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,8 +29,7 @@ public final class BuildInfoCollection {
 
   public BuildInfoCollection(List<? extends ActionAnalysisMetadata> actions,
       List<Artifact> stampedBuildInfo, List<Artifact> redactedBuildInfo) {
-    // Do not remove <Action>: workaround for Java 7 type inference.
-    this.actions = ImmutableList.<ActionAnalysisMetadata>copyOf(actions);
+    this.actions = ImmutableList.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 439cc3619c..1edbc0dfed 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
@@ -180,11 +180,7 @@ public final class BuildConfigurationCollection {
 
       this.configuration = configuration;
       this.transitionTable = ImmutableMap.copyOf(transitionTable);
-      // Do not remove <SplitTransition<?>, BuildConfiguration>:
-      // workaround for Java 7 type inference.
-      this.splitTransitionTable =
-          ImmutableListMultimap.<SplitTransition<?>, BuildConfiguration>copyOf(
-              splitTransitionTable);
+      this.splitTransitionTable = ImmutableListMultimap.copyOf(splitTransitionTable);
     }
 
     public Map<? extends Transition, ConfigurationHolder> getTransitionTable() {
diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/buildevent/ExecutionStartingEvent.java b/src/main/java/com/google/devtools/build/lib/buildtool/buildevent/ExecutionStartingEvent.java
index 14f3e2b3e3..1ebc5e8d3d 100644
--- a/src/main/java/com/google/devtools/build/lib/buildtool/buildevent/ExecutionStartingEvent.java
+++ b/src/main/java/com/google/devtools/build/lib/buildtool/buildevent/ExecutionStartingEvent.java
@@ -31,8 +31,7 @@ public class ExecutionStartingEvent {
    * @param targets Remaining active targets.
    */
   public ExecutionStartingEvent(Collection<? extends TransitiveInfoCollection> targets) {
-    // Do not remove <TransitiveInfoCollection>: workaround for Java 7 type inference.
-    this.targets = ImmutableList.<TransitiveInfoCollection>copyOf(targets);
+    this.targets = ImmutableList.copyOf(targets);
   }
 
   /**
diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/buildevent/TestFilteringCompleteEvent.java b/src/main/java/com/google/devtools/build/lib/buildtool/buildevent/TestFilteringCompleteEvent.java
index 72829ee07b..55d607bc06 100644
--- a/src/main/java/com/google/devtools/build/lib/buildtool/buildevent/TestFilteringCompleteEvent.java
+++ b/src/main/java/com/google/devtools/build/lib/buildtool/buildevent/TestFilteringCompleteEvent.java
@@ -42,13 +42,8 @@ public class TestFilteringCompleteEvent {
   public TestFilteringCompleteEvent(
       Collection<? extends ConfiguredTarget> targets,
       Collection<? extends ConfiguredTarget> testTargets) {
-    // Do not remove <ConfiguredTarget>: workaround for Java 7 type inference.
-    this.targets = ImmutableList.<ConfiguredTarget>copyOf(targets);
-    this.testTargets =
-        testTargets == null
-            ? null
-            // Do not remove <ConfiguredTarget>: workaround for Java 7 type inference.
-            : ImmutableList.<ConfiguredTarget>copyOf(testTargets);
+    this.targets = ImmutableList.copyOf(targets);
+    this.testTargets = testTargets == null ? null : ImmutableList.copyOf(testTargets);
     if (testTargets == null) {
       return;
     }
diff --git a/src/main/java/com/google/devtools/build/lib/graph/Digraph.java b/src/main/java/com/google/devtools/build/lib/graph/Digraph.java
index b6d913f2b1..33842634b9 100644
--- a/src/main/java/com/google/devtools/build/lib/graph/Digraph.java
+++ b/src/main/java/com/google/devtools/build/lib/graph/Digraph.java
@@ -1049,9 +1049,7 @@ public final class Digraph<T> implements Cloneable {
       return unordered;
     }
     List<Node<T>> result = new ArrayList<>(unordered);
-    // Do not inline this variable: a workaround for Java 7 type inference.
-    Comparator<Node<T>> nodeComparator = makeNodeComparator(comparator);
-    Collections.sort(result, nodeComparator);
+    Collections.sort(result, makeNodeComparator(comparator));
     return result;
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/packages/Attribute.java b/src/main/java/com/google/devtools/build/lib/packages/Attribute.java
index a312aeff95..0214a173f0 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/Attribute.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/Attribute.java
@@ -393,8 +393,7 @@ public final class Attribute implements Comparable<Attribute> {
     public AllowedValueSet(Iterable<?> values) {
       Preconditions.checkNotNull(values);
       Preconditions.checkArgument(!Iterables.isEmpty(values));
-      // Do not remove <Object>: workaround for Java 7 type inference.
-      allowedValues = ImmutableSet.<Object>copyOf(values);
+      allowedValues = ImmutableSet.copyOf(values);
     }
 
     @Override
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java
index 3bc2227645..53062499d6 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java
@@ -108,9 +108,7 @@ public class JavaBinary implements RuleConfiguredTargetFactory {
     JavaCompilationHelper helper = new JavaCompilationHelper(
         ruleContext, semantics, common.getJavacOpts(), attributesBuilder);
     List<TransitiveInfoCollection> deps =
-        // Do not remove <TransitiveInfoCollection>: workaround for Java 7 type inference.
-        Lists.<TransitiveInfoCollection>newArrayList(
-            common.targetsTreatedAsDeps(ClasspathType.COMPILE_ONLY));
+        Lists.newArrayList(common.targetsTreatedAsDeps(ClasspathType.COMPILE_ONLY));
     helper.addLibrariesToAttributes(deps);
     attributesBuilder.addNativeLibraries(
         collectNativeLibraries(common.targetsTreatedAsDeps(ClasspathType.BOTH)));
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java
index bb6fe7e905..51f9fd5591 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java
@@ -301,9 +301,7 @@ public class JavaCommon {
     // We need to check here because there are classes inheriting from this class that implement
     // rules that don't have this attribute.
     if (ruleContext.attributes().has("exports", BuildType.LABEL_LIST)) {
-      // Do not remove <SplitTransition<?>, BuildConfiguration>:
-      // workaround for Java 7 type inference.
-      return ImmutableList.<TransitiveInfoCollection>copyOf(
+      return ImmutableList.copyOf(
           ruleContext.getPrerequisites("exports", Mode.TARGET));
     } else {
       return ImmutableList.of();
@@ -562,8 +560,7 @@ public class JavaCommon {
     // We need to check here because there are classes inheriting from this class that implement
     // rules that don't have this attribute.
     if (ruleContext.attributes().has("runtime_deps", BuildType.LABEL_LIST)) {
-      // Do not remove <TransitiveInfoCollection>: workaround for Java 7 type inference.
-      return ImmutableList.<TransitiveInfoCollection>copyOf(
+      return ImmutableList.copyOf(
           ruleContext.getPrerequisites("runtime_deps", Mode.TARGET));
     } else {
       return ImmutableList.of();