diff --git a/src/main/org/apache/tools/ant/AntTypeDefinition.java b/src/main/org/apache/tools/ant/AntTypeDefinition.java
index c7b223cef..387577f92 100644
--- a/src/main/org/apache/tools/ant/AntTypeDefinition.java
+++ b/src/main/org/apache/tools/ant/AntTypeDefinition.java
@@ -307,11 +307,11 @@ public class AntTypeDefinition {
         // DataType can have a "no arg" constructor or take a single
         // Project argument.
         try {
-            ctor = newclass.getConstructor(new Class[0]);
+            ctor = newclass.getConstructor();
             noArg = true;
         } catch (NoSuchMethodException nse) {
             //can throw the same exception, if there is no this(Project) ctor.
-            ctor = newclass.getConstructor(new Class[] {Project.class});
+            ctor = newclass.getConstructor(Project.class);
             noArg = false;
         }
         //now we instantiate
diff --git a/src/main/org/apache/tools/ant/ComponentHelper.java b/src/main/org/apache/tools/ant/ComponentHelper.java
index d5c2616ba..c2d21a69d 100644
--- a/src/main/org/apache/tools/ant/ComponentHelper.java
+++ b/src/main/org/apache/tools/ant/ComponentHelper.java
@@ -750,7 +750,7 @@ public class ComponentHelper  {
      */
     public void exitAntLib() {
         antLibStack.pop();
-        antLibCurrentUri = (antLibStack.isEmpty()) ? null : (String) antLibStack.peek();
+        antLibCurrentUri = (antLibStack.isEmpty()) ? null : antLibStack.peek();
     }
 
     /**
diff --git a/src/main/org/apache/tools/ant/Diagnostics.java b/src/main/org/apache/tools/ant/Diagnostics.java
index 54d2b8dc7..bf6aca098 100644
--- a/src/main/org/apache/tools/ant/Diagnostics.java
+++ b/src/main/org/apache/tools/ant/Diagnostics.java
@@ -18,7 +18,6 @@
 package org.apache.tools.ant;
 
 import java.io.File;
-import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -122,8 +121,7 @@ public final class Diagnostics {
      * @return array of files (or null for no such directory)
      */
     private static File[] listJarFiles(File libDir) {
-        return libDir
-            .listFiles((FilenameFilter) (dir, name) -> name.endsWith(".jar"));
+        return libDir.listFiles((dir, name) -> name.endsWith(".jar"));
     }
 
     /**
@@ -451,7 +449,7 @@ public final class Diagnostics {
         try {
             Class<?> which = Class.forName("org.apache.env.Which");
             Method method = which.getMethod(
-                "main", new Class[] {String[].class});
+                "main", String[].class);
             method.invoke(null, new Object[]{new String[]{}});
         } catch (ClassNotFoundException e) {
             out.println("Not available.");
diff --git a/src/main/org/apache/tools/ant/DirectoryScanner.java b/src/main/org/apache/tools/ant/DirectoryScanner.java
index 10b6fe124..366dc9948 100644
--- a/src/main/org/apache/tools/ant/DirectoryScanner.java
+++ b/src/main/org/apache/tools/ant/DirectoryScanner.java
@@ -616,9 +616,7 @@ public class DirectoryScanner
     public static void resetDefaultExcludes() {
         synchronized (defaultExcludes) {
             defaultExcludes.clear();
-            for (String element : DEFAULTEXCLUDES) {
-                defaultExcludes.add(element);
-            }
+            Collections.addAll(defaultExcludes, DEFAULTEXCLUDES);
         }
     }
 
@@ -1046,16 +1044,11 @@ public class DirectoryScanner
     private boolean shouldSkipPattern(final String pattern) {
         if (FileUtils.isAbsolutePath(pattern)) {
             //skip abs. paths not under basedir, if set:
-            if (!(basedir == null || SelectorUtils.matchPatternStart(pattern,
-                                                basedir.getAbsolutePath(),
-                                                isCaseSensitive()))) {
-                return true;
-            }
-        } else if (basedir == null) {
-            //skip non-abs. paths if basedir == null:
-            return true;
+            return !(basedir == null || SelectorUtils.matchPatternStart(pattern,
+                    basedir.getAbsolutePath(), isCaseSensitive()));
         }
-        return false;
+
+        return basedir == null;
     }
 
     /**
@@ -1823,9 +1816,9 @@ public class DirectoryScanner
                 final String target = f.getCanonicalPath();
                 files.add(target);
 
-                String relPath = "";
+                StringBuilder relPath = new StringBuilder();
                 for (final String dir : directoryNamesFollowed) {
-                    relPath += "../";
+                    relPath.append("../");
                     if (dirName.equals(dir)) {
                         f = FILE_UTILS.resolveFile(parent, relPath + dir);
                         files.add(f.getCanonicalPath());
diff --git a/src/main/org/apache/tools/ant/IntrospectionHelper.java b/src/main/org/apache/tools/ant/IntrospectionHelper.java
index 90820bdbe..544e1c4be 100644
--- a/src/main/org/apache/tools/ant/IntrospectionHelper.java
+++ b/src/main/org/apache/tools/ant/IntrospectionHelper.java
@@ -307,13 +307,8 @@ public final class IntrospectionHelper {
      * @return true if the given set method is to be hidden.
      */
     private boolean isHiddenSetMethod(final String name, final Class<?> type) {
-        if ("setLocation".equals(name) && Location.class.equals(type)) {
-            return true;
-        }
-        if ("setTaskType".equals(name) && String.class.equals(type)) {
-            return true;
-        }
-        return false;
+        return "setLocation".equals(name) && Location.class.equals(type)
+                || "setTaskType".equals(name) && String.class.equals(type);
     }
 
     /**
@@ -472,7 +467,7 @@ public final class IntrospectionHelper {
                     + " doesn't support nested text data (\"" + condenseText(text) + "\").");
         }
         try {
-            addText.invoke(element, new Object[] {text});
+            addText.invoke(element, text);
         } catch (final IllegalAccessException ie) {
             // impossible as getMethods should only return public methods
             throw new BuildException(ie);
@@ -955,7 +950,7 @@ public final class IntrospectionHelper {
      */
     public Map<String, Class<?>> getAttributeMap() {
         return attributeTypes.isEmpty()
-            ? Collections.<String, Class<?>> emptyMap() : Collections.unmodifiableMap(attributeTypes);
+            ? Collections.emptyMap() : Collections.unmodifiableMap(attributeTypes);
     }
 
     /**
@@ -980,7 +975,7 @@ public final class IntrospectionHelper {
      */
     public Map<String, Class<?>> getNestedElementMap() {
         return nestedTypes.isEmpty()
-            ? Collections.<String, Class<?>> emptyMap() : Collections.unmodifiableMap(nestedTypes);
+            ? Collections.emptyMap() : Collections.unmodifiableMap(nestedTypes);
     }
 
     /**
@@ -1002,7 +997,7 @@ public final class IntrospectionHelper {
      */
     public List<Method> getExtensionPoints() {
         return addTypeMethods.isEmpty()
-                ? Collections.<Method> emptyList() : Collections.unmodifiableList(addTypeMethods);
+                ? Collections.emptyList() : Collections.unmodifiableList(addTypeMethods);
     }
 
     /**
@@ -1078,7 +1073,7 @@ public final class IntrospectionHelper {
                         throw new BuildException("The value \"\" is not a "
                                 + "legal value for attribute \"" + attrName + "\"");
                     }
-                    m.invoke(parent, (Object[]) new Character[] {new Character(value.charAt(0))});
+                    m.invoke(parent, (Object[]) new Character[] {value.charAt(0)});
                 }
             };
         }
@@ -1100,7 +1095,7 @@ public final class IntrospectionHelper {
                 public void set(final Project p, final Object parent, final String value)
                         throws InvocationTargetException, IllegalAccessException, BuildException {
                     try {
-                        m.invoke(parent, new Object[] {Class.forName(value)});
+                        m.invoke(parent, Class.forName(value));
                     } catch (final ClassNotFoundException ce) {
                         throw new BuildException(ce);
                     }
@@ -1113,7 +1108,7 @@ public final class IntrospectionHelper {
                 @Override
                 public void set(final Project p, final Object parent, final String value)
                         throws InvocationTargetException, IllegalAccessException {
-                    m.invoke(parent, new Object[] {p.resolveFile(value)});
+                    m.invoke(parent, p.resolveFile(value));
                 }
             };
         }
@@ -1122,7 +1117,7 @@ public final class IntrospectionHelper {
             return new AttributeSetter(m, arg) {
                 @Override
                 public void set(final Project p, final Object parent, final String value) throws InvocationTargetException, IllegalAccessException {
-                    m.invoke(parent, new Object[] { p.resolveFile(value).toPath() });
+                    m.invoke(parent, p.resolveFile(value).toPath());
                 }
             };
         }
@@ -1133,7 +1128,7 @@ public final class IntrospectionHelper {
                 @Override
                 void set(final Project p, final Object parent, final String value) throws InvocationTargetException,
                         IllegalAccessException, BuildException {
-                    m.invoke(parent, new Object[] {new FileResource(p, p.resolveFile(value))});
+                    m.invoke(parent, new FileResource(p, p.resolveFile(value)));
                 }
             };
         }
@@ -1146,7 +1141,7 @@ public final class IntrospectionHelper {
                     try {
                         final EnumeratedAttribute ea = (EnumeratedAttribute) reflectedArg.newInstance();
                         ea.setValue(value);
-                        m.invoke(parent, new Object[] {ea});
+                        m.invoke(parent, ea);
                     } catch (final InstantiationException ie) {
                         throw new BuildException(ie);
                     }
@@ -1165,8 +1160,7 @@ public final class IntrospectionHelper {
                 public void set(final Project p, final Object parent, final String value)
                         throws InvocationTargetException, IllegalAccessException, BuildException {
                     try {
-                        m.invoke(parent, new Object[] {
-                                new Long(StringUtils.parseHumanSizes(value)) });
+                        m.invoke(parent, StringUtils.parseHumanSizes(value));
                     } catch (final NumberFormatException e) {
                         throw new BuildException("Can't assign non-numeric"
                                                  + " value '" + value + "' to"
@@ -1216,7 +1210,7 @@ public final class IntrospectionHelper {
                     if (p != null) {
                         p.setProjectReference(attribute);
                     }
-                    m.invoke(parent, new Object[] {attribute});
+                    m.invoke(parent, attribute);
                 } catch (final InvocationTargetException e) {
                     final Throwable cause = e.getCause();
                     if (cause instanceof IllegalArgumentException) {
@@ -1434,7 +1428,7 @@ public final class IntrospectionHelper {
         @Override
         Object create(final Project project, final Object parent, final Object ignore)
                 throws InvocationTargetException, IllegalAccessException {
-            return getMethod().invoke(parent, new Object[] {});
+            return getMethod().invoke(parent);
         }
     }
 
@@ -1485,7 +1479,7 @@ public final class IntrospectionHelper {
 
         private void istore(final Object parent, final Object child)
                 throws InvocationTargetException, IllegalAccessException, InstantiationException {
-            getMethod().invoke(parent, new Object[] {child});
+            getMethod().invoke(parent, child);
         }
     }
 
@@ -1514,7 +1508,7 @@ public final class IntrospectionHelper {
                     useType = PRIMITIVE_TYPE_MAP.get(type);
                 }
                 if (value == null || useType.isInstance(value)) {
-                    method.invoke(parent, new Object[] {value});
+                    method.invoke(parent, value);
                     return;
                 }
             }
@@ -1578,7 +1572,7 @@ public final class IntrospectionHelper {
             Object create(final Project project, final Object parent, final Object ignore)
                     throws InvocationTargetException, IllegalAccessException {
                 if (!getMethod().getName().endsWith("Configured")) {
-                    getMethod().invoke(parent, new Object[] {realObject});
+                    getMethod().invoke(parent, realObject);
                 }
                 return nestedObject;
             }
@@ -1592,7 +1586,7 @@ public final class IntrospectionHelper {
             void store(final Object parent, final Object child) throws InvocationTargetException,
                     IllegalAccessException, InstantiationException {
                 if (getMethod().getName().endsWith("Configured")) {
-                    getMethod().invoke(parent, new Object[] {realObject});
+                    getMethod().invoke(parent, realObject);
                 }
             }
         };
diff --git a/src/main/org/apache/tools/ant/Main.java b/src/main/org/apache/tools/ant/Main.java
index faf996b7d..347698801 100644
--- a/src/main/org/apache/tools/ant/Main.java
+++ b/src/main/org/apache/tools/ant/Main.java
@@ -632,8 +632,8 @@ public class Main implements AntMain {
                                      + args[pos]);
         }
 
-        if (threadPriority.intValue() < Thread.MIN_PRIORITY
-            || threadPriority.intValue() > Thread.MAX_PRIORITY) {
+        if (threadPriority < Thread.MIN_PRIORITY
+            || threadPriority > Thread.MAX_PRIORITY) {
             throw new BuildException(
                 "Niceness value is out of the range 1-10");
         }
@@ -798,7 +798,7 @@ public class Main implements AntMain {
                     try {
                         project.log("Setting Ant's thread priority to "
                                 + threadPriority, Project.MSG_VERBOSE);
-                        Thread.currentThread().setPriority(threadPriority.intValue());
+                        Thread.currentThread().setPriority(threadPriority);
                     } catch (final SecurityException swallowed) {
                         //we cannot set the priority here.
                         project.log("A security manager refused to set the -nice value");
@@ -941,7 +941,7 @@ public class Main implements AntMain {
         for (int i = 0; i < count; i++) {
             final String className = listeners.elementAt(i);
             final BuildListener listener =
-                    (BuildListener) ClasspathUtils.newInstance(className,
+                    ClasspathUtils.newInstance(className,
                             Main.class.getClassLoader(), BuildListener.class);
             project.setProjectReference(listener);
 
@@ -962,7 +962,7 @@ public class Main implements AntMain {
         if (inputHandlerClassname == null) {
             handler = new DefaultInputHandler();
         } else {
-            handler = (InputHandler) ClasspathUtils.newInstance(
+            handler = ClasspathUtils.newInstance(
                     inputHandlerClassname, Main.class.getClassLoader(),
                     InputHandler.class);
             project.setProjectReference(handler);
@@ -984,7 +984,7 @@ public class Main implements AntMain {
             emacsMode = true;
         } else if (loggerClassname != null) {
             try {
-                logger = (BuildLogger) ClasspathUtils.newInstance(
+                logger = ClasspathUtils.newInstance(
                         loggerClassname, Main.class.getClassLoader(),
                         BuildLogger.class);
             } catch (final BuildException e) {
@@ -1088,13 +1088,10 @@ public class Main implements AntMain {
                 props.load(in);
                 in.close();
                 shortAntVersion = props.getProperty("VERSION");
-
-                final StringBuffer msg = new StringBuffer();
-                msg.append("Apache Ant(TM) version ");
-                msg.append(shortAntVersion);
-                msg.append(" compiled on ");
-                msg.append(props.getProperty("DATE"));
-                antVersion = msg.toString();
+                antVersion = "Apache Ant(TM) version " +
+                        shortAntVersion +
+                        " compiled on " +
+                        props.getProperty("DATE");
             } catch (final IOException ioe) {
                 throw new BuildException("Could not load the version information:"
                                          + ioe.getMessage());
diff --git a/src/main/org/apache/tools/ant/Project.java b/src/main/org/apache/tools/ant/Project.java
index 97414d00c..656764f77 100644
--- a/src/main/org/apache/tools/ant/Project.java
+++ b/src/main/org/apache/tools/ant/Project.java
@@ -439,9 +439,7 @@ public class Project implements ResourceFactory {
     public Vector<BuildListener> getBuildListeners() {
         synchronized (listenersLock) {
             final Vector<BuildListener> r = new Vector<>(listeners.length);
-            for (BuildListener listener : listeners) {
-                r.add(listener);
-            }
+            Collections.addAll(r, listeners);
             return r;
         }
     }
diff --git a/src/main/org/apache/tools/ant/ProjectHelper.java b/src/main/org/apache/tools/ant/ProjectHelper.java
index e0827a877..8eec9fb99 100644
--- a/src/main/org/apache/tools/ant/ProjectHelper.java
+++ b/src/main/org/apache/tools/ant/ProjectHelper.java
@@ -264,7 +264,7 @@ public class ProjectHelper {
      * @since Ant 1.8.0
      */
     public static void setInIncludeMode(boolean includeMode) {
-        inIncludeMode.set(Boolean.valueOf(includeMode));
+        inIncludeMode.set(includeMode);
     }
 
     // --------------------  Parse method  --------------------
diff --git a/src/main/org/apache/tools/ant/PropertyHelper.java b/src/main/org/apache/tools/ant/PropertyHelper.java
index d0f33a10f..339c44645 100644
--- a/src/main/org/apache/tools/ant/PropertyHelper.java
+++ b/src/main/org/apache/tools/ant/PropertyHelper.java
@@ -381,8 +381,7 @@ public class PropertyHelper implements GetProperty {
     public static synchronized PropertyHelper getPropertyHelper(Project project) {
         PropertyHelper helper = null;
         if (project != null) {
-            helper = (PropertyHelper) project.getReference(MagicNames
-                                                           .REFID_PROPERTY_HELPER);
+            helper = project.getReference(MagicNames.REFID_PROPERTY_HELPER);
         }
         if (helper != null) {
             return helper;
@@ -440,11 +439,8 @@ public class PropertyHelper implements GetProperty {
                                    boolean inherited, boolean user,
                                    boolean isNew) {
         if (getNext() != null) {
-            boolean subst = getNext().setPropertyHook(ns, name, value, inherited, user, isNew);
             // If next has handled the property
-            if (subst) {
-                return true;
-            }
+            return getNext().setPropertyHook(ns, name, value, inherited, user, isNew);
         }
         return false;
     }
@@ -1118,7 +1114,7 @@ public class PropertyHelper implements GetProperty {
     protected <D extends Delegate> List<D> getDelegates(Class<D> type) {
         @SuppressWarnings("unchecked")
         final List<D> result = (List<D>) delegates.get(type);
-        return result == null ? Collections.<D> emptyList() : result;
+        return result == null ? Collections.emptyList() : result;
     }
 
     /**
@@ -1193,7 +1189,7 @@ public class PropertyHelper implements GetProperty {
     private boolean evalAsBooleanOrPropertyName(Object value) {
         Boolean b = toBoolean(value);
         if (b != null) {
-            return b.booleanValue();
+            return b;
         }
         return getProperty(String.valueOf(value)) != null;
     }
diff --git a/src/main/org/apache/tools/ant/UnknownElement.java b/src/main/org/apache/tools/ant/UnknownElement.java
index 8a73847e2..ce31edee3 100644
--- a/src/main/org/apache/tools/ant/UnknownElement.java
+++ b/src/main/org/apache/tools/ant/UnknownElement.java
@@ -503,8 +503,7 @@ public class UnknownElement extends Task {
      * @return the name to use in logging messages.
      */
     public String getTaskName() {
-        return realThing == null
-            || !(realThing instanceof Task) ? super.getTaskName()
+        return !(realThing instanceof Task) ? super.getTaskName()
                                             : ((Task) realThing).getTaskName();
     }
 
@@ -643,7 +642,7 @@ public class UnknownElement extends Task {
         }
         for (int i = 0; i < childrenSize; ++i) {
             // children cannot be null childrenSize would have been 0
-            UnknownElement child = (UnknownElement) children.get(i); //NOSONAR
+            UnknownElement child = children.get(i); //NOSONAR
             if (!child.similar(other.children.get(i))) {
                 return false;
             }
diff --git a/src/main/org/apache/tools/ant/attribute/BaseIfAttribute.java b/src/main/org/apache/tools/ant/attribute/BaseIfAttribute.java
index d480f2953..6d4d6c32e 100644
--- a/src/main/org/apache/tools/ant/attribute/BaseIfAttribute.java
+++ b/src/main/org/apache/tools/ant/attribute/BaseIfAttribute.java
@@ -58,7 +58,7 @@ public abstract class BaseIfAttribute
      * @return val if positive or !val if not.
      */
     protected boolean convertResult(boolean val) {
-        return positive ? val : !val;
+        return positive == val;
     }
 
     /**
diff --git a/src/main/org/apache/tools/ant/dispatch/DispatchUtils.java b/src/main/org/apache/tools/ant/dispatch/DispatchUtils.java
index 7a840d125..fe3fd3a7c 100644
--- a/src/main/org/apache/tools/ant/dispatch/DispatchUtils.java
+++ b/src/main/org/apache/tools/ant/dispatch/DispatchUtils.java
@@ -43,9 +43,8 @@ public class DispatchUtils {
             } else if (task instanceof UnknownElement) {
                 UnknownElement ue = (UnknownElement) task;
                 Object realThing = ue.getRealThing();
-                if (realThing != null
-                    && realThing instanceof Dispatchable
-                    && realThing instanceof Task) {
+                if (realThing instanceof Dispatchable
+                        && realThing instanceof Task) {
                     dispatchable = (Dispatchable) realThing;
                 }
             }
@@ -59,7 +58,7 @@ public class DispatchUtils {
                             mName += name.substring(1);
                         }
                         final Class<? extends Dispatchable> c = dispatchable.getClass();
-                        final Method actionM = c.getMethod(mName, new Class[0]);
+                        final Method actionM = c.getMethod(mName);
                         if (actionM != null) {
                             final Object o = actionM.invoke(dispatchable, (Object[]) null);
                             if (o != null) {
@@ -68,7 +67,7 @@ public class DispatchUtils {
                                     methodName = s.trim();
                                     Method executeM = null;
                                     executeM = dispatchable.getClass().getMethod(
-                                        methodName, new Class[0]);
+                                        methodName);
                                     if (executeM == null) {
                                         throw new BuildException(
                                             "No public " + methodName + "() in "
diff --git a/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java b/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java
index b5a0ad2c3..f5e23c433 100644
--- a/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java
+++ b/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java
@@ -273,8 +273,8 @@ public final class FixCrLfFilter extends BaseParamFilterReader implements Chaina
                 in = new MaskJavaTabLiteralsFilter(in);
             }
             // Add/Remove tabs
-            in = (tabs == AddAsisRemove.ADD) ? (Reader) new AddTabFilter(in, getTablength())
-                    : (Reader) new RemoveTabFilter(in, getTablength());
+            in = (tabs == AddAsisRemove.ADD) ? new AddTabFilter(in, getTablength())
+                    : new RemoveTabFilter(in, getTablength());
         }
         // Add missing EOF character
         in = (ctrlz == AddAsisRemove.ADD) ? new AddEofFilter(in) : in;
diff --git a/src/main/org/apache/tools/ant/filters/LineContains.java b/src/main/org/apache/tools/ant/filters/LineContains.java
index a5492518a..5a1465a84 100644
--- a/src/main/org/apache/tools/ant/filters/LineContains.java
+++ b/src/main/org/apache/tools/ant/filters/LineContains.java
@@ -117,7 +117,7 @@ public final class LineContains
             for (line = readLine(); line != null; line = readLine()) {
                 boolean matches = true;
                 for (int i = 0; matches && i < containsSize; i++) {
-                    String containsStr = (String) contains.elementAt(i);
+                    String containsStr = contains.elementAt(i);
                     matches = line.contains(containsStr);
                 }
                 if (matches ^ isNegated()) {
diff --git a/src/main/org/apache/tools/ant/filters/LineContainsRegExp.java b/src/main/org/apache/tools/ant/filters/LineContainsRegExp.java
index 9ec7d333b..87de0a679 100644
--- a/src/main/org/apache/tools/ant/filters/LineContainsRegExp.java
+++ b/src/main/org/apache/tools/ant/filters/LineContainsRegExp.java
@@ -116,15 +116,13 @@ public final class LineContainsRegExp
                 line = line.substring(1);
             }
         } else {
-            final int regexpsSize = regexps.size();
-
             for (line = readLine(); line != null; line = readLine()) {
                 boolean matches = true;
-                for (int i = 0; matches && i < regexpsSize; i++) {
-                    RegularExpression regexp
-                        = (RegularExpression) regexps.elementAt(i);
-                    Regexp re = regexp.getRegexp(getProject());
-                    matches = re.matches(line, regexpOptions);
+                for (RegularExpression regexp : regexps) {
+                    if (!regexp.getRegexp(getProject()).matches(line, regexpOptions)) {
+                        matches = false;
+                        break;
+                    }
                 }
                 if (matches ^ isNegated()) {
                     break;
diff --git a/src/main/org/apache/tools/ant/filters/SortFilter.java b/src/main/org/apache/tools/ant/filters/SortFilter.java
index 053fe2225..68dbba911 100644
--- a/src/main/org/apache/tools/ant/filters/SortFilter.java
+++ b/src/main/org/apache/tools/ant/filters/SortFilter.java
@@ -222,7 +222,7 @@ public final class SortFilter extends BaseParamFilterReader
             }
 
             if (iterator.hasNext()) {
-                line = (String) iterator.next();
+                line = iterator.next();
             } else {
                 line = null;
                 lines = null;
@@ -317,12 +317,12 @@ public final class SortFilter extends BaseParamFilterReader
             for (Parameter param : params) {
                 final String paramName = param.getName();
                 if (REVERSE_KEY.equals(paramName)) {
-                    setReverse(Boolean.valueOf(param.getValue()).booleanValue());
+                    setReverse(Boolean.valueOf(param.getValue()));
                     continue;
                 }
                 if (COMPARATOR_KEY.equals(paramName)) {
                     try {
-                        String className = (String) param.getValue();
+                        String className = param.getValue();
                         @SuppressWarnings("unchecked")
                         final Comparator<? super String> comparatorInstance
                                 = (Comparator<? super String>) (Class.forName(className).newInstance());
diff --git a/src/main/org/apache/tools/ant/helper/AntXMLContext.java b/src/main/org/apache/tools/ant/helper/AntXMLContext.java
index c5295a70a..c83130b0a 100644
--- a/src/main/org/apache/tools/ant/helper/AntXMLContext.java
+++ b/src/main/org/apache/tools/ant/helper/AntXMLContext.java
@@ -217,7 +217,7 @@ public class AntXMLContext {
         if (wStack.size() < 1) {
             return null;
         }
-        return (RuntimeConfigurable) wStack.elementAt(wStack.size() - 1);
+        return wStack.elementAt(wStack.size() - 1);
     }
 
     /**
@@ -229,7 +229,7 @@ public class AntXMLContext {
         if (wStack.size() < 2) {
             return null;
         }
-        return (RuntimeConfigurable) wStack.elementAt(wStack.size() - 2);
+        return wStack.elementAt(wStack.size() - 2);
     }
 
     /**
@@ -394,7 +394,7 @@ public class AntXMLContext {
         if (list == null || list.isEmpty()) {
             return null;
         }
-        return (String) list.get(list.size() - 1);
+        return list.get(list.size() - 1);
     }
 
     /**
diff --git a/src/main/org/apache/tools/ant/helper/ProjectHelper2.java b/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
index 61a696cab..130986139 100644
--- a/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
+++ b/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
@@ -149,7 +149,7 @@ public class ProjectHelper2 extends ProjectHelper {
     public void parse(Project project, Object source) throws BuildException {
         getImportStack().addElement(source);
         AntXMLContext context = null;
-        context = (AntXMLContext) project.getReference(REFID_CONTEXT);
+        context = project.getReference(REFID_CONTEXT);
         if (context == null) {
             context = new AntXMLContext(project);
             project.addReference(REFID_CONTEXT, context);
@@ -1020,8 +1020,7 @@ public class ProjectHelper2 extends ProjectHelper {
             }
             if (extensionPoint != null) {
                 ProjectHelper helper =
-                    (ProjectHelper) context.getProject().
-                    getReference(ProjectHelper.PROJECTHELPER_REFERENCE);
+                        context.getProject().getReference(ProjectHelper.PROJECTHELPER_REFERENCE);
                 for (String extPointName : Target.parseDepends(extensionPoint, name, "extensionOf")) {
                     if (extensionPointMissing == null) {
                         extensionPointMissing = OnMissingExtensionPoint.FAIL;
diff --git a/src/main/org/apache/tools/ant/input/SecureInputHandler.java b/src/main/org/apache/tools/ant/input/SecureInputHandler.java
index 51f8b95ef..039c6f848 100644
--- a/src/main/org/apache/tools/ant/input/SecureInputHandler.java
+++ b/src/main/org/apache/tools/ant/input/SecureInputHandler.java
@@ -44,9 +44,9 @@ public class SecureInputHandler extends DefaultInputHandler {
         try {
             Object console = ReflectUtil.invokeStatic(System.class, "console");
             do {
-                char[] input = (char[]) ReflectUtil.invoke(
+                char[] input = ReflectUtil.invoke(
                     console, "readPassword", String.class, prompt,
-                    Object[].class, (Object[]) null);
+                    Object[].class, null);
                 request.setInput(new String(input));
                 /* for security zero char array after retrieving value */
                 java.util.Arrays.fill(input, ' ');
diff --git a/src/main/org/apache/tools/ant/taskdefs/BindTargets.java b/src/main/org/apache/tools/ant/taskdefs/BindTargets.java
index 432a37941..0a4704f8f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/BindTargets.java
+++ b/src/main/org/apache/tools/ant/taskdefs/BindTargets.java
@@ -66,14 +66,13 @@ public class BindTargets extends Task {
 
         if (getOwningTarget() == null
                 || !"".equals(getOwningTarget().getName())) {
-            throw new BuildException(
-                    "bindtargets only allowed as a top-level task");
+            throw new BuildException("bindtargets only allowed as a top-level task");
         }
 
         if (onMissingExtensionPoint == null) {
             onMissingExtensionPoint = OnMissingExtensionPoint.FAIL;
         }
-        final ProjectHelper helper = (ProjectHelper) getProject().getReference(
+        final ProjectHelper helper = getProject().getReference(
                 ProjectHelper.PROJECTHELPER_REFERENCE);
 
         for (String target : targets) {
diff --git a/src/main/org/apache/tools/ant/taskdefs/Concat.java b/src/main/org/apache/tools/ant/taskdefs/Concat.java
index e632ac28b..0f8e55e3f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Concat.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Concat.java
@@ -355,9 +355,7 @@ public class Concat extends Task implements ResourceCollection {
          * add a character to the lastchars buffer
          */
         private void addLastChar(char ch) {
-            for (int i = lastChars.length - 2; i >= 0; --i) {
-                lastChars[i] = lastChars[i + 1];
-            }
+            System.arraycopy(lastChars, 1, lastChars, 0, lastChars.length - 2 + 1);
             lastChars[lastChars.length - 1] = ch;
         }
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/Copy.java b/src/main/org/apache/tools/ant/taskdefs/Copy.java
index 62c62c1ff..ca9feef47 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Copy.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Copy.java
@@ -40,7 +40,6 @@ import org.apache.tools.ant.types.FilterSetCollection;
 import org.apache.tools.ant.types.Mapper;
 import org.apache.tools.ant.types.Resource;
 import org.apache.tools.ant.types.ResourceCollection;
-import org.apache.tools.ant.types.ResourceFactory;
 import org.apache.tools.ant.types.resources.FileProvider;
 import org.apache.tools.ant.types.resources.FileResource;
 import org.apache.tools.ant.util.FileNameMapper;
@@ -827,10 +826,8 @@ public class Copy extends Task {
             }
             toCopy = v.toArray(new Resource[v.size()]);
         } else {
-            toCopy = ResourceUtils.selectOutOfDateSources(this, fromResources,
-                                                          mapper,
-                                                          (ResourceFactory) name -> new FileResource(toDir, name),
-                                                          granularity);
+            toCopy = ResourceUtils.selectOutOfDateSources(this, fromResources, mapper,
+                    name -> new FileResource(toDir, name), granularity);
         }
         for (Resource rc : toCopy) {
             final String[] mappedFiles = mapper.mapFileName(rc.getName());
diff --git a/src/main/org/apache/tools/ant/taskdefs/CopyPath.java b/src/main/org/apache/tools/ant/taskdefs/CopyPath.java
index e5003d1e8..950942329 100644
--- a/src/main/org/apache/tools/ant/taskdefs/CopyPath.java
+++ b/src/main/org/apache/tools/ant/taskdefs/CopyPath.java
@@ -180,7 +180,7 @@ public class CopyPath extends Task {
         for (String sourceFileName : sourceFiles) {
 
             File sourceFile = new File(sourceFileName);
-            String[] toFiles = (String[]) mapper.mapFileName(sourceFileName);
+            String[] toFiles = mapper.mapFileName(sourceFileName);
             if (toFiles == null) {
                 continue;
             }
diff --git a/src/main/org/apache/tools/ant/taskdefs/Deltree.java b/src/main/org/apache/tools/ant/taskdefs/Deltree.java
index 8c8939156..4d20e0171 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Deltree.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Deltree.java
@@ -19,7 +19,6 @@
 package org.apache.tools.ant.taskdefs;
 
 import java.io.File;
-import java.io.IOException;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Task;
diff --git a/src/main/org/apache/tools/ant/taskdefs/ExecTask.java b/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
index 9d58fb70c..61c274d86 100644
--- a/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
@@ -125,7 +125,7 @@ public class ExecTask extends Task {
      */
     public void setTimeout(Integer value) {
         setTimeout(
-            (value == null) ? null : Long.valueOf(value.intValue()));
+            (value == null) ? null : (long) value);
     }
 
     /**
@@ -699,7 +699,7 @@ public class ExecTask extends Task {
      */
     protected ExecuteWatchdog createWatchdog() throws BuildException {
         return (timeout == null)
-            ? null : new ExecuteWatchdog(timeout.longValue());
+            ? null : new ExecuteWatchdog(timeout);
     }
 
     /**
diff --git a/src/main/org/apache/tools/ant/taskdefs/Execute.java b/src/main/org/apache/tools/ant/taskdefs/Execute.java
index 0968404b1..22ac51e4b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Execute.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Execute.java
@@ -135,30 +135,30 @@ public class Execute {
                 procEnvironment = getVMSLogicals(in);
                 return procEnvironment;
             }
-            String var = null;
+            StringBuilder var = null;
             String line, lineSep = StringUtils.LINE_SEP;
             while ((line = in.readLine()) != null) {
                 if (line.indexOf('=') == -1) {
                     // Chunk part of previous env var (UNIX env vars can
                     // contain embedded new lines).
                     if (var == null) {
-                        var = lineSep + line;
+                        var = new StringBuilder(lineSep + line);
                     } else {
-                        var += lineSep + line;
+                        var.append(lineSep).append(line);
                     }
                 } else {
                     // New env var...append the previous one if we have it.
                     if (var != null) {
-                        int eq = var.indexOf('=');
+                        int eq = var.toString().indexOf('=');
                         procEnvironment.put(var.substring(0, eq),
                                             var.substring(eq + 1));
                     }
-                    var = line;
+                    var = new StringBuilder(line);
                 }
             }
             // Since we "look ahead" before adding, there's one last env var.
             if (var != null) {
-                int eq = var.indexOf('=');
+                int eq = var.toString().indexOf('=');
                 procEnvironment.put(var.substring(0, eq), var.substring(eq + 1));
             }
         } catch (IOException exc) {
diff --git a/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java b/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java
index e9f444e70..1a8862965 100644
--- a/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java
+++ b/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java
@@ -142,7 +142,7 @@ public class ExecuteJava implements Runnable, TimeoutObserver {
                     "Could not find %s. Make sure you have it in your classpath",
                     classname);
             }
-            main = target.getMethod("main", new Class[] {String[].class});
+            main = target.getMethod("main", String[].class);
             if (main == null) {
                 throw new BuildException("Could not find main() method in %s",
                     classname);
@@ -164,7 +164,7 @@ public class ExecuteJava implements Runnable, TimeoutObserver {
                 // main thread will still be there to let the new thread
                 // finish
                 thread.setDaemon(true);
-                Watchdog w = new Watchdog(timeout.longValue());
+                Watchdog w = new Watchdog(timeout);
                 w.addTimeoutObserver(this);
                 synchronized (this) {
                     thread.start();
@@ -289,7 +289,7 @@ public class ExecuteJava implements Runnable, TimeoutObserver {
             = new Execute(redirector.createHandler(),
                           timeout == null
                           ? null
-                          : new ExecuteWatchdog(timeout.longValue()));
+                          : new ExecuteWatchdog(timeout));
         exe.setAntRun(pc.getProject());
         if (Os.isFamily("openvms")) {
             setupCommandLineForVMS(exe, cmdl.getCommandline());
diff --git a/src/main/org/apache/tools/ant/taskdefs/Exit.java b/src/main/org/apache/tools/ant/taskdefs/Exit.java
index 9749c8dfb..35967a55b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Exit.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Exit.java
@@ -117,7 +117,7 @@ public class Exit extends Task {
      * @param i   the <code>int</code> status
      */
     public void setStatus(int i) {
-        status = Integer.valueOf(i);
+        status = i;
     }
 
     /**
@@ -162,7 +162,7 @@ public class Exit extends Task {
             }
             log("failing due to " + text, Project.MSG_DEBUG);
             throw status == null ? new BuildException(text)
-                : new ExitStatusException(text, status.intValue());
+                : new ExitStatusException(text, status);
         }
     }
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/ImportTask.java b/src/main/org/apache/tools/ant/taskdefs/ImportTask.java
index 9fd4fc775..299c07ca3 100644
--- a/src/main/org/apache/tools/ant/taskdefs/ImportTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/ImportTask.java
@@ -297,9 +297,7 @@ public class ImportTask extends Task {
             }
             if (importedURL != null) {
                 URLProvider up = ((Resource) o).as(URLProvider.class);
-                if (up != null && up.getURL().equals(importedURL)) {
-                    return true;
-                }
+                return up != null && up.getURL().equals(importedURL);
             }
         }
         return false;
diff --git a/src/main/org/apache/tools/ant/taskdefs/Java.java b/src/main/org/apache/tools/ant/taskdefs/Java.java
index b4b5a7e7d..5d5a99d87 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Java.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Java.java
@@ -987,7 +987,7 @@ public class Java extends Task {
         if (timeout == null) {
             return null;
         }
-        return new ExecuteWatchdog(timeout.longValue());
+        return new ExecuteWatchdog(timeout);
     }
 
     /**
diff --git a/src/main/org/apache/tools/ant/taskdefs/Javac.java b/src/main/org/apache/tools/ant/taskdefs/Javac.java
index c2001681e..b65c6d3e1 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Javac.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javac.java
@@ -826,7 +826,7 @@ public class Javac extends MatchingTask {
      * @param include if true, includes Ant's own classpath in the classpath
      */
     public void setIncludeantruntime(final boolean include) {
-        includeAntRuntime = Boolean.valueOf(include);
+        includeAntRuntime = include;
     }
 
     /**
@@ -834,7 +834,7 @@ public class Javac extends MatchingTask {
      * @return whether or not the ant classpath is to be included in the classpath
      */
     public boolean getIncludeantruntime() {
-        return includeAntRuntime != null ? includeAntRuntime.booleanValue() : true;
+        return includeAntRuntime != null ? includeAntRuntime : true;
     }
 
     /**
@@ -1459,7 +1459,7 @@ public class Javac extends MatchingTask {
                 continue;
             }
             final String pkg = path.substring(0, path.length() - suffix.length());
-            packageInfos.put(pkg, Long.valueOf(f.lastModified()));
+            packageInfos.put(pkg, f.lastModified());
         }
     }
 
@@ -1475,7 +1475,7 @@ public class Javac extends MatchingTask {
             final File pkgBinDir = new File(dest, pkg.replace('/', File.separatorChar));
             pkgBinDir.mkdirs();
             final File pkgInfoClass = new File(pkgBinDir, "package-info.class");
-            if (pkgInfoClass.isFile() && pkgInfoClass.lastModified() >= sourceLastMod.longValue()) {
+            if (pkgInfoClass.isFile() && pkgInfoClass.lastModified() >= sourceLastMod) {
                 continue;
             }
             log("Creating empty " + pkgInfoClass);
diff --git a/src/main/org/apache/tools/ant/taskdefs/Length.java b/src/main/org/apache/tools/ant/taskdefs/Length.java
index 2305ef748..c39a7951a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Length.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Length.java
@@ -108,7 +108,7 @@ public class Length extends Task implements Condition {
      * @param ell the long length to compare with.
      */
     public synchronized void setLength(long ell) {
-        length = Long.valueOf(ell);
+        length = ell;
     }
 
     /**
@@ -152,7 +152,7 @@ public class Length extends Task implements Condition {
      * @param trim <code>boolean</code>.
      */
     public synchronized void setTrim(boolean trim) {
-        this.trim = Boolean.valueOf(trim);
+        this.trim = trim;
     }
 
     /**
@@ -201,11 +201,11 @@ public class Length extends Task implements Condition {
         }
         Long ell;
         if (STRING.equals(mode)) {
-            ell = Long.valueOf(getLength(string, getTrim()));
+            ell = getLength(string, getTrim());
         } else {
             AccumHandler h = new AccumHandler();
             handleResources(h);
-            ell = Long.valueOf(h.getAccum());
+            ell = h.getAccum();
         }
         return when.evaluate(ell.compareTo(length));
     }
diff --git a/src/main/org/apache/tools/ant/taskdefs/MacroDef.java b/src/main/org/apache/tools/ant/taskdefs/MacroDef.java
index ec5595ff6..d69907d0d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/MacroDef.java
+++ b/src/main/org/apache/tools/ant/taskdefs/MacroDef.java
@@ -427,14 +427,8 @@ public class MacroDef extends AntlibDefinition  {
             } else if (!name.equals(other.name)) {
                 return false;
             }
-            if (defaultValue == null) {
-                if (other.defaultValue != null) {
-                    return false;
-                }
-            } else if (!defaultValue.equals(other.defaultValue)) {
-                return false;
-            }
-            return true;
+            return defaultValue == null ? other.defaultValue == null
+                    : defaultValue.equals(other.defaultValue);
         }
 
         /**
diff --git a/src/main/org/apache/tools/ant/taskdefs/Nice.java b/src/main/org/apache/tools/ant/taskdefs/Nice.java
index 4bd5beb82..b37299ee3 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Nice.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Nice.java
@@ -62,9 +62,9 @@ public class Nice extends Task {
             getProject().setNewProperty(currentPriority, current);
         }
         //if there is a new priority, and it is different, change it
-        if (newPriority != null && priority != newPriority.intValue()) {
+        if (newPriority != null && priority != newPriority) {
             try {
-                self.setPriority(newPriority.intValue());
+                self.setPriority(newPriority);
             } catch (SecurityException e) {
                 //catch permissions denial and keep going
                 log("Unable to set new priority -a security manager is in the way",
@@ -92,7 +92,7 @@ public class Nice extends Task {
         if (newPriority < Thread.MIN_PRIORITY || newPriority > Thread.MAX_PRIORITY) {
             throw new BuildException("The thread priority is out of the range 1-10");
         }
-        this.newPriority = Integer.valueOf(newPriority);
+        this.newPriority = newPriority;
     }
 
 }
diff --git a/src/main/org/apache/tools/ant/taskdefs/PathConvert.java b/src/main/org/apache/tools/ant/taskdefs/PathConvert.java
index fce5b5da1..90391d5c7 100644
--- a/src/main/org/apache/tools/ant/taskdefs/PathConvert.java
+++ b/src/main/org/apache/tools/ant/taskdefs/PathConvert.java
@@ -356,7 +356,7 @@ public class PathConvert extends Task {
 
             StringBuilder rslt = new StringBuilder();
 
-            ResourceCollection resources = isPreserveDuplicates() ? (ResourceCollection) path : new Union(path);
+            ResourceCollection resources = isPreserveDuplicates() ? path : new Union(path);
             List<String> ret = new ArrayList<>();
             FileNameMapper mapperImpl = mapper == null ? new IdentityMapper() : mapper.getImplementation();
             for (Resource r : resources) {
diff --git a/src/main/org/apache/tools/ant/taskdefs/Recorder.java b/src/main/org/apache/tools/ant/taskdefs/Recorder.java
index d632a85c4..d124a4527 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Recorder.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Recorder.java
@@ -157,7 +157,7 @@ public class Recorder extends Task implements SubBuildListener {
         recorder.setMessageOutputLevel(loglevel);
         recorder.setEmacsMode(emacsMode);
         if (start != null) {
-            if (start.booleanValue()) {
+            if (start) {
                 recorder.reopenFile();
                 recorder.setRecordState(start);
             } else {
@@ -214,7 +214,7 @@ public class Recorder extends Task implements SubBuildListener {
             if (append == null) {
                 entry.openFile(false);
             } else {
-                entry.openFile(append.booleanValue());
+                entry.openFile(append);
             }
             entry.setProject(proj);
             recorderEntries.put(name, entry);
diff --git a/src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java b/src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java
index de9ac0f28..f391dbb4a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java
+++ b/src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java
@@ -85,7 +85,7 @@ public class RecorderEntry implements BuildLogger, SubBuildListener {
     public void setRecordState(Boolean state) {
         if (state != null) {
             flush();
-            record = state.booleanValue();
+            record = state;
         }
     }
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/Redirector.java b/src/main/org/apache/tools/ant/taskdefs/Redirector.java
index 9871d168b..f336257dc 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Redirector.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Redirector.java
@@ -708,9 +708,8 @@ public class Redirector {
     /** outStreams */
     private void outStreams() {
         if (out != null && out.length > 0) {
-            final String logHead = new StringBuffer("Output ").append(
-                    ((appendOut) ? "appended" : "redirected")).append(" to ")
-                    .toString();
+            final String logHead = "Output " +
+                    ((appendOut) ? "appended" : "redirected") + " to ";
             outputStream = foldFiles(out, logHead, Project.MSG_VERBOSE,
                     appendOut, createEmptyFilesOut);
         }
@@ -731,9 +730,8 @@ public class Redirector {
 
     private void errorStreams() {
         if (error != null && error.length > 0) {
-            final String logHead = new StringBuffer("Error ").append(
-                    ((appendErr) ? "appended" : "redirected")).append(" to ")
-                    .toString();
+            final String logHead = "Error " +
+                    ((appendErr) ? "appended" : "redirected") + " to ";
             errorStream = foldFiles(error, logHead, Project.MSG_VERBOSE,
                     appendErr, createEmptyFilesErr);
         } else if (!(logError || outputStream == null) && errorProperty == null) {
diff --git a/src/main/org/apache/tools/ant/taskdefs/ResourceCount.java b/src/main/org/apache/tools/ant/taskdefs/ResourceCount.java
index 68a630afc..26a060311 100644
--- a/src/main/org/apache/tools/ant/taskdefs/ResourceCount.java
+++ b/src/main/org/apache/tools/ant/taskdefs/ResourceCount.java
@@ -103,7 +103,7 @@ public class ResourceCount extends Task implements Condition {
      * @param c number of Resources as int.
      */
     public void setCount(int c) {
-        count = Integer.valueOf(c);
+        count = c;
     }
 
     /**
diff --git a/src/main/org/apache/tools/ant/taskdefs/Retry.java b/src/main/org/apache/tools/ant/taskdefs/Retry.java
index 564d80e12..43669e4f8 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Retry.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Retry.java
@@ -91,13 +91,9 @@ public class Retry extends Task implements TaskContainer {
             } catch (Exception e) {
                 errorMessages.append(e.getMessage());
                 if (i >= retryCount) {
-                    StringBuilder exceptionMessage = new StringBuilder();
-                    exceptionMessage.append("Task [").append(nestedTask.getTaskName());
-                    exceptionMessage.append("] failed after [").append(retryCount);
-                    exceptionMessage.append("] attempts; giving up.").append(StringUtils.LINE_SEP);
-                    exceptionMessage.append("Error messages:").append(StringUtils.LINE_SEP);
-                    exceptionMessage.append(errorMessages);
-                    throw new BuildException(exceptionMessage.toString(), getLocation());
+                    throw new BuildException(String.format(
+                            "Task [%s] failed after [%d] attempts; giving up.%nError messages:%n%s",
+                            nestedTask.getTaskName(), retryCount, errorMessages), getLocation());
                 }
                 String msg;
                 if (retryDelay > 0) {
diff --git a/src/main/org/apache/tools/ant/taskdefs/SubAnt.java b/src/main/org/apache/tools/ant/taskdefs/SubAnt.java
index 0fb98739e..cd97123ed 100644
--- a/src/main/org/apache/tools/ant/taskdefs/SubAnt.java
+++ b/src/main/org/apache/tools/ant/taskdefs/SubAnt.java
@@ -329,14 +329,7 @@ public class SubAnt extends Task {
         if (t instanceof BuildException) {
             return isHardError(t.getCause());
         }
-        if (t instanceof OutOfMemoryError) {
-            return true;
-        }
-        if (t instanceof ThreadDeath) {
-            return true;
-        }
-        // incl. t == null
-        return false;
+        return t instanceof OutOfMemoryError || t instanceof ThreadDeath;
     }
 
     /**
diff --git a/src/main/org/apache/tools/ant/taskdefs/Sync.java b/src/main/org/apache/tools/ant/taskdefs/Sync.java
index 66a69f850..cca99e460 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Sync.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Sync.java
@@ -252,7 +252,7 @@ public class Sync extends Task {
         }
 
         Boolean ped = getExplicitPreserveEmptyDirs();
-        if (ped != null && ped.booleanValue() != myCopy.getIncludeEmptyDirs()) {
+        if (ped != null && ped != myCopy.getIncludeEmptyDirs()) {
             FileSet fs = syncTarget.toFileSet(true);
             fs.setDir(toDir);
             String[] preservedDirs =
@@ -554,7 +554,7 @@ public class Sync extends Task {
          * @since Ant 1.8.0
          */
         public void setPreserveEmptyDirs(boolean b) {
-            preserveEmptyDirs = Boolean.valueOf(b);
+            preserveEmptyDirs = b;
         }
 
         /**
diff --git a/src/main/org/apache/tools/ant/taskdefs/Tar.java b/src/main/org/apache/tools/ant/taskdefs/Tar.java
index 879c17c2b..41f02df32 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Tar.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Tar.java
@@ -750,7 +750,7 @@ public class Tar extends MatchingTask {
      */
     protected TarFileSet asTarFileSet(final ArchiveFileSet archiveFileSet) {
         TarFileSet tfs;
-        if (archiveFileSet != null && archiveFileSet instanceof TarFileSet) {
+        if (archiveFileSet instanceof TarFileSet) {
             tfs = (TarFileSet) archiveFileSet;
         } else {
             tfs = new TarFileSet();
diff --git a/src/main/org/apache/tools/ant/taskdefs/Truncate.java b/src/main/org/apache/tools/ant/taskdefs/Truncate.java
index cb8fd4a1c..62664d846 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Truncate.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Truncate.java
@@ -40,7 +40,7 @@ public class Truncate extends Task {
 
     private static final int BUFFER_SIZE = 1024;
 
-    private static final Long ZERO = new Long(0L);
+    private static final Long ZERO = 0L;
 
     private static final String NO_CHILD = "No files specified.";
 
@@ -91,7 +91,7 @@ public class Truncate extends Task {
      */
     public void setLength(Long length) {
         this.length = length;
-        if (length != null && length.longValue() < 0) {
+        if (length != null && length < 0) {
             throw new BuildException(INVALID_LENGTH + length);
         }
     }
@@ -159,7 +159,7 @@ public class Truncate extends Task {
     private void process(File f) {
         long len = f.length();
         long newLength = length == null
-                ? len + adjust.longValue() : length.longValue();
+                ? len + adjust : length;
 
         if (len == newLength) {
             //nothing to do!
diff --git a/src/main/org/apache/tools/ant/taskdefs/Tstamp.java b/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
index d31cb2d9b..aa121698e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
@@ -342,14 +342,14 @@ public class Tstamp extends Task {
         /** Constructor for Unit enumerated type. */
         public Unit() {
             calendarFields.put(MILLISECOND,
-                               Integer.valueOf(Calendar.MILLISECOND));
-            calendarFields.put(SECOND, Integer.valueOf(Calendar.SECOND));
-            calendarFields.put(MINUTE, Integer.valueOf(Calendar.MINUTE));
-            calendarFields.put(HOUR, Integer.valueOf(Calendar.HOUR_OF_DAY));
-            calendarFields.put(DAY, Integer.valueOf(Calendar.DATE));
-            calendarFields.put(WEEK, Integer.valueOf(Calendar.WEEK_OF_YEAR));
-            calendarFields.put(MONTH, Integer.valueOf(Calendar.MONTH));
-            calendarFields.put(YEAR, Integer.valueOf(Calendar.YEAR));
+                    Calendar.MILLISECOND);
+            calendarFields.put(SECOND, Calendar.SECOND);
+            calendarFields.put(MINUTE, Calendar.MINUTE);
+            calendarFields.put(HOUR, Calendar.HOUR_OF_DAY);
+            calendarFields.put(DAY, Calendar.DATE);
+            calendarFields.put(WEEK, Calendar.WEEK_OF_YEAR);
+            calendarFields.put(MONTH, Calendar.MONTH);
+            calendarFields.put(YEAR, Calendar.YEAR);
         }
 
         /**
@@ -358,7 +358,7 @@ public class Tstamp extends Task {
          */
         public int getCalendarField() {
             String key = getValue().toLowerCase(Locale.ENGLISH);
-            return calendarFields.get(key).intValue();
+            return calendarFields.get(key);
         }
 
         /**
diff --git a/src/main/org/apache/tools/ant/taskdefs/WaitFor.java b/src/main/org/apache/tools/ant/taskdefs/WaitFor.java
index 179b97a89..af7372fe9 100644
--- a/src/main/org/apache/tools/ant/taskdefs/WaitFor.java
+++ b/src/main/org/apache/tools/ant/taskdefs/WaitFor.java
@@ -244,12 +244,12 @@ public class WaitFor extends ConditionBase {
 
         /** Constructor the Unit enumerated type. */
         public Unit() {
-            timeTable.put(MILLISECOND, Long.valueOf(1L));
-            timeTable.put(SECOND,      Long.valueOf(ONE_SECOND));
-            timeTable.put(MINUTE,      Long.valueOf(ONE_MINUTE));
-            timeTable.put(HOUR,        Long.valueOf(ONE_HOUR));
-            timeTable.put(DAY,         Long.valueOf(ONE_DAY));
-            timeTable.put(WEEK,        Long.valueOf(ONE_WEEK));
+            timeTable.put(MILLISECOND, 1L);
+            timeTable.put(SECOND, ONE_SECOND);
+            timeTable.put(MINUTE, ONE_MINUTE);
+            timeTable.put(HOUR, ONE_HOUR);
+            timeTable.put(DAY, ONE_DAY);
+            timeTable.put(WEEK, ONE_WEEK);
         }
 
         /**
@@ -258,7 +258,7 @@ public class WaitFor extends ConditionBase {
          */
         public long getMultiplier() {
             String key = getValue().toLowerCase(Locale.ENGLISH);
-            return timeTable.get(key).longValue();
+            return timeTable.get(key);
         }
 
         /**
diff --git a/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java b/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java
index e69a23de4..1303099de 100644
--- a/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java
+++ b/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java
@@ -363,10 +363,8 @@ public class XmlProperty extends Task {
                     String nodeName = attributeNode.getNodeName();
                     String attributeValue = getAttributeValue(attributeNode);
 
-                    Path containingPath =
-                        ((container != null) && (container instanceof Path))
-                        ? (Path) container
-                        : null;
+                    Path containingPath = container instanceof Path
+                        ? (Path) container : null;
                     /*
                      * The main conditional logic -- if the attribute
                      * is somehow "special" (i.e., it has known
diff --git a/src/main/org/apache/tools/ant/taskdefs/Zip.java b/src/main/org/apache/tools/ant/taskdefs/Zip.java
index 3b31a16a9..078c21a75 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Zip.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Zip.java
@@ -1248,11 +1248,11 @@ public class Zip extends MatchingTask {
                                              final File zipFile,
                                              final boolean needsUpdate)
         throws BuildException {
-        final List<ResourceCollection> filesets = new ArrayList<>();
+        final List<FileSet> filesets = new ArrayList<>();
         final List<ResourceCollection> rest = new ArrayList<>();
         for (ResourceCollection rc : rcs) {
             if (rc instanceof FileSet) {
-                filesets.add(rc);
+                filesets.add((FileSet) rc);
             } else {
                 rest.add(rc);
             }
@@ -1262,8 +1262,7 @@ public class Zip extends MatchingTask {
         ArchiveState as = getNonFileSetResourcesToAdd(rc, zipFile,
                                                       needsUpdate);
 
-        final FileSet[] fs = filesets.toArray(new FileSet[filesets
-                                                                .size()]);
+        final FileSet[] fs = filesets.toArray(new FileSet[filesets.size()]);
         final ArchiveState as2 = getResourcesToAdd(fs, zipFile, as.isOutOfDate());
         if (!as.isOutOfDate() && as2.isOutOfDate()) {
             /*
@@ -1498,7 +1497,7 @@ public class Zip extends MatchingTask {
 
         final Resource[][] initialResources = grabNonFileSetResources(rcs);
         final boolean empty = isEmpty(initialResources);
-        HAVE_NON_FILE_SET_RESOURCES_TO_ADD.set(Boolean.valueOf(!empty));
+        HAVE_NON_FILE_SET_RESOURCES_TO_ADD.set(!empty);
         if (empty) {
             // no emptyBehavior handling since the FileSet version
             // will take care of it.
diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java b/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java
index 637ce0eff..bc2984061 100644
--- a/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java
+++ b/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java
@@ -55,16 +55,12 @@ public class Javac12 extends DefaultCompilerAdapter {
             // Create an instance of the compiler, redirecting output to
             // the project log
             Class<?> c = Class.forName(CLASSIC_COMPILER_CLASSNAME);
-            Constructor cons =
-                c.getConstructor(OutputStream.class, String.class);
-            Object compiler
-                = cons.newInstance(logstr, "javac");
+            Constructor cons = c.getConstructor(OutputStream.class, String.class);
+            Object compiler = cons.newInstance(logstr, "javac");
 
             // Call the compile() method
             Method compile = c.getMethod("compile", String[].class);
-            Boolean ok = (Boolean) compile.invoke(compiler,
-                    new Object[] {cmd.getArguments()});
-            return ok.booleanValue();
+            return (Boolean) compile.invoke(compiler, new Object[] {cmd.getArguments()});
         } catch (ClassNotFoundException ex) {
             throw new BuildException("Cannot use classic compiler, as it is "
                                         + "not available. \n"
diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/Javac13.java b/src/main/org/apache/tools/ant/taskdefs/compilers/Javac13.java
index e66d10edb..2b71cc328 100644
--- a/src/main/org/apache/tools/ant/taskdefs/compilers/Javac13.java
+++ b/src/main/org/apache/tools/ant/taskdefs/compilers/Javac13.java
@@ -54,8 +54,8 @@ public class Javac13 extends DefaultCompilerAdapter {
             Class<?> c = Class.forName("com.sun.tools.javac.Main");
             Object compiler = c.newInstance();
             Method compile = c.getMethod("compile", String[].class);
-            int result = ((Integer) compile.invoke(compiler,
-                (Object) cmd.getArguments())).intValue();
+            int result = (Integer) compile.invoke(compiler,
+                    (Object) cmd.getArguments());
             return result == MODERN_COMPILER_SUCCESS;
         } catch (Exception ex) {
             if (ex instanceof BuildException) {
diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/HasFreeSpace.java b/src/main/org/apache/tools/ant/taskdefs/condition/HasFreeSpace.java
index c41e1ee06..9f6cd9509 100644
--- a/src/main/org/apache/tools/ant/taskdefs/condition/HasFreeSpace.java
+++ b/src/main/org/apache/tools/ant/taskdefs/condition/HasFreeSpace.java
@@ -49,7 +49,7 @@ public class HasFreeSpace implements Condition {
                 //reflection to avoid bootstrap/build problems
                 File fs = new File(partition);
                 ReflectWrapper w = new ReflectWrapper(fs);
-                long free = w.<Long> invoke("getFreeSpace").longValue();
+                long free = w.<Long>invoke("getFreeSpace");
                 return free >= StringUtils.parseHumanSizes(needed);
             }
             throw new BuildException(
diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/Http.java b/src/main/org/apache/tools/ant/taskdefs/condition/Http.java
index 5a4610511..de9317475 100644
--- a/src/main/org/apache/tools/ant/taskdefs/condition/Http.java
+++ b/src/main/org/apache/tools/ant/taskdefs/condition/Http.java
@@ -113,10 +113,7 @@ public class Http extends ProjectComponent implements Condition {
                     int code = http.getResponseCode();
                     log("Result code for " + spec + " was " + code,
                         Project.MSG_VERBOSE);
-                    if (code > 0 && code < errorsBeginAt) {
-                        return true;
-                    }
-                    return false;
+                    return code > 0 && code < errorsBeginAt;
                 }
             } catch (ProtocolException pe) {
                 throw new BuildException("Invalid HTTP protocol: "
diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/IsFalse.java b/src/main/org/apache/tools/ant/taskdefs/condition/IsFalse.java
index 0b3e69b4c..5cc1628ff 100644
--- a/src/main/org/apache/tools/ant/taskdefs/condition/IsFalse.java
+++ b/src/main/org/apache/tools/ant/taskdefs/condition/IsFalse.java
@@ -48,7 +48,7 @@ public class IsFalse extends ProjectComponent implements Condition {
         if (value == null) {
             throw new BuildException("Nothing to test for falsehood");
         }
-        return !value.booleanValue();
+        return !value;
     }
 
 }
diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/IsReachable.java b/src/main/org/apache/tools/ant/taskdefs/condition/IsReachable.java
index 296208748..a8a2d4b3f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/condition/IsReachable.java
+++ b/src/main/org/apache/tools/ant/taskdefs/condition/IsReachable.java
@@ -179,8 +179,8 @@ public class IsReachable extends ProjectComponent implements Condition {
             Method reachableMethod =
                 InetAddress.class.getMethod(METHOD_NAME, Integer.class);
             try {
-                reachable = ((Boolean) reachableMethod.invoke(address,
-                    Integer.valueOf(timeout * SECOND))).booleanValue();
+                reachable = (Boolean) reachableMethod.invoke(address,
+                        timeout * SECOND);
             } catch (final IllegalAccessException e) {
                 //utterly implausible, but catered for anyway
                 throw new BuildException("When calling " + reachableMethod);
diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/IsTrue.java b/src/main/org/apache/tools/ant/taskdefs/condition/IsTrue.java
index e64d9ac87..d94a3d338 100644
--- a/src/main/org/apache/tools/ant/taskdefs/condition/IsTrue.java
+++ b/src/main/org/apache/tools/ant/taskdefs/condition/IsTrue.java
@@ -49,7 +49,7 @@ public class IsTrue extends ProjectComponent implements Condition {
         if (value == null) {
             throw new BuildException("Nothing to test for truth");
         }
-        return value.booleanValue();
+        return value;
     }
 
 }
diff --git a/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java b/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java
index ae3d525fc..6641cfe8f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java
@@ -165,7 +165,7 @@ public class EmailTask extends Task {
      * @param port The port to use.
      */
     public void setMailport(int port) {
-        this.port = Integer.valueOf(port);
+        this.port = port;
     }
 
     /**
@@ -554,7 +554,7 @@ public class EmailTask extends Task {
             // pass the params to the mailer
             mailer.setHost(host);
             if (port != null) {
-                mailer.setPort(port.intValue());
+                mailer.setPort(port);
                 mailer.setPortExplicitlySpecified(true);
             } else {
                 mailer.setPort(SMTP_PORT);
diff --git a/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java b/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java
index 70c38daf6..74067562b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java
+++ b/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java
@@ -111,8 +111,8 @@ public class MimeMailer extends Mailer {
                 return type;
             }
             // Must be like "text/plain; charset=windows-1251"
-            return new StringBuilder(type != null ? type : "text/plain").append(
-                "; charset=").append(charset).toString();
+            return (type != null ? type : "text/plain") +
+                    "; charset=" + charset;
         }
 
         @Override
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java b/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java
index 064336a87..f20d2724e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java
@@ -692,14 +692,14 @@ public class PropertyFile extends Task {
         /** no arg constructor */
         public Unit() {
             calendarFields.put(MILLISECOND,
-                Integer.valueOf(Calendar.MILLISECOND));
-            calendarFields.put(SECOND, Integer.valueOf(Calendar.SECOND));
-            calendarFields.put(MINUTE, Integer.valueOf(Calendar.MINUTE));
-            calendarFields.put(HOUR, Integer.valueOf(Calendar.HOUR_OF_DAY));
-            calendarFields.put(DAY, Integer.valueOf(Calendar.DATE));
-            calendarFields.put(WEEK, Integer.valueOf(Calendar.WEEK_OF_YEAR));
-            calendarFields.put(MONTH, Integer.valueOf(Calendar.MONTH));
-            calendarFields.put(YEAR, Integer.valueOf(Calendar.YEAR));
+                    Calendar.MILLISECOND);
+            calendarFields.put(SECOND, Calendar.SECOND);
+            calendarFields.put(MINUTE, Calendar.MINUTE);
+            calendarFields.put(HOUR, Calendar.HOUR_OF_DAY);
+            calendarFields.put(DAY, Calendar.DATE);
+            calendarFields.put(WEEK, Calendar.WEEK_OF_YEAR);
+            calendarFields.put(MONTH, Calendar.MONTH);
+            calendarFields.put(YEAR, Calendar.YEAR);
         }
 
         /**
@@ -707,7 +707,7 @@ public class PropertyFile extends Task {
          * @return the calendar value.
          */
         public int getCalendarField() {
-            return calendarFields.get(getValue().toLowerCase()).intValue();
+            return calendarFields.get(getValue().toLowerCase());
         }
 
         /** {@inheritDoc}. */
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/SchemaValidate.java b/src/main/org/apache/tools/ant/taskdefs/optional/SchemaValidate.java
index 4e1837c31..62a42392a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/SchemaValidate.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/SchemaValidate.java
@@ -428,8 +428,7 @@ public class SchemaValidate extends XMLValidateTask {
          */
         public String getURIandLocation() throws BuildException {
             validateNamespace();
-            return new StringBuilder(namespace).append(' ')
-                .append(getSchemaLocationURL()).toString();
+            return namespace + ' ' + getSchemaLocationURL();
         }
 
         /**
@@ -475,11 +474,7 @@ public class SchemaValidate extends XMLValidateTask {
                     : schemaLocation.namespace != null) {
                 return false;
             }
-            if (url != null ? !url.equals(schemaLocation.url) : schemaLocation.url != null) {
-                return false;
-            }
-
-            return true;
+            return url != null ? url.equals(schemaLocation.url) : schemaLocation.url == null;
         }
 
         /**
@@ -504,12 +499,10 @@ public class SchemaValidate extends XMLValidateTask {
          */
         @Override
         public String toString() {
-            StringBuilder buffer = new StringBuilder();
-            buffer.append(namespace != null ? namespace : "(anonymous)");
-            buffer.append(' ');
-            buffer.append(url != null ? (url + " ") : "");
-            buffer.append(file != null ? file.getAbsolutePath() : "");
-            return buffer.toString();
+            String buffer = (namespace != null ? namespace : "(anonymous)")
+                    + ' ' + (url != null ? (url + " ") : "")
+                    + (file != null ? file.getAbsolutePath() : "");
+            return buffer;
         }
     } //SchemaLocation
 }
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/AntAnalyzer.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/AntAnalyzer.java
index 3c8d82b33..160bbc7b2 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/AntAnalyzer.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/AntAnalyzer.java
@@ -84,9 +84,7 @@ public class AntAnalyzer extends AbstractAnalyzer {
                         }
                         ClassFile classFile = new ClassFile();
                         classFile.read(inStream);
-                        for (String dependency : classFile.getClassRefs()) {
-                            analyzedDeps.add(dependency);
-                        }
+                        analyzedDeps.addAll(classFile.getClassRefs());
                     } finally {
                         FileUtils.close(inStream);
                         FileUtils.close(zipFile);
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java
index 3a5f69c7c..5058abd72 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java
@@ -103,7 +103,7 @@ public class ConstantPool {
         if (entry instanceof Utf8CPInfo) {
             Utf8CPInfo utf8Info = (Utf8CPInfo) entry;
 
-            utf8Indexes.put(utf8Info.getValue(), Integer.valueOf(index));
+            utf8Indexes.put(utf8Info.getValue(), index);
         }
 
         return index;
@@ -145,7 +145,7 @@ public class ConstantPool {
         Integer indexInteger = utf8Indexes.get(value);
 
         if (indexInteger != null) {
-            index = indexInteger.intValue();
+            index = indexInteger;
         }
 
         return index;
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/DoubleCPInfo.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/DoubleCPInfo.java
index 5f28999a5..a3b20c5df 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/DoubleCPInfo.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/DoubleCPInfo.java
@@ -43,7 +43,7 @@ public class DoubleCPInfo extends ConstantCPInfo {
      */
     @Override
     public void read(DataInputStream cpStream) throws IOException {
-        setValue(Double.valueOf(cpStream.readDouble()));
+        setValue(cpStream.readDouble());
     }
 
     /**
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/FloatCPInfo.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/FloatCPInfo.java
index d9bf46599..1437c52f0 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/FloatCPInfo.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/FloatCPInfo.java
@@ -41,7 +41,7 @@ public class FloatCPInfo extends ConstantCPInfo {
      */
     @Override
     public void read(DataInputStream cpStream) throws IOException {
-        setValue(Float.valueOf(cpStream.readFloat()));
+        setValue(cpStream.readFloat());
     }
 
     /**
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/IntegerCPInfo.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/IntegerCPInfo.java
index a3ecdaad8..2d6c68847 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/IntegerCPInfo.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/IntegerCPInfo.java
@@ -41,7 +41,7 @@ public class IntegerCPInfo extends ConstantCPInfo {
      */
     @Override
     public void read(DataInputStream cpStream) throws IOException {
-        setValue(Integer.valueOf(cpStream.readInt()));
+        setValue(cpStream.readInt());
     }
 
     /**
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/LongCPInfo.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/LongCPInfo.java
index 9e57a39b3..97168abba 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/LongCPInfo.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/LongCPInfo.java
@@ -41,7 +41,7 @@ public class LongCPInfo extends ConstantCPInfo {
      */
     @Override
     public void read(DataInputStream cpStream) throws IOException {
-        setValue(Long.valueOf(cpStream.readLong()));
+        setValue(cpStream.readLong());
     }
 
     /**
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java
index e7ccce755..2e26d8574 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java
@@ -330,19 +330,19 @@ public class IPlanetEjbc {
     private static void usage() {
         System.out.println("java org.apache.tools.ant.taskdefs.optional.ejb.IPlanetEjbc \\");
         System.out.println("  [OPTIONS] [EJB 1.1 descriptor] [iAS EJB descriptor]");
-        System.out.println("");
+        System.out.println();
         System.out.println("Where OPTIONS are:");
         System.out.println("  -debug -- for additional debugging output");
         System.out.println("  -keepsource -- to retain Java source files generated");
         System.out.println("  -classpath [classpath] -- classpath used for compilation");
         System.out.println("  -d [destination directory] -- directory for compiled classes");
-        System.out.println("");
+        System.out.println();
         System.out.println("If a classpath is not specified, the system classpath");
         System.out.println("will be used.  If a destination directory is not specified,");
         System.out.println("the current working directory will be used (classes will");
         System.out.println("still be placed in subfolders which correspond to their");
         System.out.println("package name).");
-        System.out.println("");
+        System.out.println();
         System.out.println("The EJB home interface, remote interface, and implementation");
         System.out.println("class must be found in the destination directory.  In");
         System.out.println("addition, the destination will look for the stubs and skeletons");
@@ -1295,21 +1295,21 @@ public class IPlanetEjbc {
          */
         @Override
         public String toString() {
-            String s = "EJB name: " + name
-                        + "\n\r              home:      " + home
-                        + "\n\r              remote:    " + remote
-                        + "\n\r              impl:      " + implementation
-                        + "\n\r              primaryKey: " + primaryKey
-                        + "\n\r              beantype:  " + beantype
-                        + "\n\r              cmp:       " + cmp
-                        + "\n\r              iiop:      " + iiop
-                        + "\n\r              hasession: " + hasession;
+            StringBuilder s = new StringBuilder("EJB name: " + name
+                    + "\n\r              home:      " + home
+                    + "\n\r              remote:    " + remote
+                    + "\n\r              impl:      " + implementation
+                    + "\n\r              primaryKey: " + primaryKey
+                    + "\n\r              beantype:  " + beantype
+                    + "\n\r              cmp:       " + cmp
+                    + "\n\r              iiop:      " + iiop
+                    + "\n\r              hasession: " + hasession);
 
             for (String cmpDescriptor : cmpDescriptors) {
-                s += "\n\r              CMP Descriptor: " + cmpDescriptor;
+                s.append("\n\r              CMP Descriptor: ").append(cmpDescriptor);
             }
 
-            return s;
+            return s.toString();
         }
 
     } // End of EjbInfo inner class
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
index 2eba14d5f..8356471c6 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
@@ -830,8 +830,7 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool {
                     rebuild = true;
                 }
             }
-            if (genericLoader != null
-                && genericLoader instanceof AntClassLoader) {
+            if (genericLoader instanceof AntClassLoader) {
                 @SuppressWarnings("resource")
                 AntClassLoader loader = (AntClassLoader) genericLoader;
                 loader.cleanup();
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
index 2ea7279d5..0aaf5caa3 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
@@ -812,8 +812,7 @@ public class WebsphereDeploymentTool extends GenericDeploymentTool {
                     rebuild = true;
                 }
             }
-            if (genericLoader != null
-                && genericLoader instanceof AntClassLoader) {
+            if (genericLoader instanceof AntClassLoader) {
                 @SuppressWarnings("resource")
                 AntClassLoader loader = (AntClassLoader) genericLoader;
                 loader.cleanup();
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java
index 12f2a161f..de559eca5 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java
@@ -20,6 +20,7 @@ package org.apache.tools.ant.taskdefs.optional.extension;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.jar.JarFile;
 import java.util.jar.Manifest;
@@ -66,9 +67,7 @@ public final class ExtensionUtil {
                                    final List<FileSet> fileset)
         throws BuildException {
         if (!fileset.isEmpty()) {
-            for (Extension extension : getExtensions(project, fileset)) {
-                libraries.add(extension);
-            }
+            Collections.addAll(libraries, getExtensions(project, fileset));
         }
     }
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/Specification.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/Specification.java
index f1d33e29f..eb7e1fab7 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/Specification.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/Specification.java
@@ -332,33 +332,22 @@ public final class Specification {
         }
 
         // Available specification version must be >= required
-        final DeweyDecimal otherSpecificationVersion
-            = other.getSpecificationVersion();
-        if (null != specificationVersion) {
-            if (null == otherSpecificationVersion
-                || !isCompatible(specificationVersion, otherSpecificationVersion)) {
-                return REQUIRE_SPECIFICATION_UPGRADE;
-            }
+        final DeweyDecimal otherSpecificationVersion = other.getSpecificationVersion();
+        if (null != specificationVersion && (null == otherSpecificationVersion
+                || !isCompatible(specificationVersion, otherSpecificationVersion))) {
+            return REQUIRE_SPECIFICATION_UPGRADE;
         }
 
         // Implementation Vendor ID must match
-        final String otherImplementationVendor
-            = other.getImplementationVendor();
-        if (null != implementationVendor) {
-            if (null == otherImplementationVendor
-                || !implementationVendor.equals(otherImplementationVendor)) {
-                return REQUIRE_VENDOR_SWITCH;
-            }
+        if (null != implementationVendor
+                && !implementationVendor.equals(other.getImplementationVendor())) {
+            return REQUIRE_VENDOR_SWITCH;
         }
 
         // Implementation version must be >= required
-        final String otherImplementationVersion
-            = other.getImplementationVersion();
-        if (null != implementationVersion) {
-            if (null == otherImplementationVersion
-                || !implementationVersion.equals(otherImplementationVersion)) {
-                return REQUIRE_IMPLEMENTATION_CHANGE;
-            }
+        if (null != implementationVersion
+                && !implementationVersion.equals(other.getImplementationVersion())) {
+            return REQUIRE_IMPLEMENTATION_CHANGE;
         }
 
         // This available optional package satisfies the requirements
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJDoc.java b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJDoc.java
index d3aff0840..506d63e84 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJDoc.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJDoc.java
@@ -65,7 +65,7 @@ public class JJDoc extends Task {
      * @param plainText a <code>boolean</code> value.
      */
     public void setText(boolean plainText) {
-        optionalAttrs.put(TEXT, Boolean.valueOf(plainText));
+        optionalAttrs.put(TEXT, plainText);
         this.plainText = plainText;
     }
 
@@ -74,7 +74,7 @@ public class JJDoc extends Task {
      * @param oneTable a <code>boolean</code> value.
      */
     public void setOnetable(boolean oneTable) {
-        optionalAttrs.put(ONE_TABLE, Boolean.valueOf(oneTable));
+        optionalAttrs.put(ONE_TABLE, oneTable);
     }
 
     /**
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
index 433ce22f1..9b9fa5b66 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
@@ -74,7 +74,7 @@ public class JJTree extends Task {
      * @param buildNodeFiles a <code>boolean</code> value.
      */
     public void setBuildnodefiles(boolean buildNodeFiles) {
-        optionalAttrs.put(BUILD_NODE_FILES, Boolean.valueOf(buildNodeFiles));
+        optionalAttrs.put(BUILD_NODE_FILES, buildNodeFiles);
     }
 
     /**
@@ -82,7 +82,7 @@ public class JJTree extends Task {
      * @param multi a <code>boolean</code> value.
      */
     public void setMulti(boolean multi) {
-        optionalAttrs.put(MULTI, Boolean.valueOf(multi));
+        optionalAttrs.put(MULTI, multi);
     }
 
     /**
@@ -90,7 +90,7 @@ public class JJTree extends Task {
      * @param nodeDefaultVoid a <code>boolean</code> value.
      */
     public void setNodedefaultvoid(boolean nodeDefaultVoid) {
-        optionalAttrs.put(NODE_DEFAULT_VOID, Boolean.valueOf(nodeDefaultVoid));
+        optionalAttrs.put(NODE_DEFAULT_VOID, nodeDefaultVoid);
     }
 
     /**
@@ -98,7 +98,7 @@ public class JJTree extends Task {
      * @param nodeFactory a <code>boolean</code> value.
      */
     public void setNodefactory(boolean nodeFactory) {
-        optionalAttrs.put(NODE_FACTORY, Boolean.valueOf(nodeFactory));
+        optionalAttrs.put(NODE_FACTORY, nodeFactory);
     }
 
     /**
@@ -106,7 +106,7 @@ public class JJTree extends Task {
      * @param nodeScopeHook a <code>boolean</code> value.
      */
     public void setNodescopehook(boolean nodeScopeHook) {
-        optionalAttrs.put(NODE_SCOPE_HOOK, Boolean.valueOf(nodeScopeHook));
+        optionalAttrs.put(NODE_SCOPE_HOOK, nodeScopeHook);
     }
 
     /**
@@ -114,7 +114,7 @@ public class JJTree extends Task {
      * @param nodeUsesParser a <code>boolean</code> value.
      */
     public void setNodeusesparser(boolean nodeUsesParser) {
-        optionalAttrs.put(NODE_USES_PARSER, Boolean.valueOf(nodeUsesParser));
+        optionalAttrs.put(NODE_USES_PARSER, nodeUsesParser);
     }
 
     /**
@@ -122,7 +122,7 @@ public class JJTree extends Task {
      * @param staticParser a <code>boolean</code> value.
      */
     public void setStatic(boolean staticParser) {
-        optionalAttrs.put(STATIC, Boolean.valueOf(staticParser));
+        optionalAttrs.put(STATIC, staticParser);
     }
 
     /**
@@ -130,7 +130,7 @@ public class JJTree extends Task {
      * @param visitor a <code>boolean</code> value.
      */
     public void setVisitor(boolean visitor) {
-        optionalAttrs.put(VISITOR, Boolean.valueOf(visitor));
+        optionalAttrs.put(VISITOR, visitor);
     }
 
     /**
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
index 79a24b8a2..6940eda5d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
@@ -111,7 +111,7 @@ public class JavaCC extends Task {
      * @param lookahead an <code>int</code> value.
      */
     public void setLookahead(int lookahead) {
-        optionalAttrs.put(LOOKAHEAD, Integer.valueOf(lookahead));
+        optionalAttrs.put(LOOKAHEAD, lookahead);
     }
 
     /**
@@ -119,7 +119,7 @@ public class JavaCC extends Task {
      * @param choiceAmbiguityCheck an <code>int</code> value.
      */
     public void setChoiceambiguitycheck(int choiceAmbiguityCheck) {
-        optionalAttrs.put(CHOICE_AMBIGUITY_CHECK, Integer.valueOf(choiceAmbiguityCheck));
+        optionalAttrs.put(CHOICE_AMBIGUITY_CHECK, choiceAmbiguityCheck);
     }
 
     /**
@@ -127,7 +127,7 @@ public class JavaCC extends Task {
      * @param otherAmbiguityCheck an <code>int</code> value.
      */
     public void setOtherambiguityCheck(int otherAmbiguityCheck) {
-        optionalAttrs.put(OTHER_AMBIGUITY_CHECK, Integer.valueOf(otherAmbiguityCheck));
+        optionalAttrs.put(OTHER_AMBIGUITY_CHECK, otherAmbiguityCheck);
     }
 
     /**
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 1aa92283b..612e58cb8 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
@@ -624,7 +624,7 @@ public class JDependTask extends Task {
         if (getTimeout() == null) {
             return null;
         }
-        return new ExecuteWatchdog(getTimeout().longValue());
+        return new ExecuteWatchdog(getTimeout());
     }
 
     private Optional<Path> getWorkingPath() {
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jlink/ClassNameReader.java b/src/main/org/apache/tools/ant/taskdefs/optional/jlink/ClassNameReader.java
index 217ad8fb1..602583488 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/jlink/ClassNameReader.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/jlink/ClassNameReader.java
@@ -64,33 +64,33 @@ class ConstantPool {
                 break;
 
             case INTEGER :
-                values[i] = Integer.valueOf(data.readInt());
+                values[i] = data.readInt();
                 break;
 
             case FLOAT :
-                values[i] = Float.valueOf(data.readFloat());
+                values[i] = data.readFloat();
                 break;
 
             case LONG :
-                values[i] = Long.valueOf(data.readLong());
+                values[i] = data.readLong();
                 ++i;
                 break;
 
             case DOUBLE :
-                values[i] = Double.valueOf(data.readDouble());
+                values[i] = data.readDouble();
                 ++i;
                 break;
 
             case CLASS :
             case STRING :
-                values[i] = Integer.valueOf(data.readUnsignedShort());
+                values[i] = data.readUnsignedShort();
                 break;
 
             case FIELDREF :
             case METHODREF :
             case INTERFACEMETHODREF :
             case NAMEANDTYPE :
-                values[i] = Integer.valueOf(data.readInt());
+                values[i] = data.readInt();
                 break;
             default:
                 // Do nothing
@@ -129,7 +129,7 @@ public class ClassNameReader {
         /* int accessFlags = */ data.readUnsignedShort();
         int classIndex = data.readUnsignedShort();
         Integer stringIndex = (Integer) values[classIndex];
-        String className = (String) values[stringIndex.intValue()];
+        String className = (String) values[stringIndex];
         return className;
     }
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java
index 55397496c..6aed62879 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java
@@ -307,14 +307,14 @@ public class WLJspc extends MatchingTask {
      */
     protected String replaceString(String inpString, String escapeChars,
                                    String replaceChars) {
-        String localString = "";
+        StringBuilder localString = new StringBuilder();
         StringTokenizer st = new StringTokenizer(inpString, escapeChars, true);
         int numTokens = st.countTokens();
         for (int i = 0; i < numTokens; i++) {
             String test = st.nextToken();
             test = (test.equals(escapeChars) ? replaceChars : test);
-            localString += test;
+            localString.append(test);
         }
-        return localString;
+        return localString.toString();
     }
 }
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultJspCompilerAdapter.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultJspCompilerAdapter.java
index 5814597a9..6b8dde3e3 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultJspCompilerAdapter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultJspCompilerAdapter.java
@@ -50,15 +50,13 @@ public abstract class DefaultJspCompilerAdapter
         jspc.log("Compilation " + cmd.describeJavaCommand(),
                  Project.MSG_VERBOSE);
 
-        StringBuilder niceSourceList =
-            new StringBuilder(compileList.size() == 1 ? "File" : "Files")
-                .append(" to be compiled:").append(lSep)
-                .append(compileList.stream()
-                    .peek(arg -> cmd.createArgument().setValue(arg))
-                    .map(arg -> "    " + arg)
-                    .collect(Collectors.joining(lSep)));
-
-        jspc.log(niceSourceList.toString(), Project.MSG_VERBOSE);
+        String niceSourceList = (compileList.size() == 1 ? "File" : "Files") +
+                " to be compiled:" + lSep +
+                compileList.stream()
+                        .peek(arg -> cmd.createArgument().setValue(arg))
+                        .map(arg -> "    " + arg)
+                        .collect(Collectors.joining(lSep));
+        jspc.log(niceSourceList, Project.MSG_VERBOSE);
     }
 
     // CheckStyle:VisibilityModifier OFF - bc
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java
index 637792a5a..c19568337 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java
@@ -322,7 +322,7 @@ public class AggregateTransformer {
         final String suffix;
 
         final String xsltFactoryName = xsltFactory == null ? null :  xsltFactory.getName();
-        if(xsltFactoryName != null && "net.sf.saxon.TransformerFactoryImpl".equals(xsltFactoryName)) {
+        if ("net.sf.saxon.TransformerFactoryImpl".equals(xsltFactoryName)) {
             suffix = "-saxon.xsl";
         } else {
             suffix = ".xsl";
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/BriefJUnitResultFormatter.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/BriefJUnitResultFormatter.java
index 4f00180e7..6551b79e8 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/BriefJUnitResultFormatter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/BriefJUnitResultFormatter.java
@@ -124,9 +124,7 @@ public class BriefJUnitResultFormatter implements JUnitResultFormatter, IgnoredT
             return; // Quick return - no output do nothing.
         }
         try {
-            output
-                .write(new StringBuilder("Testsuite: ").append(suite.getName())
-                    .append(StringUtils.LINE_SEP).toString());
+            output.write("Testsuite: " + suite.getName() + StringUtils.LINE_SEP);
             output.flush();
         } catch (IOException ex) {
             throw new BuildException(ex);
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
index a3da7a5d5..8c62d5611 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
@@ -1643,7 +1643,7 @@ public class JUnitTask extends Task {
         if (timeout == null) {
             return null;
         }
-        return new ExecuteWatchdog((long) timeout.intValue());
+        return new ExecuteWatchdog((long) timeout);
     }
 
     /**
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java
index 69ab270a4..fe74be1b1 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java
@@ -129,7 +129,7 @@ public class JUnitTest extends BaseTest implements Cloneable {
         this.haltOnFail = haltOnFailure;
         this.filtertrace = filtertrace;
         this.methodsSpecified = methods != null;
-        this.methods = methodsSpecified ? (String[]) methods.clone() : null;
+        this.methods = methodsSpecified ? methods.clone() : null;
         this.antThreadID = thread;
     }
 
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 d7683b376..84e595ab9 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
@@ -306,7 +306,7 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR
         this.haltOnFailure = haltOnFailure;
         this.showOutput = showOutput;
         this.logTestListenerEvents = logTestListenerEvents;
-        this.methods = methods != null ? (String[]) methods.clone() : null;
+        this.methods = methods != null ? methods.clone() : null;
         this.loader = loader;
     }
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelper.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelper.java
index c2146815d..1818967f6 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelper.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelper.java
@@ -46,11 +46,11 @@ public class JUnitVersionHelper {
 
     static {
         try {
-            testCaseName = TestCase.class.getMethod("getName", new Class[0]);
+            testCaseName = TestCase.class.getMethod("getName");
         } catch (NoSuchMethodException e) {
             // pre JUnit 3.7
             try {
-                testCaseName = TestCase.class.getMethod("name", new Class[0]);
+                testCaseName = TestCase.class.getMethod("name");
             } catch (NoSuchMethodException ignored) {
                 // ignore
             }
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java
index 0d71cd2b5..2031f7f1d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java
@@ -105,8 +105,8 @@ public class PlainJUnitResultFormatter implements JUnitResultFormatter, IgnoredT
             return; // Quick return - no output do nothing.
         }
         try {
-            out.write(new StringBuilder("Testsuite: ").append(suite.getName())
-                .append(StringUtils.LINE_SEP).toString().getBytes());
+            out.write(("Testsuite: " + suite.getName() +
+                    StringUtils.LINE_SEP).getBytes());
             out.flush();
         } catch (IOException ex) {
             throw new BuildException("Unable to write output", ex);
@@ -122,19 +122,9 @@ public class PlainJUnitResultFormatter implements JUnitResultFormatter, IgnoredT
     public void endTestSuite(JUnitTest suite) throws BuildException {
         boolean success = false;
         try {
-            StringBuilder sb = new StringBuilder("Tests run: ");
-            sb.append(suite.runCount());
-            sb.append(", Failures: ");
-            sb.append(suite.failureCount());
-            sb.append(", Errors: ");
-            sb.append(suite.errorCount());
-            sb.append(", Skipped: ");
-            sb.append(suite.skipCount());
-            sb.append(", Time elapsed: ");
-            sb.append(nf.format(suite.getRunTime() / ONE_SECOND));
-            sb.append(" sec");
-            sb.append(StringUtils.LINE_SEP);
-            write(sb.toString());
+            write(String.format("Tests run: %d, Failures: %d, Errors: %d, Skipped: %d, Time elapsed: %s sec%n",
+                    suite.runCount(), suite.failureCount(), suite.errorCount(), suite.skipCount(),
+                    nf.format(suite.getRunTime() / ONE_SECOND)));
 
             // write the err and output streams to the log
             if (systemOutput != null && systemOutput.length() > 0) {
@@ -190,7 +180,7 @@ public class PlainJUnitResultFormatter implements JUnitResultFormatter, IgnoredT
      */
     @Override
     public void startTest(Test t) {
-        testStarts.put(t, new Long(System.currentTimeMillis()));
+        testStarts.put(t, System.currentTimeMillis());
         failed.put(t, Boolean.FALSE);
     }
 
@@ -214,7 +204,7 @@ public class PlainJUnitResultFormatter implements JUnitResultFormatter, IgnoredT
                 // can be null if an error occurred in setUp
                 if (l != null) {
                     seconds =
-                        (System.currentTimeMillis() - l.longValue()) / ONE_SECOND;
+                        (System.currentTimeMillis() - l) / ONE_SECOND;
                 }
 
                 wri.write(" took " + nf.format(seconds) + " sec");
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/AbstractJUnitResultFormatter.java b/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/AbstractJUnitResultFormatter.java
index 4d1aa1173..e28e82614 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/AbstractJUnitResultFormatter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/AbstractJUnitResultFormatter.java
@@ -279,10 +279,7 @@ abstract class AbstractJUnitResultFormatter implements TestResultFormatter {
             if (this.inMemoryStore != null && this.inMemoryStore.position() > 0) {
                 return true;
             }
-            if (this.usingFileStore && this.filePath != null) {
-                return true;
-            }
-            return false;
+            return this.usingFileStore && this.filePath != null;
         }
 
         @Override
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapterFactory.java b/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapterFactory.java
index 74bb32320..d48da3b69 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapterFactory.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapterFactory.java
@@ -108,7 +108,7 @@ public class Native2AsciiAdapterFactory {
     private static Native2AsciiAdapter resolveClassName(String className,
                                                         ClassLoader loader)
         throws BuildException {
-        return (Native2AsciiAdapter) ClasspathUtils.newInstance(className,
+        return ClasspathUtils.newInstance(className,
             loader != null ? loader :
             Native2AsciiAdapterFactory.class.getClassLoader(),
             Native2AsciiAdapter.class);
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
index bd8702142..95b0be34b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
@@ -246,11 +246,11 @@ public class FTP extends Task implements FTPTaskConfig {
          */
         @Override
         public String getParent() {
-            String result = "";
+            StringBuilder result = new StringBuilder();
             for (int i = 0; i < parts.length - 1; i++){
-                result += File.separatorChar + parts[i];
+                result.append(File.separatorChar).append(parts[i]);
             }
-            return result;
+            return result.toString();
         }
 
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java
index 2b6e5733e..85b868012 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java
@@ -145,11 +145,11 @@ public class FTPTaskMirrorImpl implements FTPTaskMirror {
          */
         @Override
         public String getParent() {
-            String result = "";
-            for(int i = 0; i < parts.length - 1; i++){
-                result += File.separatorChar + parts[i];
+            StringBuilder result = new StringBuilder();
+            for (int i = 0; i < parts.length - 1; i++){
+                result.append(File.separatorChar).append(parts[i]);
             }
-            return result;
+            return result.toString();
         }
 
         /* (non-Javadoc)
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/RExecTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/RExecTask.java
index ff24bebfd..801712343 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/net/RExecTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/RExecTask.java
@@ -206,7 +206,7 @@ public class RExecTask extends Task {
             try {
                 StringBuilder sb = new StringBuilder();
                 int windowStart = -s.length();
-                if (timeout == null || timeout.intValue() == 0) {
+                if (timeout == null || timeout == 0) {
                     while (windowStart < 0
                            || !sb.substring(windowStart).equals(s)) {
                         sb.append((char) is.read());
@@ -214,7 +214,7 @@ public class RExecTask extends Task {
                     }
                 } else {
                     Calendar endTime = Calendar.getInstance();
-                    endTime.add(Calendar.SECOND, timeout.intValue());
+                    endTime.add(Calendar.SECOND, timeout);
                     while (windowStart < 0
                            || !sb.substring(windowStart).equals(s)) {
                         while (Calendar.getInstance().before(endTime)
@@ -265,7 +265,7 @@ public class RExecTask extends Task {
             InputStream is = this.getInputStream();
             try {
                 StringBuilder sb = new StringBuilder();
-                if (timeout == null || timeout.intValue() == 0) {
+                if (timeout == null || timeout == 0) {
                 int read;
                     while ((read = is.read()) != -1) {
                         char c = (char) read;
@@ -277,7 +277,7 @@ public class RExecTask extends Task {
                     }
                 } else {
                     Calendar endTime = Calendar.getInstance();
-                    endTime.add(Calendar.SECOND, timeout.intValue());
+                    endTime.add(Calendar.SECOND, timeout);
                 int read = 0;
                     while (read != -1) {
                         while (Calendar.getInstance().before(endTime) && is.available() == 0) {
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java
index 412ef93a9..37802bf27 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java
@@ -348,7 +348,7 @@ public class TelnetTask extends Task {
             try {
                 StringBuilder sb = new StringBuilder();
                 int windowStart = -s.length();
-                if (timeout == null || timeout.intValue() == 0) {
+                if (timeout == null || timeout == 0) {
                     while (windowStart < 0
                            || !sb.substring(windowStart).equals(s)) {
                         sb.append((char) is.read());
@@ -356,7 +356,7 @@ public class TelnetTask extends Task {
                     }
                 } else {
                     Calendar endTime = Calendar.getInstance();
-                    endTime.add(Calendar.SECOND, timeout.intValue());
+                    endTime.add(Calendar.SECOND, timeout);
                     while (windowStart < 0
                            || !sb.substring(windowStart).equals(s)) {
                         while (Calendar.getInstance().before(endTime)
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java b/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java
index 84b4317bb..8570ad83f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java
@@ -124,7 +124,7 @@ public class AntSoundPlayer implements LineListener, BuildListener {
                 }
 
                 if (duration != null) {
-                    playClip(audioClip, duration.longValue());
+                    playClip(audioClip, duration);
                 } else {
                     playClip(audioClip, loops);
                 }
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sound/SoundTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/sound/SoundTask.java
index 4616af6d7..bc70fab38 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/sound/SoundTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/sound/SoundTask.java
@@ -162,7 +162,7 @@ public class SoundTask extends Task {
                     Random rn = new Random();
                     int x = rn.nextInt(numfiles);
                     // set the source to the file at that location
-                    this.source = (File) files.elementAt(x);
+                    this.source = files.elementAt(x);
                 }
             } else {
                 log(source + ": invalid path.", Project.MSG_WARN);
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Directory.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Directory.java
index e4286937b..c57248bf0 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Directory.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Directory.java
@@ -61,9 +61,7 @@ public class Directory {
      * @param directory a Directory
      */
     public void addDirectory(Directory directory) {
-        if (!childDirectories.contains(directory)) {
-            childDirectories.add(directory);
-        }
+        childDirectories.add(directory);
     }
 
     /**
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHSession.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHSession.java
index 4d038ab4e..eef68d7cc 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHSession.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHSession.java
@@ -210,7 +210,7 @@ public class SSHSession extends SSHBase {
         int rport = 0;
 
         public void setLPort(final int lport) {
-            final Integer portKey = Integer.valueOf(lport);
+            final Integer portKey = lport;
             if (localPortsUsed.contains(portKey)) {
                 throw new BuildException(
                     "Multiple local tunnels defined to use same local port %d",
@@ -265,7 +265,7 @@ public class SSHSession extends SSHBase {
         }
 
         public void setRPort(final int rport) {
-            final Integer portKey = Integer.valueOf(rport);
+            final Integer portKey = rport;
             if (remotePortsUsed.contains(portKey)) {
                 throw new BuildException(
                     "Multiple remote tunnels defined to use same remote port %d",
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java
index 24217f4bd..6df9903ae 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java
@@ -364,10 +364,10 @@ public class Scp extends SSHBase {
                 }
                 message.setLogListener(this);
                 if (fileMode != null) {
-                    message.setFileMode(fileMode.intValue());
+                    message.setFileMode(fileMode);
                 }
                 if (dirMode != null) {
-                    message.setDirMode(dirMode.intValue());
+                    message.setDirMode(dirMode);
                 }
                 message.execute();
             }
@@ -399,10 +399,10 @@ public class Scp extends SSHBase {
             }
             message.setLogListener(this);
             if (fileMode != null) {
-                message.setFileMode(fileMode.intValue());
+                message.setFileMode(fileMode);
             }
             if (dirMode != null) {
-                message.setDirMode(dirMode.intValue());
+                message.setDirMode(dirMode);
             }
             message.execute();
         } finally {
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java
index 2fc30a557..7c176ecc4 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java
@@ -420,7 +420,7 @@ public class ScpToMessage extends AbstractSshMessage {
      * @since Ant 1.9.5
      */
     public int getFileMode() {
-        return fileMode != null ? fileMode.intValue() : DEFAULT_FILE_MODE;
+        return fileMode != null ? fileMode : DEFAULT_FILE_MODE;
     }
 
     /**
@@ -438,7 +438,7 @@ public class ScpToMessage extends AbstractSshMessage {
      * @since Ant 1.9.5
      */
     public int getDirMode() {
-        return dirMode != null ? dirMode.intValue() : DEFAULT_DIR_MODE;
+        return dirMode != null ? dirMode : DEFAULT_DIR_MODE;
     }
 
     /**
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java
index ce240e3e8..29b8cd1ce 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java
@@ -640,7 +640,7 @@ public abstract class MSVSS extends Task implements MSVSSConstants {
      * @return    True if the FailOnError flag has been set or if 'writablefiles=skip'.
      */
     private boolean getFailOnError() {
-        return getWritableFiles().equals(WRITABLE_SKIP) ? false : failOnError;
+        return !getWritableFiles().equals(WRITABLE_SKIP) && failOnError;
     }
 
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java b/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java
index a97d8222a..b4e8cbf6c 100644
--- a/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java
@@ -351,15 +351,11 @@ public abstract class DefaultRmicAdapter implements RmicAdapter {
         attributes.log("Compilation " + cmd.describeArguments(),
                        Project.MSG_VERBOSE);
 
-        StringBuilder niceSourceList =
-            new StringBuilder(compileList.size() == 1 ? "File" : "Files")
-                .append(" to be compiled:");
-
-        niceSourceList.append(
-            compileList.stream().peek(arg -> cmd.createArgument().setValue(arg))
-                .collect(Collectors.joining("    ")));
-
-        attributes.log(niceSourceList.toString(), Project.MSG_VERBOSE);
+        String niceSourceList = (compileList.size() == 1 ? "File" : "Files") +
+                " to be compiled:" +
+                compileList.stream().peek(arg -> cmd.createArgument().setValue(arg))
+                        .collect(Collectors.joining("    "));
+        attributes.log(niceSourceList, Project.MSG_VERBOSE);
     }
 
     private void verifyArguments(Commandline cmd) {
diff --git a/src/main/org/apache/tools/ant/types/DirSet.java b/src/main/org/apache/tools/ant/types/DirSet.java
index 0de36126c..d7c6ede8c 100644
--- a/src/main/org/apache/tools/ant/types/DirSet.java
+++ b/src/main/org/apache/tools/ant/types/DirSet.java
@@ -56,7 +56,7 @@ public class DirSet extends AbstractFileSet implements ResourceCollection {
     @Override
     public Object clone() {
         if (isReference()) {
-            return ((DirSet) getRef(getProject())).clone();
+            return getRef(getProject()).clone();
         }
         return super.clone();
     }
diff --git a/src/main/org/apache/tools/ant/types/Environment.java b/src/main/org/apache/tools/ant/types/Environment.java
index 3f33c74c9..37612531f 100644
--- a/src/main/org/apache/tools/ant/types/Environment.java
+++ b/src/main/org/apache/tools/ant/types/Environment.java
@@ -115,8 +115,7 @@ public class Environment {
          */
         public String getContent() throws BuildException {
             validate();
-            return new StringBuilder(key.trim()).append("=")
-                .append(value.trim()).toString();
+            return key.trim() + "=" + value.trim();
         }
 
         /**
diff --git a/src/main/org/apache/tools/ant/types/FileSet.java b/src/main/org/apache/tools/ant/types/FileSet.java
index 2762c5e25..1887a161a 100644
--- a/src/main/org/apache/tools/ant/types/FileSet.java
+++ b/src/main/org/apache/tools/ant/types/FileSet.java
@@ -52,7 +52,7 @@ public class FileSet extends AbstractFileSet implements ResourceCollection {
     @Override
     public Object clone() {
         if (isReference()) {
-            return ((FileSet) getRef(getProject())).clone();
+            return getRef(getProject()).clone();
         }
         return super.clone();
     }
diff --git a/src/main/org/apache/tools/ant/types/FilterSet.java b/src/main/org/apache/tools/ant/types/FilterSet.java
index 21e8a44ba..38bc5cc9c 100644
--- a/src/main/org/apache/tools/ant/types/FilterSet.java
+++ b/src/main/org/apache/tools/ant/types/FilterSet.java
@@ -591,7 +591,7 @@ public class FilterSet extends DataType implements Cloneable {
                 "Infinite loop in tokens. Currently known tokens : "
                 + passedTokens.toString() + "\nProblem token : " + beginToken
                 + parent + endToken + " called from " + beginToken
-                + passedTokens.lastElement().toString() + endToken);
+                + passedTokens.lastElement() + endToken);
             recurseDepth--;
             return parent;
         }
diff --git a/src/main/org/apache/tools/ant/types/FlexInteger.java b/src/main/org/apache/tools/ant/types/FlexInteger.java
index 9bce762a1..edb59738a 100644
--- a/src/main/org/apache/tools/ant/types/FlexInteger.java
+++ b/src/main/org/apache/tools/ant/types/FlexInteger.java
@@ -41,7 +41,7 @@ public class FlexInteger {
      * @return the integer value
      */
     public int intValue() {
-        return value.intValue();
+        return value;
     }
 
     /**
diff --git a/src/main/org/apache/tools/ant/types/Path.java b/src/main/org/apache/tools/ant/types/Path.java
index 72ed1a630..3bc18b54e 100644
--- a/src/main/org/apache/tools/ant/types/Path.java
+++ b/src/main/org/apache/tools/ant/types/Path.java
@@ -766,7 +766,7 @@ public class Path extends DataType implements Cloneable, ResourceCollection {
         if (preserveBC == null) {
             preserveBC = delegateIteratorToList() ? Boolean.TRUE : Boolean.FALSE;
         }
-        return preserveBC.booleanValue();
+        return preserveBC;
     }
 
     /**
diff --git a/src/main/org/apache/tools/ant/types/Permissions.java b/src/main/org/apache/tools/ant/types/Permissions.java
index d4764274b..06763dc12 100644
--- a/src/main/org/apache/tools/ant/types/Permissions.java
+++ b/src/main/org/apache/tools/ant/types/Permissions.java
@@ -155,7 +155,7 @@ public class Permissions {
             final String name = permission.getName();
             final String actions = permission.getActions();
             final Constructor<? extends java.security.Permission> ctr = clazz.getConstructor(PARAMS);
-            return ctr.newInstance(new Object[] {name, actions});
+            return ctr.newInstance(name, actions);
         } catch (final Exception e) {
             // Let the UnresolvedPermission handle it.
             return new UnresolvedPermission(permission.getClassName(),
@@ -318,10 +318,8 @@ public class Permissions {
                 final Set<String> as = parseActions(perm.getActions());
                 final int size = as.size();
                 as.removeAll(actions);
-                if (as.size() == size) {
-                    // None of the actions revoked, so all allowed.
-                    return false;
-                }
+                // If no actions removed, then all allowed
+                return as.size() != size;
             }
             return true;
         }
diff --git a/src/main/org/apache/tools/ant/types/RedirectorElement.java b/src/main/org/apache/tools/ant/types/RedirectorElement.java
index 71475a57f..c0b1bd5be 100644
--- a/src/main/org/apache/tools/ant/types/RedirectorElement.java
+++ b/src/main/org/apache/tools/ant/types/RedirectorElement.java
@@ -464,16 +464,16 @@ public class RedirectorElement extends DataType {
         }
         dieOnCircularReference();
         if (alwaysLog != null) {
-            redirector.setAlwaysLog(alwaysLog.booleanValue());
+            redirector.setAlwaysLog(alwaysLog);
         }
         if (logError != null) {
-            redirector.setLogError(logError.booleanValue());
+            redirector.setLogError(logError);
         }
         if (append != null) {
-            redirector.setAppend(append.booleanValue());
+            redirector.setAppend(append);
         }
         if (createEmptyFiles != null) {
-            redirector.setCreateEmptyFiles(createEmptyFiles.booleanValue());
+            redirector.setCreateEmptyFiles(createEmptyFiles);
         }
         if (outputProperty != null) {
             redirector.setOutputProperty(outputProperty);
@@ -485,7 +485,7 @@ public class RedirectorElement extends DataType {
             redirector.setInputString(inputString);
         }
         if (logInputString != null) {
-            redirector.setLogInputString(logInputString.booleanValue());
+            redirector.setLogInputString(logInputString);
         }
         if (inputMapper != null) {
             String[] inputTargets = null;
@@ -578,7 +578,7 @@ public class RedirectorElement extends DataType {
                 list.add(getProject().resolveFile(n));
             }
         }
-        return (File[]) (list.toArray(new File[list.size()]));
+        return list.toArray(new File[list.size()]);
     }
 
     /**
diff --git a/src/main/org/apache/tools/ant/types/Resource.java b/src/main/org/apache/tools/ant/types/Resource.java
index 081589385..feaf771d2 100644
--- a/src/main/org/apache/tools/ant/types/Resource.java
+++ b/src/main/org/apache/tools/ant/types/Resource.java
@@ -163,7 +163,7 @@ public class Resource extends DataType implements Comparable<Resource>, Resource
             return getCheckedRef().isExists();
         }
         //default true:
-        return exists == null || exists.booleanValue();
+        return exists == null || exists;
     }
 
     /**
@@ -192,7 +192,7 @@ public class Resource extends DataType implements Comparable<Resource>, Resource
         if (!isExists() || lastmodified == null) {
             return UNKNOWN_DATETIME;
         }
-        long result = lastmodified.longValue();
+        long result = lastmodified;
         return result < UNKNOWN_DATETIME ? UNKNOWN_DATETIME : result;
     }
 
@@ -202,7 +202,7 @@ public class Resource extends DataType implements Comparable<Resource>, Resource
      */
     public void setLastModified(long lastmodified) {
         checkAttributesAllowed();
-        this.lastmodified = new Long(lastmodified);
+        this.lastmodified = lastmodified;
     }
 
     /**
@@ -214,7 +214,7 @@ public class Resource extends DataType implements Comparable<Resource>, Resource
             return getCheckedRef().isDirectory();
         }
         //default false:
-        return directory != null && directory.booleanValue();
+        return directory != null && directory;
     }
 
     /**
@@ -233,7 +233,7 @@ public class Resource extends DataType implements Comparable<Resource>, Resource
      */
     public void setSize(long size) {
         checkAttributesAllowed();
-        this.size = new Long(size > UNKNOWN_SIZE ? size : UNKNOWN_SIZE);
+        this.size = size > UNKNOWN_SIZE ? size : UNKNOWN_SIZE;
     }
 
     /**
@@ -247,7 +247,7 @@ public class Resource extends DataType implements Comparable<Resource>, Resource
             return getCheckedRef().getSize();
         }
         return isExists()
-            ? (size != null ? size.longValue() : UNKNOWN_SIZE)
+            ? (size != null ? size : UNKNOWN_SIZE)
             : 0L;
     }
 
diff --git a/src/main/org/apache/tools/ant/types/TarFileSet.java b/src/main/org/apache/tools/ant/types/TarFileSet.java
index ddffe6608..4971de571 100644
--- a/src/main/org/apache/tools/ant/types/TarFileSet.java
+++ b/src/main/org/apache/tools/ant/types/TarFileSet.java
@@ -249,7 +249,7 @@ public class TarFileSet extends ArchiveFileSet {
     @Override
     public Object clone() {
         if (isReference()) {
-            return ((TarFileSet) getRef(getProject())).clone();
+            return getRef(getProject()).clone();
         }
         return super.clone();
     }
diff --git a/src/main/org/apache/tools/ant/types/XMLCatalog.java b/src/main/org/apache/tools/ant/types/XMLCatalog.java
index 340f3ed90..707d0b358 100644
--- a/src/main/org/apache/tools/ant/types/XMLCatalog.java
+++ b/src/main/org/apache/tools/ant/types/XMLCatalog.java
@@ -922,21 +922,17 @@ public class XMLCatalog extends DataType
             // in the classpath.
             //
             try {
-                setXMLCatalog =
-                    resolverImplClass.getMethod("setXMLCatalog",
-                                                new Class[] {XMLCatalog.class});
+                setXMLCatalog = resolverImplClass.getMethod("setXMLCatalog",
+                        XMLCatalog.class);
 
-                parseCatalog =
-                    resolverImplClass.getMethod("parseCatalog",
-                                                new Class[] {String.class});
+                parseCatalog = resolverImplClass.getMethod("parseCatalog",
+                        String.class);
 
-                resolveEntity =
-                    resolverImplClass.getMethod("resolveEntity",
-                                                new Class[] {String.class, String.class});
+                resolveEntity = resolverImplClass.getMethod("resolveEntity",
+                        String.class, String.class);
 
-                resolve =
-                    resolverImplClass.getMethod("resolve",
-                                                new Class[] {String.class, String.class});
+                resolve = resolverImplClass.getMethod("resolve",
+                        String.class, String.class);
             } catch (NoSuchMethodException ex) {
                 throw new BuildException(ex);
             }
@@ -986,9 +982,8 @@ public class XMLCatalog extends DataType
                 // this possibility.
                 //
                 try {
-                    result =
-                        (InputSource) resolveEntity.invoke(resolverImpl,
-                                                          new Object[] {publicId, systemId});
+                    result = (InputSource) resolveEntity.invoke(resolverImpl,
+                            new Object[] {publicId, systemId});
                 } catch (Exception ex) {
                     throw new BuildException(ex);
                 }
@@ -1050,9 +1045,8 @@ public class XMLCatalog extends DataType
                     result = new SAXSource(source);
                 } else {
                     try {
-                        result =
-                            (SAXSource) resolve.invoke(resolverImpl,
-                                                      new Object[] {href, base});
+                        result = (SAXSource) resolve.invoke(resolverImpl,
+                                new Object[] {href, base});
                     } catch (Exception ex) {
                         throw new BuildException(ex);
                     }
@@ -1074,9 +1068,8 @@ public class XMLCatalog extends DataType
                     }
                 }
                 try {
-                    result =
-                        (SAXSource) resolve.invoke(resolverImpl,
-                                                  new Object[] {href, base});
+                    result = (SAXSource) resolve.invoke(resolverImpl,
+                            new Object[] {href, base});
                 } catch (Exception ex) {
                     throw new BuildException(ex);
                 }
@@ -1096,8 +1089,7 @@ public class XMLCatalog extends DataType
             if (!externalCatalogsProcessed) {
 
                 try {
-                    setXMLCatalog.invoke(resolverImpl,
-                                         new Object[] {XMLCatalog.this});
+                    setXMLCatalog.invoke(resolverImpl, XMLCatalog.this);
                 } catch (Exception ex) {
                     throw new BuildException(ex);
                 }
@@ -1112,8 +1104,7 @@ public class XMLCatalog extends DataType
                         File catFile = new File(catFileName);
                         log("Parsing " + catFile, Project.MSG_DEBUG);
                         try {
-                            parseCatalog.invoke(resolverImpl,
-                                    new Object[]{catFile.getPath()});
+                            parseCatalog.invoke(resolverImpl, catFile.getPath());
                         } catch (Exception ex) {
                             throw new BuildException(ex);
                         }
diff --git a/src/main/org/apache/tools/ant/types/ZipFileSet.java b/src/main/org/apache/tools/ant/types/ZipFileSet.java
index be6ad5cac..b43dcbdc7 100644
--- a/src/main/org/apache/tools/ant/types/ZipFileSet.java
+++ b/src/main/org/apache/tools/ant/types/ZipFileSet.java
@@ -95,7 +95,7 @@ public class ZipFileSet extends ArchiveFileSet {
     @Override
     public Object clone() {
         if (isReference()) {
-            return ((ZipFileSet) getRef(getProject())).clone();
+            return getRef(getProject()).clone();
         }
         return super.clone();
     }
diff --git a/src/main/org/apache/tools/ant/types/resources/AbstractClasspathResource.java b/src/main/org/apache/tools/ant/types/resources/AbstractClasspathResource.java
index 9bc14810d..1e0c44d97 100644
--- a/src/main/org/apache/tools/ant/types/resources/AbstractClasspathResource.java
+++ b/src/main/org/apache/tools/ant/types/resources/AbstractClasspathResource.java
@@ -151,7 +151,7 @@ public abstract class AbstractClasspathResource extends Resource {
      */
     public boolean isExists() {
         if (isReference()) {
-            return  ((Resource) getCheckedRef()).isExists();
+            return  getCheckedRef().isExists();
         }
         dieOnCircularReference();
         try (InputStream is = getInputStream()) {
@@ -169,7 +169,7 @@ public abstract class AbstractClasspathResource extends Resource {
      */
     public InputStream getInputStream() throws IOException {
         if (isReference()) {
-            return ((Resource) getCheckedRef()).getInputStream();
+            return getCheckedRef().getInputStream();
         }
         dieOnCircularReference();
 
diff --git a/src/main/org/apache/tools/ant/types/resources/MultiRootFileSet.java b/src/main/org/apache/tools/ant/types/resources/MultiRootFileSet.java
index ce5bc8bfc..f577151fc 100644
--- a/src/main/org/apache/tools/ant/types/resources/MultiRootFileSet.java
+++ b/src/main/org/apache/tools/ant/types/resources/MultiRootFileSet.java
@@ -114,7 +114,7 @@ public class MultiRootFileSet extends AbstractFileSet
     @Override
     public Object clone() {
         if (isReference()) {
-            return ((MultiRootFileSet) getRef(getProject())).clone();
+            return getRef(getProject()).clone();
         }
         final MultiRootFileSet fs = (MultiRootFileSet) super.clone();
         fs.baseDirs = new ArrayList<>(baseDirs);
@@ -163,7 +163,7 @@ public class MultiRootFileSet extends AbstractFileSet
     @Override
     public String toString() {
         if (isReference()) {
-            return ((MultiRootFileSet) getRef(getProject())).toString();
+            return getRef(getProject()).toString();
         }
         return merge().toString();
     }
diff --git a/src/main/org/apache/tools/ant/types/resources/ResourceDecorator.java b/src/main/org/apache/tools/ant/types/resources/ResourceDecorator.java
index ace0de2a4..4779ea0a7 100644
--- a/src/main/org/apache/tools/ant/types/resources/ResourceDecorator.java
+++ b/src/main/org/apache/tools/ant/types/resources/ResourceDecorator.java
@@ -205,7 +205,7 @@ public abstract class ResourceDecorator extends Resource {
      */
     protected final Resource getResource() {
         if (isReference()) {
-            return (Resource) getCheckedRef();
+            return getCheckedRef();
         }
         if (resource == null) {
             throw new BuildException("no resource specified");
diff --git a/src/main/org/apache/tools/ant/types/resources/Resources.java b/src/main/org/apache/tools/ant/types/resources/Resources.java
index 4b3d4dde3..c11918cfb 100644
--- a/src/main/org/apache/tools/ant/types/resources/Resources.java
+++ b/src/main/org/apache/tools/ant/types/resources/Resources.java
@@ -275,6 +275,6 @@ public class Resources extends DataType implements ResourceCollection {
     }
 
     private synchronized List<ResourceCollection> getNested() {
-        return rc == null ? Collections.<ResourceCollection> emptyList() : rc;
+        return rc == null ? Collections.emptyList() : rc;
     }
 }
diff --git a/src/main/org/apache/tools/ant/types/resources/URLResource.java b/src/main/org/apache/tools/ant/types/resources/URLResource.java
index 643ec0087..1ca6e4c1b 100644
--- a/src/main/org/apache/tools/ant/types/resources/URLResource.java
+++ b/src/main/org/apache/tools/ant/types/resources/URLResource.java
@@ -180,7 +180,7 @@ public class URLResource extends Resource implements URLProvider {
      */
     public synchronized String getName() {
         if (isReference()) {
-            return ((Resource) getCheckedRef()).getName();
+            return getCheckedRef().getName();
         }
         String name = getURL().getFile();
         return "".equals(name) ? name : name.substring(1);
@@ -201,7 +201,7 @@ public class URLResource extends Resource implements URLProvider {
      */
     public synchronized boolean isExists() {
         if (isReference()) {
-            return ((Resource) getCheckedRef()).isExists();
+            return getCheckedRef().isExists();
         }
         return isExists(false);
     }
@@ -262,7 +262,7 @@ public class URLResource extends Resource implements URLProvider {
      */
     public synchronized long getLastModified() {
         if (isReference()) {
-            return ((Resource) getCheckedRef()).getLastModified();
+            return getCheckedRef().getLastModified();
         }
         if (!isExists(false)) {
             return UNKNOWN_DATETIME;
@@ -280,7 +280,7 @@ public class URLResource extends Resource implements URLProvider {
      */
     public synchronized boolean isDirectory() {
         return isReference()
-            ? ((Resource) getCheckedRef()).isDirectory()
+            ? getCheckedRef().isDirectory()
             : getName().endsWith("/");
     }
 
@@ -291,7 +291,7 @@ public class URLResource extends Resource implements URLProvider {
      */
     public synchronized long getSize() {
         if (isReference()) {
-            return ((Resource) getCheckedRef()).getSize();
+            return getCheckedRef().getSize();
         }
         if (!isExists(false)) {
             return 0L;
@@ -345,7 +345,7 @@ public class URLResource extends Resource implements URLProvider {
      */
     public synchronized InputStream getInputStream() throws IOException {
         if (isReference()) {
-            return ((Resource) getCheckedRef()).getInputStream();
+            return getCheckedRef().getInputStream();
         }
         connect();
         try {
@@ -366,7 +366,7 @@ public class URLResource extends Resource implements URLProvider {
      */
     public synchronized OutputStream getOutputStream() throws IOException {
         if (isReference()) {
-            return ((Resource) getCheckedRef()).getOutputStream();
+            return getCheckedRef().getOutputStream();
         }
         connect();
         try {
diff --git a/src/main/org/apache/tools/ant/types/resources/ZipResource.java b/src/main/org/apache/tools/ant/types/resources/ZipResource.java
index 1dec5464c..b1c1b9001 100644
--- a/src/main/org/apache/tools/ant/types/resources/ZipResource.java
+++ b/src/main/org/apache/tools/ant/types/resources/ZipResource.java
@@ -26,7 +26,6 @@ import java.io.OutputStream;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.types.Reference;
-import org.apache.tools.ant.types.Resource;
 import org.apache.tools.ant.types.ResourceCollection;
 import org.apache.tools.ant.util.FileUtils;
 import org.apache.tools.zip.ZipEntry;
@@ -128,7 +127,7 @@ public class ZipResource extends ArchiveResource {
      */
     public InputStream getInputStream() throws IOException {
         if (isReference()) {
-            return ((Resource) getCheckedRef()).getInputStream();
+            return getCheckedRef().getInputStream();
         }
         final ZipFile z = new ZipFile(getZipfile(), getEncoding());
         ZipEntry ze = z.getEntry(getName());
@@ -162,7 +161,7 @@ public class ZipResource extends ArchiveResource {
      */
     public OutputStream getOutputStream() throws IOException {
         if (isReference()) {
-            return ((Resource) getCheckedRef()).getOutputStream();
+            return getCheckedRef().getOutputStream();
         }
         throw new UnsupportedOperationException(
             "Use the zip task for zip output.");
diff --git a/src/main/org/apache/tools/ant/types/resources/comparators/DelegatedResourceComparator.java b/src/main/org/apache/tools/ant/types/resources/comparators/DelegatedResourceComparator.java
index 28f679315..6f25370fe 100644
--- a/src/main/org/apache/tools/ant/types/resources/comparators/DelegatedResourceComparator.java
+++ b/src/main/org/apache/tools/ant/types/resources/comparators/DelegatedResourceComparator.java
@@ -66,11 +66,11 @@ public class DelegatedResourceComparator extends ResourceComparator {
         if (isReference()) {
             return getCheckedRef().equals(o);
         }
-        if (!(o instanceof DelegatedResourceComparator)) {
-            return false;
+        if (o instanceof DelegatedResourceComparator) {
+            List<ResourceComparator> ov = ((DelegatedResourceComparator) o).resourceComparators;
+            return resourceComparators == null ? ov == null : resourceComparators.equals(ov);
         }
-        List<ResourceComparator> ov = ((DelegatedResourceComparator) o).resourceComparators;
-        return resourceComparators == null ? ov == null : resourceComparators.equals(ov);
+        return false;
     }
 
     /**
@@ -107,11 +107,10 @@ s.
         if (isReference()) {
             super.dieOnCircularReference(stk, p);
         } else {
-            if (!(resourceComparators == null || resourceComparators.isEmpty())) {
+            if (resourceComparators != null && !resourceComparators.isEmpty()) {
                 for (ResourceComparator resourceComparator : resourceComparators) {
                     if (resourceComparator instanceof DataType) {
-                        pushAndInvokeCircularReferenceCheck((DataType) resourceComparator, stk,
-                                                            p);
+                        pushAndInvokeCircularReferenceCheck(resourceComparator, stk, p);
                     }
                 }
             }
diff --git a/src/main/org/apache/tools/ant/types/resources/comparators/Reverse.java b/src/main/org/apache/tools/ant/types/resources/comparators/Reverse.java
index 6bef0e721..04a778f13 100644
--- a/src/main/org/apache/tools/ant/types/resources/comparators/Reverse.java
+++ b/src/main/org/apache/tools/ant/types/resources/comparators/Reverse.java
@@ -23,7 +23,6 @@ import java.util.Stack;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
-import org.apache.tools.ant.types.DataType;
 import org.apache.tools.ant.types.Resource;
 
 /**
@@ -84,8 +83,7 @@ public class Reverse extends ResourceComparator {
             super.dieOnCircularReference(stk, p);
         } else {
             if (nested != null) {
-                pushAndInvokeCircularReferenceCheck((DataType) nested, stk,
-                                                    p);
+                pushAndInvokeCircularReferenceCheck(nested, stk, p);
             }
             setChecked(true);
         }
diff --git a/src/main/org/apache/tools/ant/types/resources/selectors/Date.java b/src/main/org/apache/tools/ant/types/resources/selectors/Date.java
index 23698afcc..688eeb4a5 100644
--- a/src/main/org/apache/tools/ant/types/resources/selectors/Date.java
+++ b/src/main/org/apache/tools/ant/types/resources/selectors/Date.java
@@ -51,7 +51,7 @@ public class Date implements ResourceSelector {
      * @param m the number of millis.
      */
     public synchronized void setMillis(long m) {
-        millis = new Long(m);
+        millis = m;
     }
 
     /**
@@ -59,7 +59,7 @@ public class Date implements ResourceSelector {
      * @return long number of millis since 1970.
      */
     public synchronized long getMillis() {
-        return millis == null ? -1L : millis.longValue();
+        return millis == null ? -1L : millis;
     }
 
     /**
@@ -155,7 +155,7 @@ public class Date implements ResourceSelector {
                     dateTime, p);
             }
         }
-        return when.evaluate(r.getLastModified(), millis.longValue(), granularity);
+        return when.evaluate(r.getLastModified(), millis, granularity);
     }
 
 }
diff --git a/src/main/org/apache/tools/ant/types/resources/selectors/Name.java b/src/main/org/apache/tools/ant/types/resources/selectors/Name.java
index 75d4f25a2..4566abb16 100644
--- a/src/main/org/apache/tools/ant/types/resources/selectors/Name.java
+++ b/src/main/org/apache/tools/ant/types/resources/selectors/Name.java
@@ -126,7 +126,7 @@ public class Name implements ResourceSelector {
             return true;
         }
         String s = r.toString();
-        return s.equals(n) ? false : matches(s);
+        return !s.equals(n) && matches(s);
     }
 
     private boolean matches(String name) {
diff --git a/src/main/org/apache/tools/ant/types/selectors/AbstractSelectorContainer.java b/src/main/org/apache/tools/ant/types/selectors/AbstractSelectorContainer.java
index 2bec41e69..27fa1577c 100644
--- a/src/main/org/apache/tools/ant/types/selectors/AbstractSelectorContainer.java
+++ b/src/main/org/apache/tools/ant/types/selectors/AbstractSelectorContainer.java
@@ -351,7 +351,7 @@ public abstract class AbstractSelectorContainer extends DataType
 
     public synchronized Object clone() {
         if (isReference()) {
-            return ((AbstractSelectorContainer) getCheckedRef()).clone();
+            return getCheckedRef().clone();
         }
         try {
             AbstractSelectorContainer sc =
diff --git a/src/main/org/apache/tools/ant/types/selectors/ContainsSelector.java b/src/main/org/apache/tools/ant/types/selectors/ContainsSelector.java
index ee04a0d06..aa0bac1e9 100644
--- a/src/main/org/apache/tools/ant/types/selectors/ContainsSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/ContainsSelector.java
@@ -57,12 +57,8 @@ public class ContainsSelector extends BaseExtendSelector implements ResourceSele
      * @return a string describing this object
      */
     public String toString() {
-        StringBuilder buf = new StringBuilder("{containsselector text: ");
-        buf.append('"').append(contains).append('"');
-        buf.append(" casesensitive: ").append(casesensitive);
-        buf.append(" ignorewhitespace: ").append(ignorewhitespace);
-        buf.append("}");
-        return buf.toString();
+        return String.format("{containsselector text: \"%s\" casesensitive: %s ignorewhitespace: %s}",
+                contains, casesensitive, ignorewhitespace);
     }
 
     /**
diff --git a/src/main/org/apache/tools/ant/types/selectors/DepthSelector.java b/src/main/org/apache/tools/ant/types/selectors/DepthSelector.java
index 5b6374e3f..db73cb8a0 100644
--- a/src/main/org/apache/tools/ant/types/selectors/DepthSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/DepthSelector.java
@@ -50,11 +50,7 @@ public class DepthSelector extends BaseExtendSelector {
      * @return a string describing this object
      */
     public String toString() {
-        StringBuilder buf = new StringBuilder("{depthselector");
-        buf.append(" min: ").append(min);
-        buf.append(" max: ").append(max);
-        buf.append("}");
-        return buf.toString();
+        return "{depthselector min: " + min + " max: " + max + "}";
     }
 
     /**
@@ -164,9 +160,6 @@ public class DepthSelector extends BaseExtendSelector {
             throw new BuildException("File %s is outside of %s directory tree",
                 filename, absBase);
         }
-        if (min > -1 && depth < min) {
-            return false;
-        }
-        return true;
+        return min <= -1 || depth >= min;
     }
 }
diff --git a/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java b/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java
index b54ea8278..bfa3b169f 100644
--- a/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java
+++ b/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java
@@ -153,20 +153,8 @@ public final class SelectorUtils {
             strIdxStart++;
         }
 
-        // CheckStyle:SimplifyBooleanReturnCheck OFF
-        // Check turned off as the code needs the comments for the various
-        // code paths.
-        if (strIdxStart > strIdxEnd) {
-            // String is exhausted
-            return true;
-        }
-        if (patIdxStart > patIdxEnd) {
-            // String not exhausted, but pattern is. Failure.
-            return false;
-        }
-        // pattern now holds ** while string is not exhausted
-        // this will generate false positives but we can live with that.
-        return true;
+        // Fail if string is not exhausted or pattern is exhausted
+        return strIdxStart > strIdxEnd || patIdxStart <= patIdxEnd;
     }
 
     /**
diff --git a/src/main/org/apache/tools/ant/types/selectors/SizeSelector.java b/src/main/org/apache/tools/ant/types/selectors/SizeSelector.java
index aa27377f8..ef3b53cfe 100644
--- a/src/main/org/apache/tools/ant/types/selectors/SizeSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/SizeSelector.java
@@ -68,11 +68,8 @@ public class SizeSelector extends BaseExtendSelector {
      * @return a string describing this object
      */
     public String toString() {
-        StringBuilder buf = new StringBuilder("{sizeselector value: ");
-        buf.append(sizelimit);
-        buf.append("compare: ").append(when.getValue());
-        buf.append("}");
-        return buf.toString();
+        return String.format("{sizeselector value: %d compare: %s}",
+                sizelimit, when.getValue());
     }
 
     /**
diff --git a/src/main/org/apache/tools/ant/types/selectors/TypeSelector.java b/src/main/org/apache/tools/ant/types/selectors/TypeSelector.java
index 0a61141af..26d07a91e 100644
--- a/src/main/org/apache/tools/ant/types/selectors/TypeSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/TypeSelector.java
@@ -39,10 +39,7 @@ public class TypeSelector extends BaseExtendSelector {
      * @return a string describing this object
      */
     public String toString() {
-        StringBuilder buf = new StringBuilder("{typeselector type: ");
-        buf.append(type);
-        buf.append("}");
-        return buf.toString();
+        return "{typeselector type: " + type + "}";
     }
 
     /**
diff --git a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java
index 249d63c34..30c28ec06 100644
--- a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java
@@ -693,9 +693,7 @@ public class ModifiedSelector extends BaseExtendSelector
     @Override
     public void setParameters(Parameter... parameters) {
         if (parameters != null) {
-            for (Parameter p : parameters) {
-                configParameter.add(p);
-            }
+            Collections.addAll(configParameter, parameters);
         }
     }
 
@@ -777,14 +775,8 @@ public class ModifiedSelector extends BaseExtendSelector
      */
     @Override
     public String toString() {
-        StringBuilder buf = new StringBuilder("{modifiedselector");
-        buf.append(" update=").append(update);
-        buf.append(" seldirs=").append(selectDirectories);
-        buf.append(" cache=").append(cache);
-        buf.append(" algorithm=").append(algorithm);
-        buf.append(" comparator=").append(comparator);
-        buf.append("}");
-        return buf.toString();
+        return String.format("{modifiedselector update=%s seldirs=%s cache=%s algorithm=%s comparator=%s}",
+                update, selectDirectories, cache, algorithm, comparator);
     }
 
 
diff --git a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/PropertiesfileCache.java b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/PropertiesfileCache.java
index f7392d20a..93580a69e 100644
--- a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/PropertiesfileCache.java
+++ b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/PropertiesfileCache.java
@@ -223,11 +223,7 @@ public class PropertiesfileCache implements Cache {
      */
     @Override
     public String toString() {
-        StringBuilder buf = new StringBuilder();
-        buf.append("<PropertiesfileCache:");
-        buf.append("cachefile=").append(cachefile);
-        buf.append(";noOfEntries=").append(cache.size());
-        buf.append(">");
-        return buf.toString();
+        return String.format("<PropertiesfileCache:cachefile=%s;noOfEntries=%d>",
+                cachefile, cache.size());
     }
 }
diff --git a/src/main/org/apache/tools/ant/util/CollectionUtils.java b/src/main/org/apache/tools/ant/util/CollectionUtils.java
index c8f8135d8..94fa92801 100644
--- a/src/main/org/apache/tools/ant/util/CollectionUtils.java
+++ b/src/main/org/apache/tools/ant/util/CollectionUtils.java
@@ -85,7 +85,7 @@ public class CollectionUtils {
             Object key = e1.nextElement();
             Object value1 = d1.get(key);
             Object value2 = d2.get(key);
-            if (value2 == null || !value1.equals(value2)) {
+            if (!value1.equals(value2)) {
                 return false;
             }
         }
diff --git a/src/main/org/apache/tools/ant/util/DOMElementWriter.java b/src/main/org/apache/tools/ant/util/DOMElementWriter.java
index f76d7b7f6..cada1ae7e 100644
--- a/src/main/org/apache/tools/ant/util/DOMElementWriter.java
+++ b/src/main/org/apache/tools/ant/util/DOMElementWriter.java
@@ -306,7 +306,7 @@ public class DOMElementWriter {
         out.write("<");
         if (namespacePolicy.qualifyElements) {
             String uri = getNamespaceURI(element);
-            String prefix = (String) nsPrefixMap.get(uri);
+            String prefix = nsPrefixMap.get(uri);
             if (prefix == null) {
                 if (nsPrefixMap.isEmpty()) {
                     // steal default namespace
@@ -331,7 +331,7 @@ public class DOMElementWriter {
             out.write(" ");
             if (namespacePolicy.qualifyAttributes) {
                 String uri = getNamespaceURI(attr);
-                String prefix = (String) nsPrefixMap.get(uri);
+                String prefix = nsPrefixMap.get(uri);
                 if (prefix == null) {
                     prefix = NS + (nextPrefix++);
                     nsPrefixMap.put(uri, prefix);
@@ -399,7 +399,7 @@ public class DOMElementWriter {
         out.write("</");
         if (namespacePolicy.qualifyElements) {
             String uri = getNamespaceURI(element);
-            String prefix = (String) nsPrefixMap.get(uri);
+            String prefix = nsPrefixMap.get(uri);
             if (prefix != null && !"".equals(prefix)) {
                 out.write(prefix);
                 out.write(":");
@@ -607,11 +607,8 @@ public class DOMElementWriter {
         if (c < 0xE000) {
             return false;
         }
-        if (c <= 0xFFFD) {
-            return true;
-        }
+        return c <= 0xFFFD;
         // CheckStyle:MagicNumber ON
-        return false;
     }
 
     private void removeNSDefinitions(Element element) {
diff --git a/src/main/org/apache/tools/ant/util/DateUtils.java b/src/main/org/apache/tools/ant/util/DateUtils.java
index f7c94f3ed..300857019 100644
--- a/src/main/org/apache/tools/ant/util/DateUtils.java
+++ b/src/main/org/apache/tools/ant/util/DateUtils.java
@@ -167,8 +167,7 @@ public final class DateUtils {
     public static String formatElapsedTime(long millis) {
         long seconds = millis / ONE_SECOND;
         long minutes = seconds / ONE_MINUTE;
-        Object[] args = {new Long(minutes), new Long(seconds % ONE_MINUTE)};
-        return MINUTE_SECONDS.format(args);
+        return MINUTE_SECONDS.format(new Object[]{minutes, seconds % ONE_MINUTE});
     }
 
     /**
diff --git a/src/main/org/apache/tools/ant/util/FileUtils.java b/src/main/org/apache/tools/ant/util/FileUtils.java
index ce75d3446..140c54197 100644
--- a/src/main/org/apache/tools/ant/util/FileUtils.java
+++ b/src/main/org/apache/tools/ant/util/FileUtils.java
@@ -1642,9 +1642,7 @@ public class FileUtils {
         }
 
         // fill it up path with parts which were not equal
-        for (int i = same; i < toPathStack.length; i++) {
-            relativePathStack.add(toPathStack[i]);
-        }
+        relativePathStack.addAll(Arrays.asList(toPathStack).subList(same, toPathStack.length));
 
         return getPath(relativePathStack);
     }
diff --git a/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java b/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java
index a34a3097c..dafda3e0b 100644
--- a/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java
+++ b/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java
@@ -180,13 +180,13 @@ public class LayoutPreservingProperties extends Properties {
 
         if (keyedPairLines.containsKey(key)) {
             final Integer i = keyedPairLines.get(key);
-            final Pair p = (Pair) logicalLines.get(i.intValue());
+            final Pair p = (Pair) logicalLines.get(i);
             p.setValue(value);
         } else {
             key = escapeName(key);
             final Pair p = new Pair(key, value);
             p.setNew(true);
-            keyedPairLines.put(key, Integer.valueOf(logicalLines.size()));
+            keyedPairLines.put(key, logicalLines.size());
             logicalLines.add(p);
         }
     }
@@ -204,9 +204,9 @@ public class LayoutPreservingProperties extends Properties {
         final Integer i = keyedPairLines.remove(key);
         if (null != i) {
             if (removeComments) {
-                removeCommentsEndingAt(i.intValue());
+                removeCommentsEndingAt(i);
             }
-            logicalLines.set(i.intValue(), null);
+            logicalLines.set(i, null);
         }
         return obj;
     }
@@ -363,7 +363,7 @@ public class LayoutPreservingProperties extends Properties {
                         // the new one
                         remove(key);
                     }
-                    keyedPairLines.put(key, Integer.valueOf(logicalLines.size()));
+                    keyedPairLines.put(key, logicalLines.size());
                 }
                 logicalLines.add(line);
                 logicalLineBuffer.setLength(0);
diff --git a/src/main/org/apache/tools/ant/util/ScriptFixBSFPath.java b/src/main/org/apache/tools/ant/util/ScriptFixBSFPath.java
index 407c5c63b..616156c3f 100644
--- a/src/main/org/apache/tools/ant/util/ScriptFixBSFPath.java
+++ b/src/main/org/apache/tools/ant/util/ScriptFixBSFPath.java
@@ -109,7 +109,7 @@ public class ScriptFixBSFPath {
         boolean needMoveRunner = (bsfSource == null);
 
         // Check for location of language
-        String languageClassName = (String) BSF_LANGUAGE_MAP.get(language);
+        String languageClassName = BSF_LANGUAGE_MAP.get(language);
 
         // Check if need to need to move bsf
         boolean needMoveBsf =
diff --git a/src/main/org/apache/tools/ant/util/StringUtils.java b/src/main/org/apache/tools/ant/util/StringUtils.java
index e738da12a..c42a7c64c 100644
--- a/src/main/org/apache/tools/ant/util/StringUtils.java
+++ b/src/main/org/apache/tools/ant/util/StringUtils.java
@@ -166,19 +166,19 @@ public final class StringUtils {
             } else {
                 switch (c) {
                     case '\\':
-                        b.append((char) '\\');
+                        b.append('\\');
                         break;
                     case 'n':
-                        b.append((char) '\n');
+                        b.append('\n');
                         break;
                     case 'r':
-                        b.append((char) '\r');
+                        b.append('\r');
                         break;
                     case 't':
-                        b.append((char) '\t');
+                        b.append('\t');
                         break;
                     case 'f':
-                        b.append((char) '\f');
+                        b.append('\f');
                         break;
                     case 's':
                         b.append(" \t\n\r\f");
diff --git a/src/main/org/apache/tools/ant/util/SymbolicLinkUtils.java b/src/main/org/apache/tools/ant/util/SymbolicLinkUtils.java
index 5e1209460..b11c79d36 100644
--- a/src/main/org/apache/tools/ant/util/SymbolicLinkUtils.java
+++ b/src/main/org/apache/tools/ant/util/SymbolicLinkUtils.java
@@ -41,8 +41,7 @@ public class SymbolicLinkUtils {
     /**
      * Shared instance.
      */
-    private static final SymbolicLinkUtils PRIMARY_INSTANCE =
-        new SymbolicLinkUtils();
+    private static final SymbolicLinkUtils PRIMARY_INSTANCE = new SymbolicLinkUtils();
 
     /**
      * Method to retrieve The SymbolicLinkUtils, which is shared by
@@ -294,8 +293,7 @@ public class SymbolicLinkUtils {
                 }
             }
         } else {
-            Execute.runCommand(task,
-                               new String[] {"rm", link.getAbsolutePath()});
+            Execute.runCommand(task, "rm", link.getAbsolutePath());
         }
     }
 
diff --git a/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.java b/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.java
index 781ecf4ca..8f2c403da 100644
--- a/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.java
+++ b/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.java
@@ -65,7 +65,7 @@ public class JakartaRegexpRegexp extends JakartaRegexpMatcher
                     c = argument.charAt(i);
                     int value = Character.digit(c, DECIMAL);
                     if (value > -1) {
-                        result.append((String) v.elementAt(value));
+                        result.append(v.elementAt(value));
                     } else {
                         result.append(c);
                     }
diff --git a/src/main/org/apache/tools/bzip2/BlockSort.java b/src/main/org/apache/tools/bzip2/BlockSort.java
index e2aaf3783..f165b9bba 100644
--- a/src/main/org/apache/tools/bzip2/BlockSort.java
+++ b/src/main/org/apache/tools/bzip2/BlockSort.java
@@ -523,7 +523,7 @@ class BlockSort {
 
         /*-- LBZ2: the log(N) loop --*/
         H = 1;
-        while (true) {
+        do {
 
             j = 0;
             for (i = 0; i < nblock; i++) {
@@ -572,10 +572,7 @@ class BlockSort {
             }
 
             H *= 2;
-            if (H > nblock || nNotDone == 0) {
-                break;
-            }
-        }
+        } while (H <= nblock && nNotDone != 0);
     }
 
 /*---------------------------------------------*/
@@ -651,7 +648,7 @@ class BlockSort {
                         if (onceRun) {
                             fmap[j] = a;
                             if ((j -= h) <= mj) { //NOSONAR
-                                break HAMMER;
+                                break;
                             }
                         } else {
                             onceRun = true;
@@ -670,7 +667,7 @@ class BlockSort {
                                         if (block[i1 + 5] == block[i2 + 5]) {
                                             if (block[(i1 += 6)] == block[(i2 += 6)]) { //NOSONAR
                                                 int x = lastShadow;
-                                                X: while (x > 0) {
+                                                while (x > 0) {
                                                     x -= 4;
 
                                                     if (block[i1 + 1] == block[i2 + 1]) {
@@ -688,7 +685,6 @@ class BlockSort {
                                                                                         i2 -= lastPlus1;
                                                                                     }
                                                                                     workDoneShadow++;
-                                                                                    continue X;
                                                                                 } else if ((quadrant[i1 + 3] > quadrant[i2 + 3])) {
                                                                                     continue HAMMER;
                                                                                 } else {
@@ -731,39 +727,27 @@ class BlockSort {
                                                     }
 
                                                 }
-                                                break HAMMER;
+                                                break;
                                             } // while x > 0
                                             else {
-                                                if ((block[i1] & 0xff) > (block[i2] & 0xff)) {
-                                                    continue HAMMER;
-                                                } else {
-                                                    break HAMMER;
+                                                if ((block[i1] & 0xff) <= (block[i2] & 0xff)) {
+                                                    break;
                                                 }
                                             }
-                                        } else if ((block[i1 + 5] & 0xff) > (block[i2 + 5] & 0xff)) {
-                                            continue HAMMER;
-                                        } else {
-                                            break HAMMER;
+                                        } else if ((block[i1 + 5] & 0xff) <= (block[i2 + 5] & 0xff)) {
+                                            break;
                                         }
-                                    } else if ((block[i1 + 4] & 0xff) > (block[i2 + 4] & 0xff)) {
-                                        continue HAMMER;
-                                    } else {
-                                        break HAMMER;
+                                    } else if ((block[i1 + 4] & 0xff) <= (block[i2 + 4] & 0xff)) {
+                                        break;
                                     }
-                                } else if ((block[i1 + 3] & 0xff) > (block[i2 + 3] & 0xff)) {
-                                    continue HAMMER;
-                                } else {
-                                    break HAMMER;
+                                } else if ((block[i1 + 3] & 0xff) <= (block[i2 + 3] & 0xff)) {
+                                    break;
                                 }
-                            } else if ((block[i1 + 2] & 0xff) > (block[i2 + 2] & 0xff)) {
-                                continue HAMMER;
-                            } else {
-                                break HAMMER;
+                            } else if ((block[i1 + 2] & 0xff) <= (block[i2 + 2] & 0xff)) {
+                                break;
                             }
-                        } else if ((block[i1 + 1] & 0xff) > (block[i2 + 1] & 0xff)) {
-                            continue HAMMER;
-                        } else {
-                            break HAMMER;
+                        } else if ((block[i1 + 1] & 0xff) <= (block[i2 + 1] & 0xff)) {
+                            break;
                         }
 
                     } // HAMMER
diff --git a/src/main/org/apache/tools/bzip2/CBZip2InputStream.java b/src/main/org/apache/tools/bzip2/CBZip2InputStream.java
index 6a328f111..0e000e335 100644
--- a/src/main/org/apache/tools/bzip2/CBZip2InputStream.java
+++ b/src/main/org/apache/tools/bzip2/CBZip2InputStream.java
@@ -359,7 +359,7 @@ public class CBZip2InputStream extends InputStream implements BZip2Constants {
         }
     }
 
-    private void endBlock() throws IOException {
+    private void endBlock() {
         this.computedBlockCRC = this.crc.getFinalCRC();
 
         // A bad CRC is considered a fatal error.
diff --git a/src/main/org/apache/tools/tar/TarEntry.java b/src/main/org/apache/tools/tar/TarEntry.java
index afdd9511e..c5658129f 100644
--- a/src/main/org/apache/tools/tar/TarEntry.java
+++ b/src/main/org/apache/tools/tar/TarEntry.java
@@ -377,7 +377,7 @@ public class TarEntry implements TarConstants {
      * @return This entry's name.
      */
     public String getName() {
-        return name.toString();
+        return name;
     }
 
     /**
@@ -404,7 +404,7 @@ public class TarEntry implements TarConstants {
      * @return This entry's link name.
      */
     public String getLinkName() {
-        return linkName.toString();
+        return linkName;
     }
 
     /**
@@ -504,7 +504,7 @@ public class TarEntry implements TarConstants {
      * @return This entry's user name.
      */
     public String getUserName() {
-        return userName.toString();
+        return userName;
     }
 
     /**
@@ -522,7 +522,7 @@ public class TarEntry implements TarConstants {
      * @return This entry's group name.
      */
     public String getGroupName() {
-        return groupName.toString();
+        return groupName;
     }
 
     /**
@@ -745,15 +745,7 @@ public class TarEntry implements TarConstants {
             return file.isDirectory();
         }
 
-        if (linkFlag == LF_DIR) {
-            return true;
-        }
-
-        if (getName().endsWith("/")) {
-            return true;
-        }
-
-        return false;
+        return linkFlag == LF_DIR || getName().endsWith("/");
     }
 
     /**
diff --git a/src/main/org/apache/tools/zip/ZipEightByteInteger.java b/src/main/org/apache/tools/zip/ZipEightByteInteger.java
index ca291600f..c76b5d04c 100644
--- a/src/main/org/apache/tools/zip/ZipEightByteInteger.java
+++ b/src/main/org/apache/tools/zip/ZipEightByteInteger.java
@@ -207,10 +207,10 @@ public final class ZipEightByteInteger {
      */
     @Override
     public boolean equals(Object o) {
-        if (o == null || !(o instanceof ZipEightByteInteger)) {
-            return false;
+        if (o instanceof ZipEightByteInteger) {
+            return value.equals(((ZipEightByteInteger) o).getValue());
         }
-        return value.equals(((ZipEightByteInteger) o).getValue());
+        return false;
     }
 
     /**
diff --git a/src/main/org/apache/tools/zip/ZipLong.java b/src/main/org/apache/tools/zip/ZipLong.java
index 5932f8469..a84da7066 100644
--- a/src/main/org/apache/tools/zip/ZipLong.java
+++ b/src/main/org/apache/tools/zip/ZipLong.java
@@ -168,10 +168,10 @@ public final class ZipLong implements Cloneable {
      */
     @Override
     public boolean equals(Object o) {
-        if (o == null || !(o instanceof ZipLong)) {
-            return false;
+        if (o instanceof ZipLong) {
+            return value == ((ZipLong) o).getValue();
         }
-        return value == ((ZipLong) o).getValue();
+        return false;
     }
 
     /**
diff --git a/src/main/org/apache/tools/zip/ZipShort.java b/src/main/org/apache/tools/zip/ZipShort.java
index ccbca3dff..e18c0d443 100644
--- a/src/main/org/apache/tools/zip/ZipShort.java
+++ b/src/main/org/apache/tools/zip/ZipShort.java
@@ -133,10 +133,10 @@ public final class ZipShort implements Cloneable {
      */
     @Override
     public boolean equals(Object o) {
-        if (o == null || !(o instanceof ZipShort)) {
-            return false;
+        if (o instanceof ZipShort) {
+            return value == ((ZipShort) o).getValue();
         }
-        return value == ((ZipShort) o).getValue();
+        return false;
     }
 
     /**
diff --git a/src/tests/junit/org/apache/tools/ant/AntClassLoaderDelegationTest.java b/src/tests/junit/org/apache/tools/ant/AntClassLoaderDelegationTest.java
index b6f5b5f2c..77fe41eaa 100644
--- a/src/tests/junit/org/apache/tools/ant/AntClassLoaderDelegationTest.java
+++ b/src/tests/junit/org/apache/tools/ant/AntClassLoaderDelegationTest.java
@@ -74,11 +74,11 @@ public class AntClassLoaderDelegationTest {
             FILE_UTILS.toURI(buildTestcases) + "org/" + TEST_RESOURCE);
         URL urlFromParent = new URL("http://ant.apache.org/" + TEST_RESOURCE);
         assertEquals("correct resources (regular delegation order)",
-            Arrays.asList(new URL[] {urlFromParent, urlFromPath}),
+            Arrays.asList(urlFromParent, urlFromPath),
             enum2List(acl.getResources(TEST_RESOURCE)));
         acl = new AntClassLoader(parent, p, path, false);
         assertEquals("correct resources (reverse delegation order)",
-            Arrays.asList(new URL[] {urlFromPath, urlFromParent}),
+            Arrays.asList(urlFromPath, urlFromParent),
             enum2List(acl.getResources(TEST_RESOURCE)));
     }
 
@@ -98,11 +98,11 @@ public class AntClassLoaderDelegationTest {
         AntClassLoader acl = new AntClassLoader(parent, p, path, false);
         acl.setIsolated(true);
         assertEquals("correct resources (reverse delegation order)",
-            Arrays.asList(new URL[] {urlFromPath}),
+                Collections.singletonList(urlFromPath),
             enum2List(acl.getResources(TEST_RESOURCE)));
     }
 
-    private static List enum2List(Enumeration e) {
+    private static List<URL> enum2List(Enumeration<URL> e) {
         return Collections.list(e);
     }
 
@@ -112,13 +112,13 @@ public class AntClassLoaderDelegationTest {
         public ParentLoader() {
         }
 
-        protected Enumeration findResources(String name) throws IOException {
+        protected Enumeration<URL> findResources(String name) throws IOException {
             if (name.equals(TEST_RESOURCE)) {
                 return Collections.enumeration(
                     Collections.singleton(
                         new URL("http://ant.apache.org/" + name)));
             } else {
-                return Collections.enumeration(Collections.EMPTY_SET);
+                return Collections.enumeration(Collections.emptySet());
             }
         }
 
diff --git a/src/tests/junit/org/apache/tools/ant/AntClassLoaderTest.java b/src/tests/junit/org/apache/tools/ant/AntClassLoaderTest.java
index a18064305..3586cf913 100644
--- a/src/tests/junit/org/apache/tools/ant/AntClassLoaderTest.java
+++ b/src/tests/junit/org/apache/tools/ant/AntClassLoaderTest.java
@@ -29,11 +29,11 @@ import java.io.File;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.net.URL;
+import java.util.Collections;
 import java.util.Enumeration;
 
 import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.util.FileUtils;
-import org.apache.tools.ant.util.CollectionUtils;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -234,9 +234,9 @@ public class AntClassLoaderTest {
         public URL getResource(String n) {
             return null;
         }
-        @SuppressWarnings("unchecked")
-        public Enumeration getResources(String n) {
-            return new CollectionUtils.EmptyEnumeration();
+
+        public Enumeration<URL> getResources(String n) {
+            return Collections.emptyEnumeration();
         }
     }
 
@@ -244,6 +244,7 @@ public class AntClassLoaderTest {
         GetPackageWrapper(ClassLoader parent) {
             super(parent);
         }
+
         public Package getPackage(String s) {
             return super.getPackage(s);
         }
diff --git a/src/tests/junit/org/apache/tools/ant/IntrospectionHelperTest.java b/src/tests/junit/org/apache/tools/ant/IntrospectionHelperTest.java
index ae77f50c1..27b85c7c6 100644
--- a/src/tests/junit/org/apache/tools/ant/IntrospectionHelperTest.java
+++ b/src/tests/junit/org/apache/tools/ant/IntrospectionHelperTest.java
@@ -26,7 +26,6 @@ import java.nio.file.Paths;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Hashtable;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -220,7 +219,7 @@ public class IntrospectionHelperTest {
         Enumeration e = ih.getNestedElements();
         while (e.hasMoreElements()) {
             String name = (String) e.nextElement();
-            Class expect = (Class) elemMap.get(name);
+            Class expect = elemMap.get(name);
             assertNotNull("Support for "+name+" in IntrospectioNHelperTest?",
                           expect);
             assertEquals("Return type of " + name, expect, ih.getElementType(name));
@@ -234,8 +233,8 @@ public class IntrospectionHelperTest {
         Map<String, Class<?>> elemMap = getExpectedNestedElements();
         Map<String, Class<?>> actualMap = ih.getNestedElementMap();
         for (Map.Entry<String, Class<?>> entry : actualMap.entrySet()) {
-            String elemName = (String) entry.getKey();
-            Class<?> elemClass = (Class) elemMap.get(elemName);
+            String elemName = entry.getKey();
+            Class<?> elemClass = elemMap.get(elemName);
             assertNotNull("Support for " + elemName +
                           " in IntrospectionHelperTest?", elemClass);
             assertEquals("Type of " + elemName, elemClass, entry.getValue());
@@ -461,8 +460,8 @@ public class IntrospectionHelperTest {
         }
     }
 
-    private Map getExpectedAttributes() {
-        Map attrMap = new Hashtable();
+    private Map<String, Class<?>> getExpectedAttributes() {
+        Map<String, Class<?>> attrMap = new Hashtable<>();
         attrMap.put("seven", String.class);
         attrMap.put("eight", Integer.TYPE);
         attrMap.put("nine", Integer.class);
@@ -511,8 +510,8 @@ public class IntrospectionHelperTest {
         Map<String, Class<?>> attrMap = getExpectedAttributes();
         Map<String, Class<?>> actualMap = ih.getAttributeMap();
         for (Map.Entry<String, Class<?>> entry : actualMap.entrySet()) {
-            String attrName = (String) entry.getKey();
-            Class attrClass = (Class) attrMap.get(attrName);
+            String attrName = entry.getKey();
+            Class attrClass = attrMap.get(attrName);
             assertNotNull("Support for " + attrName +
                           " in IntrospectionHelperTest?", attrClass);
             assertEquals("Type of " + attrName, attrClass, entry.getValue());
@@ -532,33 +531,33 @@ public class IntrospectionHelperTest {
     @Test
     public void testGetAttributeMethod() {
         assertAttrMethod("seven", "setSeven", String.class,
-                         "2", "3");
+                "2", "3");
         assertAttrMethod("eight", "setEight", Integer.TYPE,
-                         Integer.valueOf(2), Integer.valueOf(3));
+                2, 3);
         assertAttrMethod("nine", "setNine", Integer.class,
-                         Integer.valueOf(2), Integer.valueOf(3));
+                2, 3);
         assertAttrMethod("ten", "setTen", File.class,
-                         new File(projectBasedir + 2), new File("toto"));
+                new File(projectBasedir + 2), new File("toto"));
         assertAttrMethod("eleven", "setEleven", Boolean.TYPE,
-                         Boolean.FALSE, Boolean.TRUE);
+                Boolean.FALSE, Boolean.TRUE);
         assertAttrMethod("twelve", "setTwelve", Boolean.class,
-                         Boolean.FALSE, Boolean.TRUE);
+                Boolean.FALSE, Boolean.TRUE);
         assertAttrMethod("thirteen", "setThirteen", Class.class,
-                         Project.class, Map.class);
+                Project.class, Map.class);
         assertAttrMethod("fourteen", "setFourteen", StringBuffer.class,
-                         new StringBuffer("2"), new StringBuffer("3"));
+                new StringBuffer("2"), new StringBuffer("3"));
         assertAttrMethod("fifteen", "setFifteen", Character.TYPE,
-                         Character.valueOf('a'), Character.valueOf('b'));
+                'a', 'b');
         assertAttrMethod("sixteen", "setSixteen", Character.class,
-                         Character.valueOf('a'), Character.valueOf('b'));
+                'a', 'b');
         assertAttrMethod("seventeen", "setSeventeen", Byte.TYPE,
-                         Byte.valueOf((byte) 17), Byte.valueOf((byte) 10));
+                (byte) 17, (byte) 10);
         assertAttrMethod("eightteen", "setEightteen", Short.TYPE,
-                         Short.valueOf((short) 18), Short.valueOf((short) 10));
+                (short) 18, (short) 10);
         assertAttrMethod("nineteen", "setNineteen", Double.TYPE,
-                         Double.valueOf(19), Double.valueOf((short) 10));
+                19d, (double) (short) 10);
         assertAttrMethod("twenty", "setTwenty", Path.class,
-                         new File(projectBasedir + 20).toPath(), Paths.get("toto"));
+                new File(projectBasedir + 20).toPath(), Paths.get("toto"));
 
         try {
             assertAttrMethod("onehundred", null, null, null, null);
@@ -619,7 +618,7 @@ public class IntrospectionHelperTest {
     }
 
     public void setTwelve(Boolean b) {
-        assertTrue(!b.booleanValue());
+        assertTrue(!b);
     }
 
     public void setThirteen(Class c) {
@@ -702,7 +701,7 @@ public class IntrospectionHelperTest {
         assertEquals("Arg Type", methodArg, args[0]);
 
         try {
-            m.invoke(this, new Object[] { arg });
+            m.invoke(this, arg);
         } catch (IllegalAccessException e) {
             throw new BuildException(e);
         } catch (InvocationTargetException e) {
@@ -710,7 +709,7 @@ public class IntrospectionHelperTest {
         }
 
         try {
-            m.invoke(this, new Object[] { badArg });
+            m.invoke(this, badArg);
             fail("Should have raised an assertion exception");
         } catch (IllegalAccessException e) {
             throw new BuildException(e);
@@ -740,13 +739,13 @@ public class IntrospectionHelperTest {
         assertTrue(m.isEmpty());
     }
 
-    public void addConfigured(Hashtable h) {
+    public void addConfigured(Hashtable<String, String> h) {
         // Valid extension point, more derived than Map above, but *after* it!
         assertEquals(makeTable("key", "value"), h);
     }
 
-    private Hashtable makeTable(Object key, Object value) {
-        Hashtable table = new Hashtable();
+    private Hashtable<String, String> makeTable(String key, String value) {
+        Hashtable<String, String> table = new Hashtable<>();
         table.put(key, value);
         return table;
     }
diff --git a/src/tests/junit/org/apache/tools/ant/LocationTest.java b/src/tests/junit/org/apache/tools/ant/LocationTest.java
index ca7f9b1d9..42aab1dd2 100644
--- a/src/tests/junit/org/apache/tools/ant/LocationTest.java
+++ b/src/tests/junit/org/apache/tools/ant/LocationTest.java
@@ -42,7 +42,7 @@ public class LocationTest {
     @Test
     public void testPlainTask() {
         buildRule.executeTarget("testPlainTask");
-        Echo e = (Echo) buildRule.getProject().getReference("echo");
+        Echo e = buildRule.getProject().getReference("echo");
         assertFalse(e.getLocation() == Location.UNKNOWN_LOCATION);
         assertFalse(e.getLocation().getLineNumber() == 0);
     }
@@ -50,8 +50,8 @@ public class LocationTest {
     @Test
     public void testStandaloneType() {
         buildRule.executeTarget("testStandaloneType");
-        Echo e = (Echo) buildRule.getProject().getReference("echo2");
-        FileSet f = (FileSet) buildRule.getProject().getReference("fs");
+        Echo e = buildRule.getProject().getReference("echo2");
+        FileSet f = buildRule.getProject().getReference("fs");
         assertFalse(f.getLocation() == Location.UNKNOWN_LOCATION);
         assertEquals(e.getLocation().getLineNumber() + 1,
                      f.getLocation().getLineNumber());
@@ -60,7 +60,7 @@ public class LocationTest {
     @Test
     public void testConditionTask() {
         buildRule.executeTarget("testConditionTask");
-        TaskAdapter ta = (TaskAdapter) buildRule.getProject().getReference("cond");
+        TaskAdapter ta = buildRule.getProject().getReference("cond");
         ConditionTask c = (ConditionTask) ta.getProxy();
         assertFalse(c.getLocation() == Location.UNKNOWN_LOCATION);
         assertFalse(c.getLocation().getLineNumber() == 0);
@@ -69,7 +69,7 @@ public class LocationTest {
     @Test
     public void testMacrodefWrappedTask() {
         buildRule.executeTarget("testMacrodefWrappedTask");
-        Echo e = (Echo) buildRule.getProject().getReference("echo3");
+        Echo e = buildRule.getProject().getReference("echo3");
         assertTrue(buildRule.getLog().contains("Line: "
                 + (e.getLocation().getLineNumber() + 1)));
     }
@@ -77,7 +77,7 @@ public class LocationTest {
     @Test
     public void testPresetdefWrappedTask() {
         buildRule.executeTarget("testPresetdefWrappedTask");
-        Echo e = (Echo) buildRule.getProject().getReference("echo4");
+        Echo e = buildRule.getProject().getReference("echo4");
         assertTrue(buildRule.getLog().contains("Line: "
                 + (e.getLocation().getLineNumber() + 1)));
     }
diff --git a/src/tests/junit/org/apache/tools/ant/MockBuildListener.java b/src/tests/junit/org/apache/tools/ant/MockBuildListener.java
index 654872ca8..ec03404b5 100644
--- a/src/tests/junit/org/apache/tools/ant/MockBuildListener.java
+++ b/src/tests/junit/org/apache/tools/ant/MockBuildListener.java
@@ -57,7 +57,7 @@ public class MockBuildListener implements BuildListener {
         assertTrue("unexpected messageLogged: "+ actual.getMessage(), !buffer.isEmpty());
         assertEquals("unexpected project ", project, actual.getProject());
 
-        BuildEvent expected = (BuildEvent) buffer.elementAt(0);
+        BuildEvent expected = buffer.elementAt(0);
         buffer.removeElementAt(0);
         assertEquals("unexpected messageLogged ", expected.getMessage(), actual.getMessage());
         assertEquals("unexpected priority ", expected.getPriority(), actual.getPriority());
diff --git a/src/tests/junit/org/apache/tools/ant/launch/LocatorTest.java b/src/tests/junit/org/apache/tools/ant/launch/LocatorTest.java
index 31c6adefd..24cd1ef7b 100644
--- a/src/tests/junit/org/apache/tools/ant/launch/LocatorTest.java
+++ b/src/tests/junit/org/apache/tools/ant/launch/LocatorTest.java
@@ -86,7 +86,6 @@ public class LocatorTest {
 
     /**
      * this isn't really a valid URI, except maybe in IE
-     * @throws Exception if something goes wrong
      */
     public void testNetworkURI() {
         resolveTo("file:\\\\PC03\\jclasses\\lib\\ant-1.7.0.jar", ""
@@ -123,7 +122,6 @@ public class LocatorTest {
 
     /**
      * Bug 42275; Ant failing to run off a remote share
-     * @throws Throwable if desired
      */
     @Test
     public void testAntOnRemoteShare() {
@@ -135,8 +133,6 @@ public class LocatorTest {
 
     /**
      * Bug 42275; Ant failing to run off a remote share
-     *
-     * @throws Throwable if desired
      */
     @Test
     public void testFileFromRemoteShare() {
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java
index 684cb62cc..a5f615d65 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java
@@ -493,7 +493,7 @@ public class AntTest {
                     } else {
                         // a rather convoluted equals() test
                         Path expect = (Path) value;
-                        Path received = (Path) event.getProject().getReference(keys[calls]);
+                        Path received = event.getProject().getReference(keys[calls]);
                         boolean shouldBeEqual = expectSame[calls++];
                         if (received == null) {
                             assertTrue(msg, !shouldBeEqual);
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/ExecStreamRedirectorTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/ExecStreamRedirectorTest.java
index 99302de9e..4b359e3e4 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/ExecStreamRedirectorTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/ExecStreamRedirectorTest.java
@@ -37,7 +37,7 @@ public class ExecStreamRedirectorTest {
     /**
      * Tests that the redirected streams of the exec'ed process aren't truncated.
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      * @see <a href="https://bz.apache.org/bugzilla/show_bug.cgi?id=58451">bz-58451</a> and
      * <a href="https://bz.apache.org/bugzilla/show_bug.cgi?id=58833">bz-58833</a> for more details
      */
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/ManifestTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/ManifestTest.java
index e51878219..82760dba4 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/ManifestTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/ManifestTest.java
@@ -286,7 +286,7 @@ public class ManifestTest {
         value = mainSection.getAttributeValue(NOT_LONG_NAME);
         assertEquals("NOT_LONG_NAME_VALUE_MISMATCH", VALUE, value);
 
-        Set set = new HashSet();
+        Set<String> set = new HashSet<>();
         FileReader fin = new FileReader(expandedManifest);
         try {
             BufferedReader in = new BufferedReader(fin);
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/RmicAdvancedTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/RmicAdvancedTest.java
index 9dbbbc462..8ce0cbe50 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/RmicAdvancedTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/RmicAdvancedTest.java
@@ -275,7 +275,6 @@ public class RmicAdvancedTest {
 
     /**
      * test that version 1.1 stubs are good
-     * @throws Exception if something goes wrong
      */
     @Test
     public void testVersion11() {
@@ -284,7 +283,6 @@ public class RmicAdvancedTest {
 
     /**
      * test that version 1.1 stubs are good
-     * @throws Exception if something goes wrong
      */
     @Test
     public void testVersion11Dest() {
@@ -293,8 +291,6 @@ public class RmicAdvancedTest {
 
     /**
      * test that version 1.2 stubs are good
-     *
-     * @throws Exception if something goes wrong
      */
     @Test
     public void testVersion12() {
@@ -303,8 +299,6 @@ public class RmicAdvancedTest {
 
     /**
      * test that version 1.2 stubs are good
-     *
-     * @throws Exception if something goes wrong
      */
     @Test
     public void testVersion12Dest() {
@@ -313,8 +307,6 @@ public class RmicAdvancedTest {
 
     /**
      * test that version compat stubs are good
-     *
-     * @throws Exception if something goes wrong
      */
     @Test
     public void testVersionCompat() {
@@ -323,8 +315,6 @@ public class RmicAdvancedTest {
 
     /**
      * test that version compat stubs are good
-     *
-     * @throws Exception if something goes wrong
      */
     @Test
     public void testVersionCompatDest() {
@@ -333,8 +323,6 @@ public class RmicAdvancedTest {
 
     /**
      * test that passes -Xnew to sun's rmic running in a different VM.
-     *
-     * @throws Exception if something goes wrong
      */
     @Test
     public void testXnewForked() {
@@ -342,6 +330,9 @@ public class RmicAdvancedTest {
         buildRule.executeTarget("testXnewForked");
     }
 
+    /**
+     * test that passes -Xnew to sun's rmic running in a different VM.
+     */
     @Test
     public void testXnewForkedJava9plus() {
         assumeTrue("Current system is Java 8 or older", JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_9));
@@ -352,8 +343,6 @@ public class RmicAdvancedTest {
 
     /**
      * test that passes -Xnew to sun's rmic running in a different VM.
-     *
-     * @throws Exception if something goes wrong
      */
     @Test
     public void testXnewForkedDest() {
@@ -361,6 +350,9 @@ public class RmicAdvancedTest {
         buildRule.executeTarget("testXnewForkedDest");
     }
 
+    /**
+     * test that passes -Xnew to sun's rmic running in a different VM.
+     */
     @Test
     public void testXnewForkedDestJava9plus() {
         assumeTrue("Current system is Java 8 or older", JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_9));
@@ -371,8 +363,6 @@ public class RmicAdvancedTest {
 
     /**
      * test that runs the new xnew compiler adapter.
-     *
-     * @throws Exception if something goes wrong
      */
     @Test
     public void testXnewCompiler() {
@@ -380,6 +370,9 @@ public class RmicAdvancedTest {
         buildRule.executeTarget("testXnewCompiler");
     }
 
+    /**
+     * test that runs the new xnew compiler adapter.
+     */
     @Test
     public void testXnewCompilerJava9plus() {
         assumeTrue("Current system is Java 8 or older", JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_9));
@@ -390,8 +383,6 @@ public class RmicAdvancedTest {
 
     /**
      * test that runs the new xnew compiler adapter.
-     *
-     * @throws Exception if something goes wrong
      */
     @Test
     public void testXnewCompilerDest() {
@@ -399,6 +390,9 @@ public class RmicAdvancedTest {
         buildRule.executeTarget("testXnewCompilerDest");
     }
 
+    /**
+     * test that runs the new xnew compiler adapter.
+     */
     @Test
     public void testXnewCompilerDestJava9plus() {
         assumeTrue("Current system is Java 8 or older", JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_9));
@@ -409,8 +403,6 @@ public class RmicAdvancedTest {
 
     /**
      * test that verifies that IDL compiles.
-     *
-     * @throws Exception if something goes wrong
      */
     @Test
     public void testIDL() {
@@ -418,6 +410,9 @@ public class RmicAdvancedTest {
         buildRule.executeTarget("testIDL");
     }
 
+    /**
+     * test that verifies that IDL compiles.
+     */
     @Test
     public void testIDLJava11plus() {
         assumeTrue("Current system is Java 10 or older", JavaEnvUtils.isAtLeastJavaVersion("11"));
@@ -428,8 +423,6 @@ public class RmicAdvancedTest {
 
     /**
      * test that verifies that IDL compiles.
-     *
-     * @throws Exception if something goes wrong
      */
     @Test
     public void testIDLDest() {
@@ -437,6 +430,9 @@ public class RmicAdvancedTest {
         buildRule.executeTarget("testIDLDest");
     }
 
+    /**
+     * test that verifies that IDL compiles.
+     */
     @Test
     public void testIDLDestJava11plus() {
         assumeTrue("Current system is Java 10 or older", JavaEnvUtils.isAtLeastJavaVersion("11"));
@@ -447,8 +443,6 @@ public class RmicAdvancedTest {
 
     /**
      * test that verifies that IIOP compiles.
-     *
-     * @throws Exception if something goes wrong
      */
     @Test
     public void testIIOP() {
@@ -456,6 +450,9 @@ public class RmicAdvancedTest {
         buildRule.executeTarget("testIIOP");
     }
 
+    /**
+     * test that verifies that IIOP compiles.
+     */
     @Test
     public void testIIOPJava11plus() {
         assumeTrue("Current system is Java 10 or older", JavaEnvUtils.isAtLeastJavaVersion("11"));
@@ -466,8 +463,6 @@ public class RmicAdvancedTest {
 
     /**
      * test that verifies that IIOP compiles.
-     *
-     * @throws Exception if something goes wrong
      */
     @Test
     public void testIIOPDest() {
@@ -475,6 +470,9 @@ public class RmicAdvancedTest {
         buildRule.executeTarget("testIIOPDest");
     }
 
+    /**
+     * test that verifies that IIOP compiles.
+     */
     @Test
     public void testIIOPDestJava11plus() {
         assumeTrue("Current system is Java 10 or older", JavaEnvUtils.isAtLeastJavaVersion("11"));
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/TStampTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/TStampTest.java
index f8e76bae3..645db166e 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/TStampTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/TStampTest.java
@@ -68,7 +68,6 @@ public class TStampTest {
     /**
      * verifies that custom props have priority over the
      * originals
-     * @throws Exception if something goes wrong
      */
     @Test
     public void testWriteOrder() {
@@ -89,9 +88,7 @@ public class TStampTest {
     }
 
     /**
-     * verifies that custom props have priority over the
-     * originals
-     * @throws Exception if something goes wrong
+     * verifies that custom props have priority over the originals
      */
     @Test
     public void testPrefix() {
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/TypeAdapterTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/TypeAdapterTest.java
index aac89aee4..5ac9b2d3c 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/TypeAdapterTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/TypeAdapterTest.java
@@ -120,7 +120,7 @@ public class TypeAdapterTest {
         private String execMethodName = "run";
         private Object proxy;
 
-        public Method getExecuteMethod(Class proxyClass) {
+        public Method getExecuteMethod(Class<?> proxyClass) {
             try {
                 Method execMethod = proxyClass.getMethod(execMethodName);
                 if (!Void.TYPE.equals(execMethod.getReturnType())) {
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 d833f75cc..33b744343 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/XmlPropertyTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/XmlPropertyTest.java
@@ -338,7 +338,7 @@ public class XmlPropertyTest {
      * and below.
      */
     private static Enumeration getFiles (final File startingDir) {
-        Vector result = new Vector();
+        Vector<File> result = new Vector<>();
         getFiles(startingDir, result);
         return result.elements();
     }
@@ -347,7 +347,7 @@ public class XmlPropertyTest {
      * Collect a list of xml files in the specified folder
      * and below.
      */
-    private static void getFiles (final File startingDir, Vector collect) {
+    private static void getFiles (final File startingDir, Vector<File> collect) {
         FileFilter filter = new FileFilter() {
             public boolean accept (File file) {
                 if (file.isDirectory()) {
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/XsltTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/XsltTest.java
index 5c6a27953..c4aec20c1 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/XsltTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/XsltTest.java
@@ -72,7 +72,6 @@ public class XsltTest {
 
     /**
      * check that the system id gets set properly on stylesheets.
-     * @throws Exception if something goes wrong.
      */
     @Test
     public void testStyleSheetWithInclude() {
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/depend/DependTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/depend/DependTest.java
index 9f6fcc56b..7b5f5a86c 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/depend/DependTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/depend/DependTest.java
@@ -160,7 +160,7 @@ public class DependTest {
      * fileset
      */
     private Hashtable getResultFiles() {
-        FileSet resultFileSet = (FileSet) buildRule.getProject().getReference(RESULT_FILESET);
+        FileSet resultFileSet = buildRule.getProject().getReference(RESULT_FILESET);
         DirectoryScanner scanner = resultFileSet.getDirectoryScanner(buildRule.getProject());
         Hashtable<String, String> files = new Hashtable<>();
         for (String scannedFile : scanner.getIncludedFiles()) {
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/net/FTPTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/net/FTPTest.java
index edca69330..7a7fc17b4 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/net/FTPTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/net/FTPTest.java
@@ -213,7 +213,7 @@ public class FTPTest {
     public void testGetWithSelector() {
         buildRule.executeTarget("ftp-get-with-selector");
         assertContains("selectors are not supported in remote filesets", buildRule.getLog());
-        FileSet fsDestination = (FileSet) buildRule.getProject().getReference("fileset-destination-without-selector");
+        FileSet fsDestination = buildRule.getProject().getReference("fileset-destination-without-selector");
         DirectoryScanner dsDestination = fsDestination.getDirectoryScanner(buildRule.getProject());
         dsDestination.scan();
         String[] sortedDestinationDirectories = dsDestination.getIncludedDirectories();
@@ -226,7 +226,7 @@ public class FTPTest {
             sortedDestinationFiles[counter] =
                 sortedDestinationFiles[counter].replace(File.separatorChar, '/');
         }
-        FileSet fsSource =  (FileSet) buildRule.getProject().getReference("fileset-source-without-selector");
+        FileSet fsSource = buildRule.getProject().getReference("fileset-source-without-selector");
         DirectoryScanner dsSource = fsSource.getDirectoryScanner(buildRule.getProject());
         dsSource.scan();
         compareFiles(dsSource, sortedDestinationFiles, sortedDestinationDirectories);
@@ -251,7 +251,7 @@ public class FTPTest {
         Assume.assumeTrue(loginFailureMessage, loginSucceeded);
         Assume.assumeTrue("Could not change remote directory", changeRemoteDir(remoteTmpDir));
         buildRule.getProject().executeTarget("ftp-get-directory-no-symbolic-link");
-        FileSet fsDestination = (FileSet) buildRule.getProject().getReference("fileset-destination-without-selector");
+        FileSet fsDestination = buildRule.getProject().getReference("fileset-destination-without-selector");
         DirectoryScanner dsDestination = fsDestination.getDirectoryScanner(buildRule.getProject());
         dsDestination.scan();
         compareFiles(dsDestination, new String[] {}, new String[] {});
@@ -523,11 +523,11 @@ public class FTPTest {
      * of times a message has been emitted.
      */
     private class LogCounter extends DefaultLogger {
-        private Map searchMap = new HashMap();
+        private Map<String, Integer> searchMap = new HashMap<>();
         private int matchCount;
 
         public void addLogMessageToSearch(String message) {
-            searchMap.put(message, Integer.valueOf(0));
+            searchMap.put(message, 0);
         }
 
         /*
@@ -535,9 +535,9 @@ public class FTPTest {
          */
         public void messageLogged(BuildEvent event) {
             String message = event.getMessage();
-            Integer mcnt = (Integer) searchMap.get(message);
+            Integer mcnt = searchMap.get(message);
             if (null != mcnt) {
-                searchMap.put(message, Integer.valueOf(mcnt.intValue() + 1));
+                searchMap.put(message, mcnt + 1);
             }
             super.messageLogged(event);
         }
@@ -547,9 +547,9 @@ public class FTPTest {
          * to the log
          */
         public int getMatchCount(String message) {
-            Integer mcnt = (Integer) searchMap.get(message);
+            Integer mcnt = searchMap.get(message);
             if (null != mcnt) {
-                return mcnt.intValue();
+                return mcnt;
             }
             return 0;
         }
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/script/ScriptDefTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/script/ScriptDefTest.java
index 2361dc956..7dd9e60c6 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/script/ScriptDefTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/script/ScriptDefTest.java
@@ -52,7 +52,7 @@ public class ScriptDefTest {
         buildRule.executeTarget("simple");
         // get the fileset and its basedir
         Project p = buildRule.getProject();
-        FileSet fileset = (FileSet) p.getReference("testfileset");
+        FileSet fileset = p.getReference("testfileset");
         File baseDir = fileset.getDir(p);
         String log = buildRule.getLog();
         assertTrue("Expecting attribute value printed",
@@ -87,7 +87,7 @@ public class ScriptDefTest {
         buildRule.executeTarget("nestedbyclassname");
         // get the fileset and its basedir
         Project p = buildRule.getProject();
-        FileSet fileset = (FileSet) p.getReference("testfileset");
+        FileSet fileset = p.getReference("testfileset");
         File baseDir = fileset.getDir(p);
         String log = buildRule.getLog();
         assertTrue("Expecting attribute value to be printed",
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/unix/SymlinkTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/unix/SymlinkTest.java
index 257a8ee48..23f372558 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/unix/SymlinkTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/unix/SymlinkTest.java
@@ -297,8 +297,7 @@ public class SymlinkTest {
      * is {@code false}, then any existing symbolic link at the {@code link} location (whose target is a directory)
      * doesn't end up create a new symbolic link within the target directory.
      *
-     *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      * @see <a href="https://bz.apache.org/bugzilla/show_bug.cgi?id=58683">BZ-58683</a> for more details
      */
     @Test
diff --git a/src/tests/junit/org/apache/tools/ant/types/FilterSetTest.java b/src/tests/junit/org/apache/tools/ant/types/FilterSetTest.java
index 68c175437..6fed14234 100644
--- a/src/tests/junit/org/apache/tools/ant/types/FilterSetTest.java
+++ b/src/tests/junit/org/apache/tools/ant/types/FilterSetTest.java
@@ -152,23 +152,23 @@ public class FilterSetTest {
     public void testNestedFilterSets() {
         buildRule.executeTarget("test-nested-filtersets");
 
-        FilterSet fs = (FilterSet) buildRule.getProject().getReference("1");
+        FilterSet fs = buildRule.getProject().getReference("1");
         Hashtable filters = fs.getFilterHash();
         assertEquals(1, filters.size());
         assertEquals("value1", filters.get("token1"));
 
-        fs = (FilterSet) buildRule.getProject().getReference("2");
+        fs = buildRule.getProject().getReference("2");
         filters = fs.getFilterHash();
         assertEquals(2, filters.size());
         assertEquals("1111", filters.get("aaaa"));
         assertEquals("2222", filters.get("bbbb"));
 
-        fs = (FilterSet) buildRule.getProject().getReference("3");
+        fs = buildRule.getProject().getReference("3");
         filters = fs.getFilterHash();
         assertEquals(1, filters.size());
         assertEquals("value4", filters.get("token4"));
 
-        fs = (FilterSet) buildRule.getProject().getReference("5");
+        fs = buildRule.getProject().getReference("5");
         filters = fs.getFilterHash();
         assertEquals(1, filters.size());
         assertEquals("value1", filters.get("token1"));
diff --git a/src/tests/junit/org/apache/tools/ant/types/RedirectorElementTest.java b/src/tests/junit/org/apache/tools/ant/types/RedirectorElementTest.java
index 9ed6ef64d..1d2ccf757 100644
--- a/src/tests/junit/org/apache/tools/ant/types/RedirectorElementTest.java
+++ b/src/tests/junit/org/apache/tools/ant/types/RedirectorElementTest.java
@@ -41,7 +41,7 @@ public class RedirectorElementTest {
     @Test
     public void test1() {
         buildRule.executeTarget("test1");
-        assertTrue((buildRule.getProject().<Object> getReference("test1")
+        assertTrue((buildRule.getProject().getReference("test1")
             instanceof RedirectorElement));
     }
 
diff --git a/src/tests/junit/org/apache/tools/ant/types/XMLCatalogTest.java b/src/tests/junit/org/apache/tools/ant/types/XMLCatalogTest.java
index befdbc1dc..30b62b444 100644
--- a/src/tests/junit/org/apache/tools/ant/types/XMLCatalogTest.java
+++ b/src/tests/junit/org/apache/tools/ant/types/XMLCatalogTest.java
@@ -128,7 +128,7 @@ public class XMLCatalogTest {
         assertNull("Nonexistent Catalog entry should not be returned", isResult);
 
         Source result = catalog.resolve("i/dont/exist.dtd", null);
-        String expected = toURLString(new File(project.getBaseDir().toURL() +
+        String expected = toURLString(new File(project.getBaseDir().toURI().toURL() +
                                                "/i/dont/exist.dtd"));
         String resultStr = fileURLPartWithoutLeadingSlashes((SAXSource) result);
         assertTrue("Nonexistent Catalog entry return input with a system ID like "
diff --git a/src/tests/junit/org/apache/tools/ant/types/optional/depend/ClassFileSetTest.java b/src/tests/junit/org/apache/tools/ant/types/optional/depend/ClassFileSetTest.java
index e225f13a2..7410652c9 100644
--- a/src/tests/junit/org/apache/tools/ant/types/optional/depend/ClassFileSetTest.java
+++ b/src/tests/junit/org/apache/tools/ant/types/optional/depend/ClassFileSetTest.java
@@ -58,7 +58,7 @@ public class ClassFileSetTest {
         FileSet resultFileSet = p.getReference(RESULT_FILESET);
         DirectoryScanner scanner = resultFileSet.getDirectoryScanner(p);
         String[] scannedFiles = scanner.getIncludedFiles();
-        Hashtable files = new Hashtable();
+        Hashtable<String, String> files = new Hashtable<>();
         for (String scannedFile : scannedFiles) {
             files.put(scannedFile, scannedFile);
         }
@@ -83,9 +83,8 @@ public class ClassFileSetTest {
         buildRule.executeTarget("testsmallset");
         FileSet resultFileSet = p.getReference(RESULT_FILESET);
         DirectoryScanner scanner = resultFileSet.getDirectoryScanner(p);
-        String[] scannedFiles = scanner.getIncludedFiles();
-        Hashtable files = new Hashtable();
-        for (String scannedFile : scannedFiles) {
+        Hashtable<String, String> files = new Hashtable<>();
+        for (String scannedFile : scanner.getIncludedFiles()) {
             files.put(scannedFile, scannedFile);
         }
         assertEquals("Classfileset did not pick up expected number of "
@@ -105,9 +104,8 @@ public class ClassFileSetTest {
         buildRule.executeTarget("testcomboset");
         FileSet resultFileSet = p.getReference(RESULT_FILESET);
         DirectoryScanner scanner = resultFileSet.getDirectoryScanner(p);
-        String[] scannedFiles = scanner.getIncludedFiles();
-        Hashtable files = new Hashtable();
-        for (String scannedFile : scannedFiles) {
+        Hashtable<String, String> files = new Hashtable<>();
+        for (String scannedFile : scanner.getIncludedFiles()) {
             files.put(scannedFile, scannedFile);
         }
         assertEquals("Classfileset did not pick up expected number of "
@@ -133,9 +131,8 @@ public class ClassFileSetTest {
         buildRule.executeTarget("testmethodparam");
         FileSet resultFileSet = p.getReference(RESULT_FILESET);
         DirectoryScanner scanner = resultFileSet.getDirectoryScanner(p);
-        String[] scannedFiles = scanner.getIncludedFiles();
-        Hashtable files = new Hashtable();
-        for (String scannedFile : scannedFiles) {
+        Hashtable<String, String> files = new Hashtable<>();
+        for (String scannedFile : scanner.getIncludedFiles()) {
             files.put(scannedFile, scannedFile);
         }
         assertEquals("Classfileset did not pick up expected number of "
@@ -161,9 +158,8 @@ public class ClassFileSetTest {
         buildRule.executeTarget("testmethodparaminner");
         FileSet resultFileSet = p.getReference(RESULT_FILESET);
         DirectoryScanner scanner = resultFileSet.getDirectoryScanner(p);
-        String[] scannedFiles = scanner.getIncludedFiles();
-        Hashtable files = new Hashtable();
-        for (String scannedFile : scannedFiles) {
+        Hashtable<String, String> files = new Hashtable<>();
+        for (String scannedFile : scanner.getIncludedFiles()) {
             files.put(scannedFile, scannedFile);
         }
         assertEquals("Classfileset did not pick up expected number of "
diff --git a/src/tests/junit/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java b/src/tests/junit/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java
index 0b940ad64..9be4d63b2 100644
--- a/src/tests/junit/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java
+++ b/src/tests/junit/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java
@@ -597,10 +597,10 @@ public class ModifiedSelectorTest {
      *
      * @param comp   configured test object
      */
-    protected void doTest(Comparator comp) {
-        Object o1 = new String("string1");
-        Object o2 = new String("string2");
-        Object o3 = new String("string2"); // really "2"
+    protected void doTest(Comparator<Object> comp) {
+        Object o1 = "string1";
+        Object o2 = "string2";
+        Object o3 = "string2"; // really "2"
 
         assertTrue("Comparator gave wrong value.", comp.compare(o1, o2) != 0);
         assertTrue("Comparator gave wrong value.", comp.compare(o1, o3) != 0);
diff --git a/src/tests/junit/org/apache/tools/ant/types/selectors/SizeSelectorTest.java b/src/tests/junit/org/apache/tools/ant/types/selectors/SizeSelectorTest.java
index 38179c314..e3be005bd 100644
--- a/src/tests/junit/org/apache/tools/ant/types/selectors/SizeSelectorTest.java
+++ b/src/tests/junit/org/apache/tools/ant/types/selectors/SizeSelectorTest.java
@@ -224,7 +224,7 @@ public class SizeSelectorTest {
         p.setName(name);
         p.setValue("foo");
         try {
-            s.setParameters(new Parameter[] {p});
+            s.setParameters(p);
             fail("should have caused an exception");
         } catch (BuildException be) {
             assertEquals("foo is not a legal value for this attribute",
diff --git a/src/tests/junit/org/apache/tools/ant/types/selectors/TokenizedPatternTest.java b/src/tests/junit/org/apache/tools/ant/types/selectors/TokenizedPatternTest.java
index 4e95c2c32..f50dd7f35 100644
--- a/src/tests/junit/org/apache/tools/ant/types/selectors/TokenizedPatternTest.java
+++ b/src/tests/junit/org/apache/tools/ant/types/selectors/TokenizedPatternTest.java
@@ -62,12 +62,12 @@ public class TokenizedPatternTest {
                    .withoutLastToken().matchPath(p, true));
     }
 
-    @Test
     /**
      * this test illustrates the behavior described in bugzilla 59114
      * meaning that the pattern "**" matches the empty path
      * but the pattern "*" does not
      */
+    @Test
     public void testEmptyFolderWithStarStar() {
         TokenizedPath p = TokenizedPath.EMPTY_PATH;
         assertTrue(new TokenizedPattern(SelectorUtils.DEEP_TREE_MATCH).matchPath(p, true));
diff --git a/src/tests/junit/org/apache/tools/ant/util/ClasspathUtilsTest.java b/src/tests/junit/org/apache/tools/ant/util/ClasspathUtilsTest.java
index 3cffa100c..ce6486b7a 100644
--- a/src/tests/junit/org/apache/tools/ant/util/ClasspathUtilsTest.java
+++ b/src/tests/junit/org/apache/tools/ant/util/ClasspathUtilsTest.java
@@ -23,7 +23,6 @@ import java.util.Enumeration;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
-import org.apache.tools.ant.types.Path;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -48,8 +47,7 @@ public class ClasspathUtilsTest {
     @Test
     public void testOnlyOneInstance() {
         Enumeration enumeration;
-        String list = "";
-        ClassLoader c = ClasspathUtils.getUniqueClassLoaderForPath(p, (Path) null, false);
+        ClassLoader c = ClasspathUtils.getUniqueClassLoaderForPath(p, null, false);
         try {
             enumeration = c.getResources(
                 "org/apache/tools/ant/taskdefs/defaults.properties");
@@ -58,8 +56,9 @@ public class ClasspathUtilsTest {
                 "Could not get the defaults.properties resource", e);
         }
         int count = 0;
+        StringBuilder list = new StringBuilder();
         while (enumeration.hasMoreElements()) {
-            list = list + " " + enumeration.nextElement();
+            list.append(" ").append(enumeration.nextElement());
             count++;
         }
         assertTrue("Should be only one and not " + count + " " + list, count == 1);
diff --git a/src/tests/junit/org/apache/tools/ant/util/CollectionUtilsTest.java b/src/tests/junit/org/apache/tools/ant/util/CollectionUtilsTest.java
index 425dc4713..9a4d50b56 100644
--- a/src/tests/junit/org/apache/tools/ant/util/CollectionUtilsTest.java
+++ b/src/tests/junit/org/apache/tools/ant/util/CollectionUtilsTest.java
@@ -39,8 +39,8 @@ public class CollectionUtilsTest {
         assertTrue(!CollectionUtils.equals(null, new Vector()));
         assertTrue(!CollectionUtils.equals(new Vector(), null));
         assertTrue(CollectionUtils.equals(new Vector(), new Vector()));
-        Vector v1 = new Vector();
-        Stack s2 = new Stack();
+        Vector<String> v1 = new Vector<>();
+        Stack<String> s2 = new Stack<>();
         v1.addElement("foo");
         s2.push("foo");
         assertTrue(CollectionUtils.equals(v1, s2));
@@ -68,7 +68,7 @@ public class CollectionUtilsTest {
         assertTrue(!CollectionUtils.equals(null, new Hashtable()));
         assertTrue(!CollectionUtils.equals(new Hashtable(), null));
         assertTrue(CollectionUtils.equals(new Hashtable(), new Properties()));
-        Hashtable h1 = new Hashtable();
+        Hashtable<String, String> h1 = new Hashtable<>();
         Properties p2 = new Properties();
         h1.put("foo", "");
         p2.put("foo", "");
diff --git a/src/tests/junit/org/apache/tools/ant/util/LinkedHashtableTest.java b/src/tests/junit/org/apache/tools/ant/util/LinkedHashtableTest.java
index bfd2cda7d..6012a5a2d 100644
--- a/src/tests/junit/org/apache/tools/ant/util/LinkedHashtableTest.java
+++ b/src/tests/junit/org/apache/tools/ant/util/LinkedHashtableTest.java
@@ -36,7 +36,7 @@ public class LinkedHashtableTest {
     private static final Object K2 = new Object();
     private static final Object V1 = new Object();
     private static final Object V2 = new Object();
-    private Hashtable h = new LinkedHashtable();
+    private Hashtable<Object, Object> h = new LinkedHashtable<>();
 
     public void testClear() {
         h.put(K1, V1);
@@ -82,7 +82,7 @@ public class LinkedHashtableTest {
 
     @Test
     public void testPutAll() {
-        LinkedHashtable h2 = new LinkedHashtable();
+        LinkedHashtable<Object, Object> h2 = new LinkedHashtable<>();
         h.put(K1, V1);
         h2.putAll(h);
         assertTrue(h2.containsKey(K1));
diff --git a/src/tests/junit/org/apache/tools/ant/util/StringUtilsTest.java b/src/tests/junit/org/apache/tools/ant/util/StringUtilsTest.java
index 4c3220a8c..d3f64d8c1 100644
--- a/src/tests/junit/org/apache/tools/ant/util/StringUtilsTest.java
+++ b/src/tests/junit/org/apache/tools/ant/util/StringUtilsTest.java
@@ -96,7 +96,7 @@ public class StringUtilsTest {
 
     @Test
     public void testEndsWithEmptyBuffer() {
-        assertFalse(StringUtils.endsWith(new StringBuffer(""), "12345667"));
+        assertFalse(StringUtils.endsWith(new StringBuffer(), "12345667"));
     }
 
     @Test
diff --git a/src/tests/junit/org/apache/tools/ant/util/VectorSetTest.java b/src/tests/junit/org/apache/tools/ant/util/VectorSetTest.java
index 11491e3ac..b8ce4cdeb 100644
--- a/src/tests/junit/org/apache/tools/ant/util/VectorSetTest.java
+++ b/src/tests/junit/org/apache/tools/ant/util/VectorSetTest.java
@@ -32,7 +32,7 @@ import static org.junit.Assert.fail;
 public class VectorSetTest {
 
     private static final Object O = new Object();
-    private VectorSet v = new VectorSet();
+    private VectorSet<Object> v = new VectorSet<>();
 
     @Test
     public void testAdd() {
@@ -57,13 +57,13 @@ public class VectorSetTest {
 
     @Test
     public void testAddAll() {
-        assertTrue(v.addAll(Arrays.asList(new Object[] {O, O})));
+        assertTrue(v.addAll(Arrays.asList(O, O)));
         assertEquals(1, v.size());
     }
 
     @Test
     public void testAddAll2() {
-        assertTrue(v.addAll(0, Arrays.asList(new Object[] {O, O})));
+        assertTrue(v.addAll(0, Arrays.asList(O, O)));
         assertEquals(1, v.size());
     }
 
@@ -75,11 +75,12 @@ public class VectorSetTest {
     }
 
     @Test
+    @SuppressWarnings("unchecked")
     public void testClone() {
         v.add(O);
         Object o = v.clone();
         assertTrue(o instanceof VectorSet);
-        VectorSet vs = (VectorSet) o;
+        VectorSet<Object> vs = (VectorSet) o;
         assertEquals(1, vs.size());
         assertTrue(vs.contains(O));
     }
@@ -94,10 +95,10 @@ public class VectorSetTest {
 
     @Test
     public void testContainsAll() {
-        assertFalse(v.containsAll(Arrays.asList(new Object[] {O, O})));
+        assertFalse(v.containsAll(Arrays.asList(O, O)));
         v.add(O);
-        assertTrue(v.containsAll(Arrays.asList(new Object[] {O, O})));
-        assertFalse(v.containsAll(Arrays.asList(new Object[] {O, null})));
+        assertTrue(v.containsAll(Arrays.asList(O, O)));
+        assertFalse(v.containsAll(Arrays.asList(O, null)));
     }
 
     @Test
@@ -131,7 +132,7 @@ public class VectorSetTest {
 
     @Test
     public void testRemoveAtEndWhenSizeEqualsCapacity() {
-        v = new VectorSet(3, 1);
+        v = new VectorSet<>(3, 1);
         Object a = new Object();
         v.add(a);
         Object b = new Object();
@@ -148,7 +149,7 @@ public class VectorSetTest {
 
     @Test
     public void testRemoveAtFrontWhenSizeEqualsCapacity() {
-        v = new VectorSet(3, 1);
+        v = new VectorSet<>(3, 1);
         v.add(O);
         Object a = new Object();
         v.add(a);
@@ -165,7 +166,7 @@ public class VectorSetTest {
 
     @Test
     public void testRemoveInMiddleWhenSizeEqualsCapacity() {
-        v = new VectorSet(3, 1);
+        v = new VectorSet<>(3, 1);
         Object a = new Object();
         v.add(a);
         v.add(O);
@@ -183,9 +184,9 @@ public class VectorSetTest {
     @Test
     public void testRemoveAll() {
         v.add(O);
-        assertTrue(v.removeAll(Arrays.asList(new Object[] {O, O})));
+        assertTrue(v.removeAll(Arrays.asList(O, O)));
         assertEquals(0, v.size());
-        assertFalse(v.removeAll(Arrays.asList(new Object[] {O, O})));
+        assertFalse(v.removeAll(Arrays.asList(O, O)));
     }
 
     @Test
@@ -222,7 +223,7 @@ public class VectorSetTest {
         Object a = new Object();
         Object b = new Object();
         Object c = new Object();
-        v.addAll(Arrays.asList(new Object[] {O, a, b, c}));
+        v.addAll(Arrays.asList(O, a, b, c));
         v.removeRange(1, 3);
         assertEquals(2, v.size());
         assertTrue(v.contains(O));
@@ -234,9 +235,9 @@ public class VectorSetTest {
         Object a = new Object();
         Object b = new Object();
         Object c = new Object();
-        v.addAll(Arrays.asList(new Object[] {O, a, b, c}));
+        v.addAll(Arrays.asList(O, a, b, c));
         assertEquals(0, v.indexOf(O));
-        assertTrue(v.retainAll(Arrays.asList(new Object[] {c, O})));
+        assertTrue(v.retainAll(Arrays.asList(c, O)));
         assertEquals(2, v.size());
         assertTrue(v.contains(O));
         assertTrue(v.contains(c));
diff --git a/src/tests/junit/org/apache/tools/ant/util/XMLFragmentTest.java b/src/tests/junit/org/apache/tools/ant/util/XMLFragmentTest.java
index 0ac938f04..74467851e 100644
--- a/src/tests/junit/org/apache/tools/ant/util/XMLFragmentTest.java
+++ b/src/tests/junit/org/apache/tools/ant/util/XMLFragmentTest.java
@@ -42,7 +42,7 @@ public class XMLFragmentTest {
 
     @Test
     public void testNestedText() {
-        XMLFragment x = (XMLFragment) buildRule.getProject().getReference("nested-text");
+        XMLFragment x = buildRule.getProject().getReference("nested-text");
         assertNotNull(x);
         Node n = x.getFragment();
         assertTrue("No attributes", !n.hasAttributes());
@@ -55,7 +55,7 @@ public class XMLFragmentTest {
     @Test
     public void testNestedChildren() {
         XMLFragment x =
-            (XMLFragment) buildRule.getProject().getReference("with-children");
+                buildRule.getProject().getReference("with-children");
         assertNotNull(x);
         Node n = x.getFragment();
         assertTrue("No attributes", !n.hasAttributes());
diff --git a/src/tests/junit/org/apache/tools/ant/util/regexp/RegexpMatcherTest.java b/src/tests/junit/org/apache/tools/ant/util/regexp/RegexpMatcherTest.java
index 5edaf571c..7f4d15241 100644
--- a/src/tests/junit/org/apache/tools/ant/util/regexp/RegexpMatcherTest.java
+++ b/src/tests/junit/org/apache/tools/ant/util/regexp/RegexpMatcherTest.java
@@ -81,22 +81,22 @@ public abstract class RegexpMatcherTest {
         Vector v = reg.getGroups("xaaaa");
         assertEquals("No parens -> no extra groups", 1, v.size());
         assertEquals("Trivial match with no parens", "aaaa",
-                     (String) v.elementAt(0));
+                v.elementAt(0));
 
         reg.setPattern("(aaaa)");
         v = reg.getGroups("xaaaa");
         assertEquals("Trivial match with single paren", 2, v.size());
         assertEquals("Trivial match with single paren, full match", "aaaa",
-                     (String) v.elementAt(0));
+                v.elementAt(0));
         assertEquals("Trivial match with single paren, matched paren", "aaaa",
-                     (String) v.elementAt(0));
+                v.elementAt(0));
 
         reg.setPattern("(a+)b(b+)");
         v = reg.getGroups("xaabb");
         assertEquals(3, v.size());
-        assertEquals("aabb", (String) v.elementAt(0));
-        assertEquals("aa", (String) v.elementAt(1));
-        assertEquals("b", (String) v.elementAt(2));
+        assertEquals("aabb", v.elementAt(0));
+        assertEquals("aa", v.elementAt(1));
+        assertEquals("b", v.elementAt(2));
     }
 
     @Test
@@ -134,7 +134,7 @@ public abstract class RegexpMatcherTest {
     }
 
     @Test
-    public void testNextLineCharacter() throws IOException {
+    public void testNextLineCharacter() {
         reg.setPattern("end of text$");
         assertTrue("next-line character", !reg.matches("end of text\u0085"));
     }
@@ -164,13 +164,11 @@ public abstract class RegexpMatcherTest {
     }
 
     @Test
-    public void testMultiVersusSingleLine() throws IOException {
-        StringBuilder buf = new StringBuilder();
-        buf.append("Line1").append(UNIX_LINE);
-        buf.append("starttest Line2").append(UNIX_LINE);
-        buf.append("Line3 endtest").append(UNIX_LINE);
-        buf.append("Line4").append(UNIX_LINE);
-        String text = buf.toString();
+    public void testMultiVersusSingleLine() {
+        String text = "Line1" + UNIX_LINE +
+                "starttest Line2" + UNIX_LINE +
+                "Line3 endtest" + UNIX_LINE +
+                "Line4" + UNIX_LINE;
 
         doStartTest1(text);
         doStartTest2(text);
diff --git a/src/tests/junit/org/apache/tools/mail/MailMessageTest.java b/src/tests/junit/org/apache/tools/mail/MailMessageTest.java
index f61e6b4e8..b7aa0a7d3 100644
--- a/src/tests/junit/org/apache/tools/mail/MailMessageTest.java
+++ b/src/tests/junit/org/apache/tools/mail/MailMessageTest.java
@@ -565,10 +565,10 @@ public class MailMessageTest {
         protected String subject = null;
         protected String message = null;
 
-        protected Vector replyToList = new Vector();
-        protected Vector toList = new Vector();
-        protected Vector ccList = new Vector();
-        protected Vector bccList = new Vector();
+        protected Vector<String> replyToList = new Vector<>();
+        protected Vector<String> toList = new Vector<>();
+        protected Vector<String> ccList = new Vector<>();
+        protected Vector<String> bccList = new Vector<>();
 
         ClientThread(int port) {
             this.port = port;
diff --git a/src/tests/junit/org/apache/tools/zip/ZipLongTest.java b/src/tests/junit/org/apache/tools/zip/ZipLongTest.java
index 65ee5052a..69338407a 100644
--- a/src/tests/junit/org/apache/tools/zip/ZipLongTest.java
+++ b/src/tests/junit/org/apache/tools/zip/ZipLongTest.java
@@ -71,7 +71,7 @@ public class ZipLongTest {
         assertTrue("symmetric", zl2.equals(zl));
 
         assertTrue("null handling", !zl.equals(null));
-        assertTrue("non ZipLong handling", !zl.equals(Integer.valueOf(0x1234)));
+        assertTrue("non ZipLong handling", !zl.equals(0x1234));
     }
 
     /**
diff --git a/src/tests/junit/org/apache/tools/zip/ZipShortTest.java b/src/tests/junit/org/apache/tools/zip/ZipShortTest.java
index 7efca58fb..5938db31f 100644
--- a/src/tests/junit/org/apache/tools/zip/ZipShortTest.java
+++ b/src/tests/junit/org/apache/tools/zip/ZipShortTest.java
@@ -68,7 +68,7 @@ public class ZipShortTest {
         assertTrue("symmetric", zs2.equals(zs));
 
         assertTrue("null handling", !zs.equals(null));
-        assertTrue("non ZipShort handling", !zs.equals(Integer.valueOf(0x1234)));
+        assertTrue("non ZipShort handling", !zs.equals(0x1234));
     }
 
     /**