Review annotations

src/main/org/apache/tools/ant/DirectoryScanner.java

@@ -613,7 +613,6 @@ public class DirectoryScanner
      *
      * @since Ant 1.6
      */
-    @SuppressWarnings("deprecated")
     public static void resetDefaultExcludes() {
         synchronized (defaultExcludes) {
             defaultExcludes.clear();

src/main/org/apache/tools/ant/RuntimeConfigurable.java

@@ -119,6 +119,7 @@ public class RuntimeConfigurable implements Serializable {
     }
 
     private static class EnableAttributeConsumer {
+        @SuppressWarnings("unused")
         public void add(EnableAttribute b) {
             // Ignore
         }
@@ -176,7 +177,7 @@ public class RuntimeConfigurable implements Serializable {
      *              false.
      * @since 1.9.1
      */
-    @SuppressWarnings("deprecated")
+    @SuppressWarnings("deprecation")
     public boolean isEnabled(UnknownElement owner) {
         if (!namespacedAttribute) {
             return true;

src/main/org/apache/tools/ant/input/SecureInputHandler.java

@@ -38,6 +38,7 @@ public class SecureInputHandler extends DefaultInputHandler {
      * @param request the request to handle
      * @throws BuildException if not possible to read from console
      */
+    @SuppressWarnings("unused")
     public void handleInput(InputRequest request) throws BuildException {
         String prompt = getPrompt(request);
         do {

src/main/org/apache/tools/ant/launch/Locator.java

@@ -470,7 +470,6 @@ public final class Locator {
      * @exception MalformedURLException if the URLs for the files cannot be
      *            formed.
      */
-    @SuppressWarnings("deprecated")
     public static URL[] getLocationURLs(File location,
                                         final String... extensions)
             throws MalformedURLException {

src/main/org/apache/tools/ant/listener/Log4jListener.java

@@ -44,6 +44,7 @@ public class Log4jListener implements BuildListener {
      */
     public Log4jListener() {
         // trigger the log4j initialization (if at all it's not yet initialized)
+        @SuppressWarnings("unused")
         final Logger log = Logger.getLogger(LOG_ANT);
     }
 

src/main/org/apache/tools/ant/taskdefs/Concat.java

@@ -601,7 +601,6 @@ public class Concat extends Task implements ResourceCollection {
      *              input files.
      * @since Ant 1.8.2
      */
-    @SuppressWarnings("deprecated")
     public void setOverwrite(boolean forceOverwrite) {
         setForce(forceOverwrite);
     }

src/main/org/apache/tools/ant/taskdefs/CopyPath.java

@@ -63,6 +63,7 @@ public class CopyPath extends Task {
     private File destDir;
 
     // TODO not read, yet in a public setter
+    @SuppressWarnings("unused")
     private long granularity = FILE_UTILS.getFileTimestampGranularity();
 
     private boolean preserveLastModified = false;

src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java

@@ -706,7 +706,6 @@ public abstract class DefaultCompilerAdapter
      * @return true if JDK 9
      * @since Ant 1.9.8
      */
-    @SuppressWarnings("deprecated")
     protected boolean assumeJava9() {
         return assumeJava19();
     }

src/main/org/apache/tools/ant/taskdefs/email/Message.java

@@ -109,6 +109,7 @@ public class Message extends ProjectComponent {
      * @param ps The print stream to write to
      * @throws IOException if an error occurs
      */
+    @SuppressWarnings("resource")
     public void print(PrintStream ps) throws IOException {
         // We need character encoding aware printing here.
         // So, using BufferedWriter over OutputStreamWriter instead of PrintStream

src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java

@@ -375,7 +375,6 @@ public class XMLValidateTask extends Task {
      * we have created and wrapped a SAX1 parser.
      * @return the new XMLReader.
      */
-    @SuppressWarnings("deprecated")
     protected XMLReader createXmlReader() {
         Object reader = null;
         if (readerClassName == null) {

src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java

@@ -389,7 +389,6 @@ public class JDependTask extends Task {
      * @exception BuildException if an error occurs
      */
     @Override
-    @SuppressWarnings("deprecated")
     public void execute() throws BuildException {
 
         CommandlineJava commandline = new CommandlineJava();
@@ -628,7 +627,6 @@ public class JDependTask extends Task {
         return new ExecuteWatchdog(getTimeout());
     }
 
-    @SuppressWarnings("deprecated")
     private Optional<Path> getWorkingPath() {
         Optional<Path> result = Optional.ofNullable(getClassespath());
         if (result.isPresent()) {

src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java

@@ -1265,6 +1265,7 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR
             public void addFailure(final Test test, final AssertionFailedError t) {
                 testListener.addFailure(test, t);
             }
+            @SuppressWarnings("unused")
             public void addFailure(final Test test, final Throwable t) { // pre-3.4
                 if (t instanceof AssertionFailedError) {
                     testListener.addFailure(test, (AssertionFailedError) t);

src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/JUnitLauncherTask.java

@@ -295,6 +295,7 @@ public class JUnitLauncherTask extends Task {
         return new AntClassLoader(this.getClass().getClassLoader(), getProject(), this.classPath, true);
     }
 
+    @SuppressWarnings("resource")
     private Optional<SwitchedStreamHandle> trySwitchSysOutErr(final TestRequest testRequest, final StreamType streamType) {
         switch (streamType) {
             case SYS_OUT: {

src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/LegacyPlainResultFormatter.java

@@ -174,6 +174,7 @@ class LegacyPlainResultFormatter extends AbstractJUnitResultFormatter implements
         }
     }
 
+    @SuppressWarnings("incomplete-switch")
     @Override
     public void executionFinished(final TestIdentifier testIdentifier, final TestExecutionResult testExecutionResult) {
         final long currentTime = System.currentTimeMillis();
@@ -272,6 +273,7 @@ class LegacyPlainResultFormatter extends AbstractJUnitResultFormatter implements
     }
 
     private final class Stats {
+        @SuppressWarnings("unused")
         private final TestIdentifier testIdentifier;
         private final AtomicLong numTestsRun = new AtomicLong(0);
         private final AtomicLong numTestsFailed = new AtomicLong(0);

src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/LegacyXmlResultFormatter.java

@@ -124,6 +124,7 @@ class LegacyXmlResultFormatter extends AbstractJUnitResultFormatter implements T
     }
 
     private final class Stats {
+        @SuppressWarnings("unused")
         private final TestIdentifier testIdentifier;
         private final long startedAt;
         private long endedAt;

src/main/org/apache/tools/ant/types/resources/TarResource.java

@@ -198,7 +198,6 @@ public class TarResource extends ArchiveResource {
         return (TarResource) super.getCheckedRef();
     }
 
-    @SuppressWarnings("deprecated")
     private void setEntry(TarEntry e) {
         if (e == null) {
             setExists(false);

src/main/org/apache/tools/ant/util/JavaEnvUtils.java

@@ -279,7 +279,6 @@ public final class JavaEnvUtils {
      * @return true if the version of Java is the same as the given version.
      * @since Ant 1.5
      */
-    @SuppressWarnings("deprecated")
     public static boolean isJavaVersion(String version) {
         return javaVersion.equals(version)
             || (javaVersion.equals(JAVA_9) && JAVA_1_9.equals(version));

src/main/org/apache/tools/bzip2/BlockSort.java

@@ -117,6 +117,7 @@ class BlockSort {
 
     private static final int FALLBACK_QSORT_STACK_SIZE = 100;
 
+    @SuppressWarnings("unused")
     private static final int STACK_SIZE =
         QSORT_STACK_SIZE < FALLBACK_QSORT_STACK_SIZE
         ? FALLBACK_QSORT_STACK_SIZE : QSORT_STACK_SIZE;

src/tests/junit/org/apache/tools/ant/IntrospectionHelperTest.java

@@ -800,7 +800,7 @@ public class IntrospectionHelperTest {
         }
     }
 
-    public List<Object> add(List l) {
+    public List<Object> add(List<Object> l) {
         // INVALID extension point
         return null;
     }

src/tests/junit/org/apache/tools/ant/taskdefs/XmlPropertyTest.java

@@ -258,6 +258,7 @@ public class XmlPropertyTest {
     /**
      * Debugging method to print the properties in the given hashtable
      */
+    @SuppressWarnings("unused")
     private static void printProperties(Hashtable<Object, Object> xmlproperties) {
         xmlproperties.forEach((key, value) -> System.out.println(key + " = " + value));
     }

src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java

@@ -127,7 +127,7 @@ public class JavaEnvUtilsTest {
     }
 
     @Test
-    @SuppressWarnings("deprecated")
+    @SuppressWarnings("deprecation")
     public void isJavaVersionSupportsBothVersionsOfJava9() {
         assumeTrue(JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_9));
         assertTrue("JAVA_1_9 is not considered equal to JAVA_9",
@@ -135,7 +135,7 @@ public class JavaEnvUtilsTest {
     }
 
     @Test
-    @SuppressWarnings("deprecated")
+    @SuppressWarnings("deprecation")
     public void java10IsDetectedProperly() {
         assumeTrue("10".equals(System.getProperty("java.specification.version")));
         assertEquals("10", JavaEnvUtils.getJavaVersion());