From 342bf00579318f00b373e86a148af984bc7d6acb Mon Sep 17 00:00:00 2001 From: Gintas Grigelionis Date: Mon, 30 Apr 2018 15:59:48 +0200 Subject: [PATCH] Review annotations --- src/main/org/apache/tools/ant/DirectoryScanner.java | 1 - src/main/org/apache/tools/ant/RuntimeConfigurable.java | 3 ++- src/main/org/apache/tools/ant/input/SecureInputHandler.java | 1 + src/main/org/apache/tools/ant/launch/Locator.java | 1 - src/main/org/apache/tools/ant/listener/Log4jListener.java | 1 + src/main/org/apache/tools/ant/taskdefs/Concat.java | 1 - src/main/org/apache/tools/ant/taskdefs/CopyPath.java | 1 + .../tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java | 1 - src/main/org/apache/tools/ant/taskdefs/email/Message.java | 1 + .../apache/tools/ant/taskdefs/optional/XMLValidateTask.java | 1 - .../tools/ant/taskdefs/optional/jdepend/JDependTask.java | 2 -- .../tools/ant/taskdefs/optional/junit/JUnitTestRunner.java | 1 + .../taskdefs/optional/junitlauncher/JUnitLauncherTask.java | 1 + .../optional/junitlauncher/LegacyPlainResultFormatter.java | 2 ++ .../optional/junitlauncher/LegacyXmlResultFormatter.java | 1 + .../org/apache/tools/ant/types/resources/TarResource.java | 1 - src/main/org/apache/tools/ant/util/JavaEnvUtils.java | 1 - src/main/org/apache/tools/bzip2/BlockSort.java | 1 + .../junit/org/apache/tools/ant/IntrospectionHelperTest.java | 2 +- .../junit/org/apache/tools/ant/taskdefs/XmlPropertyTest.java | 1 + .../junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java | 4 ++-- 21 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/main/org/apache/tools/ant/DirectoryScanner.java b/src/main/org/apache/tools/ant/DirectoryScanner.java index fd48d127a..71465dbc3 100644 --- a/src/main/org/apache/tools/ant/DirectoryScanner.java +++ b/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(); diff --git a/src/main/org/apache/tools/ant/RuntimeConfigurable.java b/src/main/org/apache/tools/ant/RuntimeConfigurable.java index 7afd82bed..d9964097e 100644 --- a/src/main/org/apache/tools/ant/RuntimeConfigurable.java +++ b/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; diff --git a/src/main/org/apache/tools/ant/input/SecureInputHandler.java b/src/main/org/apache/tools/ant/input/SecureInputHandler.java index 390a3ccce..878a01dbe 100644 --- a/src/main/org/apache/tools/ant/input/SecureInputHandler.java +++ b/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 { diff --git a/src/main/org/apache/tools/ant/launch/Locator.java b/src/main/org/apache/tools/ant/launch/Locator.java index 0a644a868..9cd9626b2 100644 --- a/src/main/org/apache/tools/ant/launch/Locator.java +++ b/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 { diff --git a/src/main/org/apache/tools/ant/listener/Log4jListener.java b/src/main/org/apache/tools/ant/listener/Log4jListener.java index a116e3db7..0000bc75b 100644 --- a/src/main/org/apache/tools/ant/listener/Log4jListener.java +++ b/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); } diff --git a/src/main/org/apache/tools/ant/taskdefs/Concat.java b/src/main/org/apache/tools/ant/taskdefs/Concat.java index 8c523160e..45b610da5 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Concat.java +++ b/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); } diff --git a/src/main/org/apache/tools/ant/taskdefs/CopyPath.java b/src/main/org/apache/tools/ant/taskdefs/CopyPath.java index 950942329..54d2e325b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/CopyPath.java +++ b/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; diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java index f9b0d16e1..95eabbbeb 100644 --- a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java +++ b/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(); } diff --git a/src/main/org/apache/tools/ant/taskdefs/email/Message.java b/src/main/org/apache/tools/ant/taskdefs/email/Message.java index ec10e99a9..fc07396c2 100644 --- a/src/main/org/apache/tools/ant/taskdefs/email/Message.java +++ b/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 diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java index 9e3d8088e..c7000b3f9 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java +++ b/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) { diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java index 17fd3af33..09e13f27e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java +++ b/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 getWorkingPath() { Optional result = Optional.ofNullable(getClassespath()); if (result.isPresent()) { diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java index 393211b2d..7c0b0cdfd 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java +++ b/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); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/JUnitLauncherTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/JUnitLauncherTask.java index c505ee00d..dc09a5eea 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/JUnitLauncherTask.java +++ b/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 trySwitchSysOutErr(final TestRequest testRequest, final StreamType streamType) { switch (streamType) { case SYS_OUT: { diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/LegacyPlainResultFormatter.java b/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/LegacyPlainResultFormatter.java index 15ae463b2..5b96b2658 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/LegacyPlainResultFormatter.java +++ b/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); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/LegacyXmlResultFormatter.java b/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/LegacyXmlResultFormatter.java index 6ca2e51c1..e538fc94e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/LegacyXmlResultFormatter.java +++ b/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; diff --git a/src/main/org/apache/tools/ant/types/resources/TarResource.java b/src/main/org/apache/tools/ant/types/resources/TarResource.java index 1279bd860..9bed83cb0 100644 --- a/src/main/org/apache/tools/ant/types/resources/TarResource.java +++ b/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); diff --git a/src/main/org/apache/tools/ant/util/JavaEnvUtils.java b/src/main/org/apache/tools/ant/util/JavaEnvUtils.java index fd00780ea..b8cb9e1ae 100644 --- a/src/main/org/apache/tools/ant/util/JavaEnvUtils.java +++ b/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)); diff --git a/src/main/org/apache/tools/bzip2/BlockSort.java b/src/main/org/apache/tools/bzip2/BlockSort.java index f019da87a..75c3ff23f 100644 --- a/src/main/org/apache/tools/bzip2/BlockSort.java +++ b/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; diff --git a/src/tests/junit/org/apache/tools/ant/IntrospectionHelperTest.java b/src/tests/junit/org/apache/tools/ant/IntrospectionHelperTest.java index e512a3b96..4318494a7 100644 --- a/src/tests/junit/org/apache/tools/ant/IntrospectionHelperTest.java +++ b/src/tests/junit/org/apache/tools/ant/IntrospectionHelperTest.java @@ -800,7 +800,7 @@ public class IntrospectionHelperTest { } } - public List add(List l) { + public List add(List l) { // INVALID extension point return null; } diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/XmlPropertyTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/XmlPropertyTest.java index 25e83ac3a..9d03c5ad7 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/XmlPropertyTest.java +++ b/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 xmlproperties) { xmlproperties.forEach((key, value) -> System.out.println(key + " = " + value)); } diff --git a/src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java b/src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java index 271774662..f96e03604 100644 --- a/src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java +++ b/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());