--- jsr166/src/test/tck/AbstractExecutorServiceTest.java	2017/07/17 22:27:30	1.48
+++ jsr166/src/test/tck/AbstractExecutorServiceTest.java	2021/01/26 13:33:05	1.49
@@ -47,7 +47,7 @@ public class AbstractExecutorServiceTest
         public void shutdown() { shutdown = true; }
         public List<Runnable> shutdownNow() {
             shutdown = true;
-            return Collections.EMPTY_LIST;
+            return Collections.emptyList();
         }
         public boolean isShutdown() { return shutdown; }
         public boolean isTerminated() { return isShutdown(); }
@@ -111,7 +111,7 @@ public class AbstractExecutorServiceTest
         Runnable r = new CheckedRunnable() {
             public void realRun() throws Exception {
                 ExecutorService e = new DirectExecutorService();
-                Future future = e.submit(Executors.callable(new PrivilegedAction() {
+                Future<?> future = e.submit(Executors.callable(new PrivilegedAction<Object>() {
                     public Object run() {
                         return TEST_STRING;
                     }}));
@@ -132,7 +132,7 @@ public class AbstractExecutorServiceTest
         Runnable r = new CheckedRunnable() {
             public void realRun() throws Exception {
                 ExecutorService e = new DirectExecutorService();
-                Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
+                Future<?> future = e.submit(Executors.callable(new PrivilegedExceptionAction<Object>() {
                     public Object run() {
                         return TEST_STRING;
                     }}));
@@ -150,7 +150,7 @@ public class AbstractExecutorServiceTest
         Runnable r = new CheckedRunnable() {
             public void realRun() throws Exception {
                 ExecutorService e = new DirectExecutorService();
-                Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
+                Future<?> future = e.submit(Executors.callable(new PrivilegedExceptionAction<Object>() {
                     public Object run() throws Exception {
                         throw new IndexOutOfBoundsException();
                     }}));
@@ -213,7 +213,7 @@ public class AbstractExecutorServiceTest
                                    60, TimeUnit.SECONDS,
                                    new ArrayBlockingQueue<Runnable>(10));
         try (PoolCleaner cleaner = cleaner(p)) {
-            Callable c = new Callable() {
+            Callable<Object> c = new Callable<Object>() {
                 public Object call() { throw new ArithmeticException(); }};
             try {
                 p.submit(c).get();
@@ -584,7 +584,7 @@ public class AbstractExecutorServiceTest
                     e.invokeAll(tasks, timeout, MILLISECONDS);
                 assertEquals(tasks.size(), futures.size());
                 assertTrue(millisElapsedSince(startTime) >= timeout);
-                for (Future future : futures)
+                for (Future<?> future : futures)
                     assertTrue(future.isDone());
                 try {
                     assertEquals("0", futures.get(0).get());