Use diamonds

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

@@ -225,7 +225,7 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener, Clo
 
     /** Static map of jar file/time to manifest class-path entries */
     private static Map<String, String> pathMap =
-        Collections.synchronizedMap(new HashMap<String, String>());
+        Collections.synchronizedMap(new HashMap<>());
 
     /**
      * The context loader saved when setting the thread's current
@@ -1410,7 +1410,7 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener, Clo
         for (final Enumeration<JarFile> e = jarFiles.elements(); e.hasMoreElements();) {
             FileUtils.close(e.nextElement());
         }
-        jarFiles = new Hashtable<File, JarFile>();
+        jarFiles = new Hashtable<>();
         if (project != null) {
             project.removeBuildListener(this);
         }

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

@@ -56,7 +56,7 @@ public class ArgumentProcessorRegistry {
 
     private static ArgumentProcessorRegistry instance = new ArgumentProcessorRegistry();
 
-    private List<ArgumentProcessor> processors = new ArrayList<ArgumentProcessor>();
+    private List<ArgumentProcessor> processors = new ArrayList<>();
 
     public static ArgumentProcessorRegistry getInstance() {
         return instance;

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

@@ -685,7 +685,7 @@ public class ComponentHelper  {
         synchronized (restrictedDefinitions) {
             list = restrictedDefinitions.get(name);
             if (list == null) {
-                list = new ArrayList<AntTypeDefinition>();
+                list = new ArrayList<>();
                 restrictedDefinitions.put(name, list);
             }
         }
@@ -1086,7 +1086,7 @@ public class ComponentHelper  {
      * @return the (possibly empty) list of definitions
      */
     private List<AntTypeDefinition> findTypeMatches(String prefix) {
-        final List<AntTypeDefinition> result = new ArrayList<AntTypeDefinition>();
+        final List<AntTypeDefinition> result = new ArrayList<>();
         synchronized (antTypeTable) {
             for (AntTypeDefinition def : antTypeTable.values()) {
                 if (def.getName().startsWith(prefix)) {

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

@@ -1193,7 +1193,7 @@ public class DirectoryScanner
                     dir.getAbsolutePath());
             }
         }
-        scandir(dir, path, fast, newfiles, new LinkedList<String>());
+        scandir(dir, path, fast, newfiles, new LinkedList<>());
     }
 
     private void scandir(final File dir, final TokenizedPath path, final boolean fast,

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

@@ -68,7 +68,7 @@ public class Main implements AntMain {
      * not be seen by Main.
      */
     private static final Set<String> LAUNCH_COMMANDS = Collections
-            .unmodifiableSet(new HashSet<String>(Arrays.asList("-lib", "-cp", "-noclasspath",
+            .unmodifiableSet(new HashSet<>(Arrays.asList("-lib", "-cp", "-noclasspath",
                     "--noclasspath", "-nouserlib", "-main")));
 
     /** The default build file name. {@value} */
@@ -408,7 +408,7 @@ public class Main implements AntMain {
                     if (newI != -1) {
                         List<String> extraArgs = extraArguments.get(processor.getClass());
                         if (extraArgs == null) {
-                            extraArgs = new ArrayList<String>();
+                            extraArgs = new ArrayList<>();
                             extraArguments.put(processor.getClass(), extraArgs);
                         }
                         for (; i < newI && i < args.length; i++) {

src/main/org/apache/tools/ant/filters/LineContains.java

@@ -56,7 +56,7 @@ public final class LineContains
     private static final String NEGATE_KEY = "negate";
 
     /** Vector that holds the strings that input lines must contain. */
-    private Vector<String> contains = new Vector<String>();
+    private Vector<String> contains = new Vector<>();
 
     /**
      * Remaining line to be read from this filter, or <code>null</code> if

src/main/org/apache/tools/ant/filters/LineContainsRegExp.java

@@ -58,7 +58,7 @@ public final class LineContainsRegExp
     private static final String CS_KEY = "casesensitive";
 
     /** Vector that holds the expressions that input lines must contain. */
-    private Vector<RegularExpression> regexps = new Vector<RegularExpression>();
+    private Vector<RegularExpression> regexps = new Vector<>();
 
     /**
      * Remaining line to be read from this filter, or <code>null</code> if

src/main/org/apache/tools/ant/filters/ReplaceTokens.java

@@ -62,10 +62,10 @@ public final class ReplaceTokens
     private static final String DEFAULT_END_TOKEN = "@";
 
     /** Hashtable to holds the original replacee-replacer pairs (String to String). */
-    private Hashtable<String, String> hash = new Hashtable<String, String>();
+    private Hashtable<String, String> hash = new Hashtable<>();
 
     /** This map holds the "resolved" tokens (begin- and end-tokens are added to make searching simpler) */
-    private final TreeMap<String, String> resolvedTokens = new TreeMap<String, String>();
+    private final TreeMap<String, String> resolvedTokens = new TreeMap<>();
     private boolean resolvedTokensBuilt = false;
     /** Used for comparisons and lookup into the resolvedTokens map. */
     private String readBuffer = "";

src/main/org/apache/tools/ant/filters/SortFilter.java

@@ -213,7 +213,7 @@ public final class SortFilter extends BaseParamFilterReader
         } else {
             if (lines == null) {
                 // We read all lines and sort them
-                lines = new ArrayList<String>();
+                lines = new ArrayList<>();
                 for (line = readLine(); line != null; line = readLine()) {
                     lines.add(line);
                 }

src/main/org/apache/tools/ant/filters/StripLineComments.java

@@ -55,7 +55,7 @@ public final class StripLineComments
     private static final String COMMENTS_KEY = "comment";
 
     /** Vector that holds the comment prefixes. */
-    private Vector<String> comments = new Vector<String>();
+    private Vector<String> comments = new Vector<>();
 
     /** The line that has been read ahead. */
     private String line = null;

src/main/org/apache/tools/ant/filters/TailFilter.java

@@ -66,7 +66,7 @@ public final class TailFilter extends BaseParamFilterReader
     /** the position in the current line */
     private int       linePos   = 0;
 
-    private LinkedList<String> lineList = new LinkedList<String>();
+    private LinkedList<String> lineList = new LinkedList<>();
 
     /**
      * Constructor for "dummy" instances.

src/main/org/apache/tools/ant/filters/TokenFilter.java

@@ -59,15 +59,15 @@ public class TokenFilter extends BaseFilterReader
 
 
     /** string filters */
-    private Vector<Filter>    filters   = new Vector<Filter>();
+    private Vector<Filter> filters = new Vector<>();
     /** the tokenizer to use on the input stream */
     private Tokenizer tokenizer = null;
     /** the output token termination */
-    private String    delimOutput = null;
+    private String delimOutput = null;
     /** the current string token from the input stream */
-    private String    line      = null;
+    private String line    = null;
     /** the position in the current string token */
-    private int       linePos   = 0;
+    private int    linePos = 0;
 
     /**
      * Constructor for "dummy" instances.
@@ -121,9 +121,9 @@ public class TokenFilter extends BaseFilterReader
             if (line != null) {
                 if (tokenizer.getPostToken().length() != 0) {
                     if (delimOutput != null) {
-                        line = line + delimOutput;
+                        line += delimOutput;
                     } else {
-                        line = line + tokenizer.getPostToken();
+                        line += tokenizer.getPostToken();
                     }
                 }
             }

src/main/org/apache/tools/ant/helper/AntXMLContext.java

@@ -53,7 +53,7 @@ public class AntXMLContext {
      * defined. Project maintains a Hashtable, which is not ordered.
      * This will allow description to know the original order.
      */
-    private Vector<Target> targetVector = new Vector<Target>();
+    private Vector<Target> targetVector = new Vector<>();
 
     /**
      * Parent directory of the build file. Used for resolving entities
@@ -100,7 +100,7 @@ public class AntXMLContext {
     private boolean ignoreProjectTag = false;
 
     /** Keeps track of prefix -> uri mapping during parsing */
-    private Map<String, List<String>> prefixMapping = new HashMap<String, List<String>>();
+    private Map<String, List<String>> prefixMapping = new HashMap<>();
 
 
     /** Keeps track of targets in files */
@@ -364,7 +364,7 @@ public class AntXMLContext {
     public void startPrefixMapping(String prefix, String uri) {
         List<String> list = prefixMapping.get(prefix);
         if (list == null) {
-            list = new ArrayList<String>();
+            list = new ArrayList<>();
             prefixMapping.put(prefix, list);
         }
         list.add(uri);

src/main/org/apache/tools/ant/helper/ProjectHelper2.java

@@ -166,7 +166,7 @@ public class ProjectHelper2 extends ProjectHelper {
                 newCurrent.setProject(project);
                 newCurrent.setName("");
                 context.setCurrentTarget(newCurrent);
-                context.setCurrentTargets(new HashMap<String, Target>());
+                context.setCurrentTargets(new HashMap<>());
                 context.setImplicitTarget(newCurrent);
                 parse(project, source, new RootHandler(context, mainHandler));
                 newCurrent.execute();
@@ -177,7 +177,7 @@ public class ProjectHelper2 extends ProjectHelper {
             }
         } else {
             // top level file
-            context.setCurrentTargets(new HashMap<String, Target>());
+            context.setCurrentTargets(new HashMap<>());
             parse(project, source, new RootHandler(context, mainHandler));
             // Execute the top-level target
             context.getImplicitTarget().execute();
@@ -490,7 +490,7 @@ public class ProjectHelper2 extends ProjectHelper {
      * with the implicit execution stack)
      */
     public static class RootHandler extends DefaultHandler {
-        private Stack<AntHandler> antHandlers = new Stack<AntHandler>();
+        private Stack<AntHandler> antHandlers = new Stack<>();
         private AntHandler currentHandler = null;
         private AntXMLContext context;
 

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

@@ -17,7 +17,6 @@
  */
 package org.apache.tools.ant.listener;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintStream;
@@ -36,7 +35,6 @@ import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DefaultLogger;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.email.EmailAddress;
-import org.apache.tools.ant.taskdefs.email.Header;
 import org.apache.tools.ant.taskdefs.email.Mailer;
 import org.apache.tools.ant.taskdefs.email.Message;
 import org.apache.tools.ant.util.ClasspathUtils;
@@ -425,9 +423,9 @@ public class MailLogger extends DefaultLogger {
         mailer.setCcList(toCcList);
         Vector<EmailAddress> toBccList = splitEmailAddresses(values.toBccList());
         mailer.setBccList(toBccList);
-        mailer.setFiles(new Vector<File>());
+        mailer.setFiles(new Vector<>());
         mailer.setSubject(values.subject());
-        mailer.setHeaders(new Vector<Header>());
+        mailer.setHeaders(new Vector<>());
         mailer.send();
     }
 

src/main/org/apache/tools/ant/property/LocalPropertyStack.java

@@ -57,7 +57,7 @@ public class LocalPropertyStack {
      */
     public void enterScope() {
         synchronized (LOCK) {
-            stack.addFirst(new ConcurrentHashMap<String, Object>());
+            stack.addFirst(new ConcurrentHashMap<>());
         }
     }
 

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

@@ -107,8 +107,8 @@ public class AntStructure extends Task {
             }
 
             printer.printHead(out, getProject(),
-                              new Hashtable<String, Class<?>>(getProject().getTaskDefinitions()),
-                              new Hashtable<String, Class<?>>(getProject().getDataTypeDefinitions()));
+                    new Hashtable<>(getProject().getTaskDefinitions()),
+                    new Hashtable<>(getProject().getDataTypeDefinitions()));
 
             printer.printTargetDecl(out);
 
@@ -190,7 +190,7 @@ public class AntStructure extends Task {
         private static final String TASKS = "%tasks;";
         private static final String TYPES = "%types;";
 
-        private final Hashtable<String, String> visited = new Hashtable<String, String>();
+        private final Hashtable<String, String> visited = new Hashtable<>();
 
         @Override
         public void printTail(final PrintWriter out) {

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

@@ -33,7 +33,7 @@ public class BindTargets extends Task {
 
     private String extensionPoint;
 
-    private final List<String> targets = new ArrayList<String>();
+    private final List<String> targets = new ArrayList<>();
 
     private OnMissingExtensionPoint onMissingExtensionPoint;
 

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

@@ -658,7 +658,7 @@ public class Checksum extends MatchingTask implements Condition {
      * @since 1.7
      */
     public static class FormatElement extends EnumeratedAttribute {
-        private static HashMap<String, MessageFormat> formatMap = new HashMap<String, MessageFormat>();
+        private static HashMap<String, MessageFormat> formatMap = new HashMap<>();
         private static final String CHECKSUM = "CHECKSUM";
         private static final String MD5SUM = "MD5SUM";
         private static final String SVF = "SVF";

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

@@ -391,7 +391,7 @@ public class Concat extends Task implements ResourceCollection {
                 return result;
             }
             Reader resourceReader = getFilteredReader(
-                    new MultiReader<Resource>(c.iterator(), resourceReaderFactory));
+                    new MultiReader<>(c.iterator(), resourceReaderFactory));
             Reader rdr;
             if (header == null && footer == null) {
                 rdr = resourceReader;
@@ -419,7 +419,7 @@ public class Concat extends Task implements ResourceCollection {
                         readers[pos] = getFilteredReader(readers[pos]);
                     }
                 }
-                rdr = new MultiReader<Reader>(Arrays.asList(readers).iterator(),
+                rdr = new MultiReader<>(Arrays.asList(readers).iterator(),
                         identityReaderFactory);
             }
             return outputEncoding == null ? new ReaderInputStream(rdr)
@@ -698,7 +698,7 @@ public class Concat extends Task implements ResourceCollection {
      */
     public void addFilterChain(FilterChain filterChain) {
         if (filterChains == null) {
-            filterChains = new Vector<FilterChain>();
+            filterChains = new Vector<>();
         }
         filterChains.addElement(filterChain);
     }

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

@@ -773,7 +773,7 @@ public class Copy extends Task {
                             final FileNameMapper mapper, final Hashtable<String, String[]> map) {
         String[] toCopy = null;
         if (forceOverwrite) {
-            final Vector<String> v = new Vector<String>();
+            final Vector<String> v = new Vector<>();
             for (String name : names) {
                 if (mapper.mapFileName(name) != null) {
                     v.addElement(name);

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

@@ -601,7 +601,7 @@ public class Jar extends Zip {
         // header newline
         writer.println(zipFile.getName());
 
-        writeIndexLikeList(new ArrayList<String>(addedDirs.keySet()),
+        writeIndexLikeList(new ArrayList<>(addedDirs.keySet()),
                            rootEntries, writer);
         writer.println();
 
@@ -622,8 +622,8 @@ public class Jar extends Zip {
             for (String indexJarEntry : indexJars.list()) {
                 String name = findJarName(indexJarEntry, cpEntries);
                 if (name != null) {
-                    ArrayList<String> dirs = new ArrayList<String>();
-                    ArrayList<String> files = new ArrayList<String>();
+                    ArrayList<String> dirs = new ArrayList<>();
+                    ArrayList<String> files = new ArrayList<>();
                     grabFilesAndDirs(indexJarEntry, dirs, files);
                     if (dirs.size() + files.size() > 0) {
                         writer.println(name);

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

@@ -1512,7 +1512,7 @@ public class Javac extends MatchingTask {
     private static Map<String,Collection<File>> resolveModuleSourcePathElement(
             final File projectDir,
             final String element) {
-        final Map<String,Collection<File>> result = new TreeMap<String, Collection<File>>();
+        final Map<String,Collection<File>> result = new TreeMap<>();
         for (CharSequence resolvedElement : expandGroups(element)) {
             findModules(projectDir, resolvedElement.toString(), result);
         }

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

@@ -48,7 +48,7 @@ public class KeySubst extends Task {
     private File source = null;
     private File dest = null;
     private String sep = "*";
-    private Hashtable<String, String> replacements = new Hashtable<String, String>();
+    private Hashtable<String, String> replacements = new Hashtable<>();
 
     /**
      * Do the execution.
@@ -150,7 +150,7 @@ public class KeySubst extends Task {
      */
     public static void main(String[] args) {
         try {
-            Hashtable<String, String> hash = new Hashtable<String, String>();
+            Hashtable<String, String> hash = new Hashtable<>();
             hash.put("VERSION", "1.0.3");
             hash.put("b", "ffff");
             System.out.println(KeySubst.replace("$f ${VERSION} f ${b} jj $",

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

@@ -131,7 +131,7 @@ public class Manifest {
         private String name = null;
 
         /** The attribute's value */
-        private Vector<String> values = new Vector<String>();
+        private Vector<String> values = new Vector<>();
 
         /**
          * For multivalued attributes, this is the index of the attribute

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

@@ -1147,7 +1147,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
         public static final Map<ParamType, QName> XPATH_TYPES;
 
         static {
-            final Map<ParamType, QName> m = new EnumMap<ParamType, QName>(ParamType.class);
+            final Map<ParamType, QName> m = new EnumMap<>(ParamType.class);
             m.put(XPATH_STRING, XPathConstants.STRING);
             m.put(XPATH_BOOLEAN, XPathConstants.BOOLEAN);
             m.put(XPATH_NUMBER, XPathConstants.NUMBER);

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

@@ -124,13 +124,13 @@ public class TraXLiaison implements XSLTLiaison4, ErrorListener, XSLTLoggerAware
     private final Vector<String[]> outputProperties = new Vector<>();
 
     /** stylesheet parameters */
-    private final Hashtable<String, Object> params = new Hashtable<String, Object>();
+    private final Hashtable<String, Object> params = new Hashtable<>();
 
     /** factory attributes */
-    private final List<Object[]> attributes = new ArrayList<Object[]>();
+    private final List<Object[]> attributes = new ArrayList<>();
 
     /** factory features */
-    private final Map<String, Boolean> features = new HashMap<String, Boolean>();
+    private final Map<String, Boolean> features = new HashMap<>();
 
     /** whether to suppress warnings */
     private boolean suppressWarnings = false;

src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java

@@ -37,13 +37,13 @@ import java.util.stream.IntStream;
 public class ConstantPool {
 
     /** The entries in the constant pool. */
-    private final List<ConstantPoolEntry> entries = new ArrayList<ConstantPoolEntry>();
+    private final List<ConstantPoolEntry> entries = new ArrayList<>();
 
     /**
      * A Hashtable of UTF8 entries - used to get constant pool indexes of
      * the UTF8 values quickly
      */
-    private final Map<String, Integer> utf8Indexes = new HashMap<String, Integer>();
+    private final Map<String, Integer> utf8Indexes = new HashMap<>();
 
     /** Initialise the constant pool. */
     public ConstantPool() {

src/main/org/apache/tools/ant/types/ArchiveScanner.java

@@ -61,22 +61,22 @@ public abstract class ArchiveScanner extends DirectoryScanner {
     /**
      * record list of all file zip entries
      */
-    private Map<String, Resource> fileEntries = new TreeMap<String, Resource>();
+    private Map<String, Resource> fileEntries = new TreeMap<>();
 
     /**
      * record list of all directory zip entries
      */
-    private Map<String, Resource> dirEntries = new TreeMap<String, Resource>();
+    private Map<String, Resource> dirEntries = new TreeMap<>();
 
     /**
      * record list of matching file zip entries
      */
-    private Map<String, Resource> matchFileEntries = new TreeMap<String, Resource>();
+    private Map<String, Resource> matchFileEntries = new TreeMap<>();
 
     /**
      * record list of matching directory zip entries
      */
-    private Map<String, Resource> matchDirEntries = new TreeMap<String, Resource>();
+    private Map<String, Resource> matchDirEntries = new TreeMap<>();
 
     /**
      * encoding of file names.

src/main/org/apache/tools/ant/types/Assertions.java

@@ -75,7 +75,7 @@ public class Assertions extends DataType implements Cloneable {
     /**
      * list of type BaseAssertion
      */
-    private ArrayList<BaseAssertion> assertionList = new ArrayList<BaseAssertion>();
+    private ArrayList<BaseAssertion> assertionList = new ArrayList<>();
 
 
     /**

src/main/org/apache/tools/ant/types/Commandline.java

@@ -59,7 +59,7 @@ public class Commandline implements Cloneable {
     /**
      * The arguments of the command
      */
-    private List<Argument> arguments = new ArrayList<Argument>();
+    private List<Argument> arguments = new ArrayList<>();
 
     /**
      * the program to execute
@@ -363,7 +363,7 @@ public class Commandline implements Cloneable {
      * @return the commandline as an array of strings.
      */
     public String[] getCommandline() {
-        final List<String> commands = new LinkedList<String>();
+        final List<String> commands = new LinkedList<>();
         addCommandToList(commands.listIterator());
         return commands.toArray(new String[commands.size()]);
     }

src/main/org/apache/tools/ant/types/DataType.java

@@ -114,7 +114,7 @@ public abstract class DataType extends ProjectComponent implements Cloneable {
         if (checked || !isReference()) {
             return;
         }
-        dieOnCircularReference(new IdentityStack<Object>(this), p);
+        dieOnCircularReference(new IdentityStack<>(this), p);
     }
 
     /**

src/main/org/apache/tools/ant/types/FilterChain.java

@@ -46,7 +46,7 @@ import org.apache.tools.ant.filters.TokenFilter;
  */
 public class FilterChain extends DataType {
 
-    private Vector<Object> filterReaders = new Vector<Object>();
+    private Vector<Object> filterReaders = new Vector<>();
 
     /**
      * Add an AntFilterReader filter.

src/main/org/apache/tools/ant/types/XMLCatalog.java

@@ -124,7 +124,7 @@ public class XMLCatalog extends DataType
     //-- Fields ----------------------------------------------------------------
 
     /** Holds dtd/entity objects until needed. */
-    private Vector<ResourceLocation> elements = new Vector<ResourceLocation>();
+    private Vector<ResourceLocation> elements = new Vector<>();
 
     /**
      * Classpath in which to attempt to resolve resources.

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

@@ -398,7 +398,7 @@ public class Files extends AbstractSelectorContainer
         }
         Files f = (Files) super.clone();
         f.defaultPatterns = (PatternSet) defaultPatterns.clone();
-        f.additionalPatterns = new Vector<PatternSet>(additionalPatterns.size());
+        f.additionalPatterns = new Vector<>(additionalPatterns.size());
         for (PatternSet ps : additionalPatterns) {
             f.additionalPatterns.add((PatternSet) ps.clone());
         }

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

@@ -40,7 +40,7 @@ public class MultiRootFileSet extends AbstractFileSet
 
     private SetType type = SetType.file;
     private boolean cache = true;
-    private List<File> baseDirs = new ArrayList<File>();
+    private List<File> baseDirs = new ArrayList<>();
     private Union union;
 
     @Override

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

@@ -463,7 +463,7 @@ public final class JavaEnvUtils {
      */
 
     private static void buildJrePackages() {
-        jrePackages = new Vector<String>();
+        jrePackages = new Vector<>();
         if (isAtLeastJavaVersion(JAVA_1_1)) {
             //things like sun.reflection, sun.misc, sun.net
             jrePackages.addElement("sun");

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

@@ -65,7 +65,7 @@ public final class StringUtils {
      * @return the list of elements.
      */
     public static Vector<String> split(String data, int ch) {
-        Vector<String> elems = new Vector<String>();
+        Vector<String> elems = new Vector<>();
         int pos = -1;
         int i = 0;
         while ((pos = data.indexOf(ch, i)) != -1) {

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

@@ -40,7 +40,7 @@ import java.util.Vector;
 public final class VectorSet<E> extends Vector<E> {
     private static final long serialVersionUID = 1L;
 
-    private final HashSet<E> set = new HashSet<E>();
+    private final HashSet<E> set = new HashSet<>();
 
     public VectorSet() {
         super();

src/main/org/apache/tools/tar/TarInputStream.java

@@ -419,7 +419,7 @@ public class TarInputStream extends FilterInputStream {
     }
 
     Map<String, String> parsePaxHeaders(InputStream i) throws IOException {
-        Map<String, String> headers = new HashMap<String, String>();
+        Map<String, String> headers = new HashMap<>();
         // Format is "length keyword=value\n";
         while (true) { // get length
             int ch;

src/main/org/apache/tools/tar/TarOutputStream.java

@@ -282,7 +282,7 @@ public class TarOutputStream extends FilterOutputStream {
         if (finished) {
             throw new IOException("Stream has already been finished");
         }
-        Map<String, String> paxHeaders = new HashMap<String, String>();
+        Map<String, String> paxHeaders = new HashMap<>();
         final String entryName = entry.getName();
         boolean paxHeaderContainsPath = handleLongName(entry, entryName, paxHeaders, "path",
                                                        TarConstants.LF_GNUTYPE_LONGNAME, "file name");

src/main/org/apache/tools/zip/ExtraFieldUtils.java

@@ -41,7 +41,7 @@ public class ExtraFieldUtils {
     private static final Map<ZipShort, Class<?>> implementations;
 
     static {
-        implementations = new ConcurrentHashMap<ZipShort, Class<?>>();
+        implementations = new ConcurrentHashMap<>();
         register(AsiExtraField.class);
         register(JarMarker.class);
         register(UnicodePathExtraField.class);
@@ -133,7 +133,7 @@ public class ExtraFieldUtils {
     public static ZipExtraField[] parse(byte[] data, boolean local,
                                         UnparseableExtraField onUnparseableData)
         throws ZipException {
-        List<ZipExtraField> v = new ArrayList<ZipExtraField>();
+        List<ZipExtraField> v = new ArrayList<>();
         int start = 0;
         LOOP:
         while (start <= data.length - WORD) {

src/main/org/apache/tools/zip/Simple8BitZipEncoding.java

@@ -103,7 +103,7 @@ class Simple8BitZipEncoding implements ZipEncoding {
     public Simple8BitZipEncoding(final char[] highChars) {
         this.highChars = highChars.clone();
         final List<Simple8BitChar> temp =
-            new ArrayList<Simple8BitChar>(this.highChars.length);
+                new ArrayList<>(this.highChars.length);
 
         byte code = 127;
 

src/main/org/apache/tools/zip/ZipEncodingHelper.java

@@ -66,8 +66,7 @@ public abstract class ZipEncodingHelper {
     private static final Map<String, SimpleEncodingHolder> simpleEncodings;
 
     static {
-        final Map<String, SimpleEncodingHolder> se =
-            new HashMap<String, SimpleEncodingHolder>();
+        final Map<String, SimpleEncodingHolder> se = new HashMap<>();
 
         final char[] cp437_high_chars =
             new char[] {0x00c7, 0x00fc, 0x00e9, 0x00e2, 0x00e4, 0x00e0,

src/main/org/apache/tools/zip/ZipEntry.java

@@ -307,7 +307,7 @@ public class ZipEntry extends java.util.zip.ZipEntry implements Cloneable {
      * @since 1.1
      */
     public void setExtraFields(final ZipExtraField[] fields) {
-        List<ZipExtraField> newFields = new ArrayList<ZipExtraField>();
+        List<ZipExtraField> newFields = new ArrayList<>();
         for (ZipExtraField field : fields) {
             if (field instanceof UnparseableExtraFieldData) {
                 unparseableExtra = (UnparseableExtraFieldData) field;
@@ -457,7 +457,7 @@ public class ZipEntry extends java.util.zip.ZipEntry implements Cloneable {
         if (extraFields == null) {
             throw new java.util.NoSuchElementException();
         }
-        List<ZipExtraField> newResult = new ArrayList<ZipExtraField>();
+        List<ZipExtraField> newResult = new ArrayList<>();
         for (ZipExtraField extraField : extraFields) {
             if (!type.equals(extraField.getHeaderId())) {
                 newResult.add(extraField);

src/main/org/apache/tools/zip/ZipOutputStream.java

@@ -196,7 +196,7 @@ public class ZipOutputStream extends FilterOutputStream {
      *
      * @since 1.1
      */
-    private final List<ZipEntry> entries = new LinkedList<ZipEntry>();
+    private final List<ZipEntry> entries = new LinkedList<>();
 
     /**
      * CRC instance to avoid parsing DEFLATED data twice.
@@ -247,7 +247,7 @@ public class ZipOutputStream extends FilterOutputStream {
      *
      * @since 1.1
      */
-    private final Map<ZipEntry, Long> offsets = new HashMap<ZipEntry, Long>();
+    private final Map<ZipEntry, Long> offsets = new HashMap<>();
 
     /**
      * The encoding to use for filenames and the file comment.

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

@@ -480,11 +480,11 @@ public class DirectoryScannerTest {
         assertEquals("directories present: ", expectedDirectories.length,
                      includedDirectories.length);
 
-        TreeSet<String> files = new TreeSet<String>();
+        TreeSet<String> files = new TreeSet<>();
         for (String includedFile : includedFiles) {
             files.add(includedFile.replace(File.separatorChar, '/'));
         }
-        TreeSet<String> directories = new TreeSet<String>();
+        TreeSet<String> directories = new TreeSet<>();
         for (String includedDirectory : includedDirectories) {
             directories.add(includedDirectory.replace(File.separatorChar, '/'));
         }

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

@@ -39,7 +39,7 @@ public class ExecutorTest implements BuildListener  {
 
     private static final Vector<String> TARGET_NAMES;
     static {
-        TARGET_NAMES = new Vector<String>();
+        TARGET_NAMES = new Vector<>();
         TARGET_NAMES.add("a");
         TARGET_NAMES.add("b");
     }
@@ -169,7 +169,7 @@ public class ExecutorTest implements BuildListener  {
     public void testKeepGoingIgnoreDependencies() {
         try {
             //explicitly add foo for failure
-            Vector<String> targetNames = new Vector<String>(TARGET_NAMES);
+            Vector<String> targetNames = new Vector<>(TARGET_NAMES);
             targetNames.add(0, "foo");
             getProject(IGNORE_DEPS, true, true).executeTargets(targetNames);
             fail("should fail");

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

@@ -25,7 +25,7 @@ import java.util.Vector;
 
 public class MockBuildListener implements BuildListener {
 
-    private final Vector<BuildEvent> buffer = new Vector<BuildEvent>();
+    private final Vector<BuildEvent> buffer = new Vector<>();
     private final Project project;
 
     public MockBuildListener(final Project project) {

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

@@ -60,7 +60,7 @@ public class CallTargetTest {
     // params will not be passed in)
     @Test
     public void testMultiCall() {
-        Vector<String> v = new Vector<String>();
+        Vector<String> v = new Vector<>();
         v.add("call-multi");
         v.add("call-multi");
         buildRule.getProject().executeTargets(v);

src/tests/junit/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapterTest.java

@@ -278,9 +278,9 @@ public class DefaultCompilerAdapterTest {
             assertTrue(index != -1 && index < cmdLine.size() - 1);
             assertEquals(modules.getAbsolutePath(), cmdLine.get(index + 1));
             //J1.java & J2.java has to be in files list
-            final Set<String> expected = new TreeSet<String>();
+            final Set<String> expected = new TreeSet<>();
             Collections.addAll(expected, java1.getAbsolutePath(), java2.getAbsolutePath());
-            final Set<String> actual = new TreeSet<String>(cmdLine.subList(cmdLine.size() - 2, cmdLine.size()));
+            final Set<String> actual = new TreeSet<>(cmdLine.subList(cmdLine.size() - 2, cmdLine.size()));
             assertEquals(expected, actual);
         } finally {
             delete(workDir);
@@ -341,12 +341,12 @@ public class DefaultCompilerAdapterTest {
             assertTrue(index != -1 && index < cmdLine.size() - 1);
             assertEquals(modules.getAbsolutePath(), cmdLine.get(index + 1));
             //J1.java, J2.java & J3.java has to be in files list
-            final Set<String> expectedFiles = new TreeSet<String>();
+            final Set<String> expectedFiles = new TreeSet<>();
             Collections.addAll(expectedFiles,
                     java1.getAbsolutePath(),
                     java2.getAbsolutePath(),
                     java3.getAbsolutePath());
-            final Set<String> actualFiles = new TreeSet<String>(cmdLine.subList(cmdLine.size() - 3, cmdLine.size()));
+            final Set<String> actualFiles = new TreeSet<>(cmdLine.subList(cmdLine.size() - 3, cmdLine.size()));
             assertEquals(expectedFiles, actualFiles);
         } finally {
             delete(workDir);
@@ -390,11 +390,11 @@ public class DefaultCompilerAdapterTest {
             final File[] compileList = impl.compileList;
             assertNotNull(compileList);
             //J1.java, J2.java has to be in files list but not J3.java
-            final Set<String> expectedFiles = new TreeSet<String>();
+            final Set<String> expectedFiles = new TreeSet<>();
             Collections.addAll(expectedFiles,
                     java1.getAbsolutePath(),
                     java2.getAbsolutePath());
-            final Set<String> actualFiles = new TreeSet<String>();
+            final Set<String> actualFiles = new TreeSet<>();
             for (File compileFile : compileList) {
                 actualFiles.add(compileFile.getAbsolutePath());
             }

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

@@ -44,9 +44,10 @@ public class LinkedHashtableTest {
         assertTrue(h.isEmpty());
     }
 
+    @SuppressWarnings("unchecked")
     public void testClone() {
         h.put(K1, V1);
-        Hashtable<Object, Object> h2 = (Hashtable) h.clone();
+        Hashtable<Object, Object> h2 = (Hashtable<Object, Object>) h.clone();
         assertTrue(h2 instanceof LinkedHashtable);
         assertTrue(h2.containsKey(K1));
     }

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

@@ -284,7 +284,7 @@ public class VectorSetTest {
             v.add(i);
         }
         assertEquals(size, v.size());
-        ArrayList<Integer> list = new ArrayList<Integer>();
+        ArrayList<Integer> list = new ArrayList<>();
         for (int i = size - 4; i < 2 * size; i++) {
             list.add(i);
             v.add(i);