From ed249612955ea24b459425204642022da9936fb3 Mon Sep 17 00:00:00 2001
From: brandjon <brandjon@google.com>
Date: Tue, 11 Jul 2017 22:06:22 +0200
Subject: 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
---
 .../lib/buildtool/buildevent/TestFilteringCompleteEvent.java     | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'src/main/java/com/google/devtools/build/lib/buildtool/buildevent/TestFilteringCompleteEvent.java')

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;
     }
-- 
cgit v1.2.3