From 3f90aeba03b5c1e7e4d57319d5e2319103a809d4 Mon Sep 17 00:00:00 2001 From: Gintas Grigelionis Date: Mon, 2 Apr 2018 20:23:46 +0200 Subject: [PATCH] Use diamonds --- src/main/org/apache/tools/ant/AntClassLoader.java | 4 ++-- .../apache/tools/ant/ArgumentProcessorRegistry.java | 2 +- src/main/org/apache/tools/ant/ComponentHelper.java | 4 ++-- src/main/org/apache/tools/ant/DirectoryScanner.java | 2 +- src/main/org/apache/tools/ant/Main.java | 4 ++-- .../org/apache/tools/ant/filters/LineContains.java | 2 +- .../apache/tools/ant/filters/LineContainsRegExp.java | 2 +- .../org/apache/tools/ant/filters/ReplaceTokens.java | 4 ++-- .../org/apache/tools/ant/filters/SortFilter.java | 2 +- .../apache/tools/ant/filters/StripLineComments.java | 2 +- .../org/apache/tools/ant/filters/TailFilter.java | 2 +- .../org/apache/tools/ant/filters/TokenFilter.java | 12 ++++++------ .../org/apache/tools/ant/helper/AntXMLContext.java | 6 +++--- .../org/apache/tools/ant/helper/ProjectHelper2.java | 6 +++--- .../org/apache/tools/ant/listener/MailLogger.java | 6 ++---- .../tools/ant/property/LocalPropertyStack.java | 2 +- .../org/apache/tools/ant/taskdefs/AntStructure.java | 6 +++--- .../org/apache/tools/ant/taskdefs/BindTargets.java | 2 +- src/main/org/apache/tools/ant/taskdefs/Checksum.java | 2 +- src/main/org/apache/tools/ant/taskdefs/Concat.java | 6 +++--- src/main/org/apache/tools/ant/taskdefs/Copy.java | 2 +- src/main/org/apache/tools/ant/taskdefs/Jar.java | 6 +++--- src/main/org/apache/tools/ant/taskdefs/Javac.java | 2 +- src/main/org/apache/tools/ant/taskdefs/KeySubst.java | 4 ++-- src/main/org/apache/tools/ant/taskdefs/Manifest.java | 2 +- .../org/apache/tools/ant/taskdefs/XSLTProcess.java | 2 +- .../tools/ant/taskdefs/optional/TraXLiaison.java | 6 +++--- .../optional/depend/constantpool/ConstantPool.java | 4 ++-- .../org/apache/tools/ant/types/ArchiveScanner.java | 8 ++++---- src/main/org/apache/tools/ant/types/Assertions.java | 2 +- src/main/org/apache/tools/ant/types/Commandline.java | 4 ++-- src/main/org/apache/tools/ant/types/DataType.java | 2 +- src/main/org/apache/tools/ant/types/FilterChain.java | 2 +- src/main/org/apache/tools/ant/types/XMLCatalog.java | 2 +- .../org/apache/tools/ant/types/resources/Files.java | 2 +- .../tools/ant/types/resources/MultiRootFileSet.java | 2 +- src/main/org/apache/tools/ant/util/JavaEnvUtils.java | 2 +- src/main/org/apache/tools/ant/util/StringUtils.java | 2 +- src/main/org/apache/tools/ant/util/VectorSet.java | 2 +- src/main/org/apache/tools/tar/TarInputStream.java | 2 +- src/main/org/apache/tools/tar/TarOutputStream.java | 2 +- src/main/org/apache/tools/zip/ExtraFieldUtils.java | 4 ++-- .../org/apache/tools/zip/Simple8BitZipEncoding.java | 2 +- src/main/org/apache/tools/zip/ZipEncodingHelper.java | 3 +-- src/main/org/apache/tools/zip/ZipEntry.java | 4 ++-- src/main/org/apache/tools/zip/ZipOutputStream.java | 4 ++-- .../org/apache/tools/ant/DirectoryScannerTest.java | 4 ++-- .../junit/org/apache/tools/ant/ExecutorTest.java | 4 ++-- .../org/apache/tools/ant/MockBuildListener.java | 2 +- .../apache/tools/ant/taskdefs/CallTargetTest.java | 2 +- .../compilers/DefaultCompilerAdapterTest.java | 12 ++++++------ .../apache/tools/ant/util/LinkedHashtableTest.java | 3 ++- .../org/apache/tools/ant/util/VectorSetTest.java | 2 +- 53 files changed, 92 insertions(+), 94 deletions(-) diff --git a/src/main/org/apache/tools/ant/AntClassLoader.java b/src/main/org/apache/tools/ant/AntClassLoader.java index dab00b24d..39058bb24 100644 --- a/src/main/org/apache/tools/ant/AntClassLoader.java +++ b/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 pathMap = - Collections.synchronizedMap(new HashMap()); + 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 e = jarFiles.elements(); e.hasMoreElements();) { FileUtils.close(e.nextElement()); } - jarFiles = new Hashtable(); + jarFiles = new Hashtable<>(); if (project != null) { project.removeBuildListener(this); } diff --git a/src/main/org/apache/tools/ant/ArgumentProcessorRegistry.java b/src/main/org/apache/tools/ant/ArgumentProcessorRegistry.java index c378cd54a..ae6bf81cd 100644 --- a/src/main/org/apache/tools/ant/ArgumentProcessorRegistry.java +++ b/src/main/org/apache/tools/ant/ArgumentProcessorRegistry.java @@ -56,7 +56,7 @@ public class ArgumentProcessorRegistry { private static ArgumentProcessorRegistry instance = new ArgumentProcessorRegistry(); - private List processors = new ArrayList(); + private List processors = new ArrayList<>(); public static ArgumentProcessorRegistry getInstance() { return instance; diff --git a/src/main/org/apache/tools/ant/ComponentHelper.java b/src/main/org/apache/tools/ant/ComponentHelper.java index c2d21a69d..36a665dd5 100644 --- a/src/main/org/apache/tools/ant/ComponentHelper.java +++ b/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(); + list = new ArrayList<>(); restrictedDefinitions.put(name, list); } } @@ -1086,7 +1086,7 @@ public class ComponentHelper { * @return the (possibly empty) list of definitions */ private List findTypeMatches(String prefix) { - final List result = new ArrayList(); + final List result = new ArrayList<>(); synchronized (antTypeTable) { for (AntTypeDefinition def : antTypeTable.values()) { if (def.getName().startsWith(prefix)) { diff --git a/src/main/org/apache/tools/ant/DirectoryScanner.java b/src/main/org/apache/tools/ant/DirectoryScanner.java index 366dc9948..1a7a7e0be 100644 --- a/src/main/org/apache/tools/ant/DirectoryScanner.java +++ b/src/main/org/apache/tools/ant/DirectoryScanner.java @@ -1193,7 +1193,7 @@ public class DirectoryScanner dir.getAbsolutePath()); } } - scandir(dir, path, fast, newfiles, new LinkedList()); + scandir(dir, path, fast, newfiles, new LinkedList<>()); } private void scandir(final File dir, final TokenizedPath path, final boolean fast, diff --git a/src/main/org/apache/tools/ant/Main.java b/src/main/org/apache/tools/ant/Main.java index 347698801..1f1fad1cf 100644 --- a/src/main/org/apache/tools/ant/Main.java +++ b/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 LAUNCH_COMMANDS = Collections - .unmodifiableSet(new HashSet(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 extraArgs = extraArguments.get(processor.getClass()); if (extraArgs == null) { - extraArgs = new ArrayList(); + extraArgs = new ArrayList<>(); extraArguments.put(processor.getClass(), extraArgs); } for (; i < newI && i < args.length; i++) { diff --git a/src/main/org/apache/tools/ant/filters/LineContains.java b/src/main/org/apache/tools/ant/filters/LineContains.java index 5a1465a84..5c3609cb6 100644 --- a/src/main/org/apache/tools/ant/filters/LineContains.java +++ b/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 contains = new Vector(); + private Vector contains = new Vector<>(); /** * Remaining line to be read from this filter, or null if diff --git a/src/main/org/apache/tools/ant/filters/LineContainsRegExp.java b/src/main/org/apache/tools/ant/filters/LineContainsRegExp.java index 87de0a679..4b02adfb1 100644 --- a/src/main/org/apache/tools/ant/filters/LineContainsRegExp.java +++ b/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 regexps = new Vector(); + private Vector regexps = new Vector<>(); /** * Remaining line to be read from this filter, or null if diff --git a/src/main/org/apache/tools/ant/filters/ReplaceTokens.java b/src/main/org/apache/tools/ant/filters/ReplaceTokens.java index a2ac73215..9f1305255 100644 --- a/src/main/org/apache/tools/ant/filters/ReplaceTokens.java +++ b/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 hash = new Hashtable(); + private Hashtable hash = new Hashtable<>(); /** This map holds the "resolved" tokens (begin- and end-tokens are added to make searching simpler) */ - private final TreeMap resolvedTokens = new TreeMap(); + private final TreeMap resolvedTokens = new TreeMap<>(); private boolean resolvedTokensBuilt = false; /** Used for comparisons and lookup into the resolvedTokens map. */ private String readBuffer = ""; diff --git a/src/main/org/apache/tools/ant/filters/SortFilter.java b/src/main/org/apache/tools/ant/filters/SortFilter.java index 68dbba911..e769fe9ae 100644 --- a/src/main/org/apache/tools/ant/filters/SortFilter.java +++ b/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(); + lines = new ArrayList<>(); for (line = readLine(); line != null; line = readLine()) { lines.add(line); } diff --git a/src/main/org/apache/tools/ant/filters/StripLineComments.java b/src/main/org/apache/tools/ant/filters/StripLineComments.java index 0dbb3079c..587f532b8 100644 --- a/src/main/org/apache/tools/ant/filters/StripLineComments.java +++ b/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 comments = new Vector(); + private Vector comments = new Vector<>(); /** The line that has been read ahead. */ private String line = null; diff --git a/src/main/org/apache/tools/ant/filters/TailFilter.java b/src/main/org/apache/tools/ant/filters/TailFilter.java index 0f264969c..26c3a57e6 100644 --- a/src/main/org/apache/tools/ant/filters/TailFilter.java +++ b/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 lineList = new LinkedList(); + private LinkedList lineList = new LinkedList<>(); /** * Constructor for "dummy" instances. diff --git a/src/main/org/apache/tools/ant/filters/TokenFilter.java b/src/main/org/apache/tools/ant/filters/TokenFilter.java index bd063c830..34257e860 100644 --- a/src/main/org/apache/tools/ant/filters/TokenFilter.java +++ b/src/main/org/apache/tools/ant/filters/TokenFilter.java @@ -59,15 +59,15 @@ public class TokenFilter extends BaseFilterReader /** string filters */ - private Vector filters = new Vector(); + private Vector 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(); } } } diff --git a/src/main/org/apache/tools/ant/helper/AntXMLContext.java b/src/main/org/apache/tools/ant/helper/AntXMLContext.java index c83130b0a..f022839f5 100644 --- a/src/main/org/apache/tools/ant/helper/AntXMLContext.java +++ b/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 targetVector = new Vector(); + private Vector 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> prefixMapping = new HashMap>(); + private Map> prefixMapping = new HashMap<>(); /** Keeps track of targets in files */ @@ -364,7 +364,7 @@ public class AntXMLContext { public void startPrefixMapping(String prefix, String uri) { List list = prefixMapping.get(prefix); if (list == null) { - list = new ArrayList(); + list = new ArrayList<>(); prefixMapping.put(prefix, list); } list.add(uri); diff --git a/src/main/org/apache/tools/ant/helper/ProjectHelper2.java b/src/main/org/apache/tools/ant/helper/ProjectHelper2.java index 130986139..899955a5d 100644 --- a/src/main/org/apache/tools/ant/helper/ProjectHelper2.java +++ b/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()); + 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()); + 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 antHandlers = new Stack(); + private Stack antHandlers = new Stack<>(); private AntHandler currentHandler = null; private AntXMLContext context; diff --git a/src/main/org/apache/tools/ant/listener/MailLogger.java b/src/main/org/apache/tools/ant/listener/MailLogger.java index 9462e25ea..58f110e8a 100644 --- a/src/main/org/apache/tools/ant/listener/MailLogger.java +++ b/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 toBccList = splitEmailAddresses(values.toBccList()); mailer.setBccList(toBccList); - mailer.setFiles(new Vector()); + mailer.setFiles(new Vector<>()); mailer.setSubject(values.subject()); - mailer.setHeaders(new Vector
()); + mailer.setHeaders(new Vector<>()); mailer.send(); } diff --git a/src/main/org/apache/tools/ant/property/LocalPropertyStack.java b/src/main/org/apache/tools/ant/property/LocalPropertyStack.java index 4babf296e..f3427c0cb 100644 --- a/src/main/org/apache/tools/ant/property/LocalPropertyStack.java +++ b/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()); + stack.addFirst(new ConcurrentHashMap<>()); } } diff --git a/src/main/org/apache/tools/ant/taskdefs/AntStructure.java b/src/main/org/apache/tools/ant/taskdefs/AntStructure.java index 4ebef0237..81a766c3b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/AntStructure.java +++ b/src/main/org/apache/tools/ant/taskdefs/AntStructure.java @@ -107,8 +107,8 @@ public class AntStructure extends Task { } printer.printHead(out, getProject(), - new Hashtable>(getProject().getTaskDefinitions()), - new Hashtable>(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 visited = new Hashtable(); + private final Hashtable visited = new Hashtable<>(); @Override public void printTail(final PrintWriter out) { diff --git a/src/main/org/apache/tools/ant/taskdefs/BindTargets.java b/src/main/org/apache/tools/ant/taskdefs/BindTargets.java index 0a4704f8f..3ac33f51a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/BindTargets.java +++ b/src/main/org/apache/tools/ant/taskdefs/BindTargets.java @@ -33,7 +33,7 @@ public class BindTargets extends Task { private String extensionPoint; - private final List targets = new ArrayList(); + private final List targets = new ArrayList<>(); private OnMissingExtensionPoint onMissingExtensionPoint; diff --git a/src/main/org/apache/tools/ant/taskdefs/Checksum.java b/src/main/org/apache/tools/ant/taskdefs/Checksum.java index 3f30f0250..bc34e1a3d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Checksum.java +++ b/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 formatMap = new HashMap(); + private static HashMap formatMap = new HashMap<>(); private static final String CHECKSUM = "CHECKSUM"; private static final String MD5SUM = "MD5SUM"; private static final String SVF = "SVF"; diff --git a/src/main/org/apache/tools/ant/taskdefs/Concat.java b/src/main/org/apache/tools/ant/taskdefs/Concat.java index 0f8e55e3f..75f71bc56 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Concat.java +++ b/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(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(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(); + filterChains = new Vector<>(); } filterChains.addElement(filterChain); } diff --git a/src/main/org/apache/tools/ant/taskdefs/Copy.java b/src/main/org/apache/tools/ant/taskdefs/Copy.java index 6aa5726b8..ba0928d03 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Copy.java +++ b/src/main/org/apache/tools/ant/taskdefs/Copy.java @@ -773,7 +773,7 @@ public class Copy extends Task { final FileNameMapper mapper, final Hashtable map) { String[] toCopy = null; if (forceOverwrite) { - final Vector v = new Vector(); + final Vector v = new Vector<>(); for (String name : names) { if (mapper.mapFileName(name) != null) { v.addElement(name); diff --git a/src/main/org/apache/tools/ant/taskdefs/Jar.java b/src/main/org/apache/tools/ant/taskdefs/Jar.java index 04b1f570d..092fff2b3 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Jar.java +++ b/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(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 dirs = new ArrayList(); - ArrayList files = new ArrayList(); + ArrayList dirs = new ArrayList<>(); + ArrayList files = new ArrayList<>(); grabFilesAndDirs(indexJarEntry, dirs, files); if (dirs.size() + files.size() > 0) { writer.println(name); diff --git a/src/main/org/apache/tools/ant/taskdefs/Javac.java b/src/main/org/apache/tools/ant/taskdefs/Javac.java index f52c3dbec..e8520eeb2 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Javac.java +++ b/src/main/org/apache/tools/ant/taskdefs/Javac.java @@ -1512,7 +1512,7 @@ public class Javac extends MatchingTask { private static Map> resolveModuleSourcePathElement( final File projectDir, final String element) { - final Map> result = new TreeMap>(); + final Map> result = new TreeMap<>(); for (CharSequence resolvedElement : expandGroups(element)) { findModules(projectDir, resolvedElement.toString(), result); } diff --git a/src/main/org/apache/tools/ant/taskdefs/KeySubst.java b/src/main/org/apache/tools/ant/taskdefs/KeySubst.java index 44ea5303b..cd34394ca 100644 --- a/src/main/org/apache/tools/ant/taskdefs/KeySubst.java +++ b/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 replacements = new Hashtable(); + private Hashtable replacements = new Hashtable<>(); /** * Do the execution. @@ -150,7 +150,7 @@ public class KeySubst extends Task { */ public static void main(String[] args) { try { - Hashtable hash = new Hashtable(); + Hashtable hash = new Hashtable<>(); hash.put("VERSION", "1.0.3"); hash.put("b", "ffff"); System.out.println(KeySubst.replace("$f ${VERSION} f ${b} jj $", diff --git a/src/main/org/apache/tools/ant/taskdefs/Manifest.java b/src/main/org/apache/tools/ant/taskdefs/Manifest.java index e1c19455a..4ed43e2f0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Manifest.java +++ b/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 values = new Vector(); + private Vector values = new Vector<>(); /** * For multivalued attributes, this is the index of the attribute diff --git a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java index 98bc45816..4ad419bc5 100644 --- a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java +++ b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java @@ -1147,7 +1147,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger { public static final Map XPATH_TYPES; static { - final Map m = new EnumMap(ParamType.class); + final Map m = new EnumMap<>(ParamType.class); m.put(XPATH_STRING, XPathConstants.STRING); m.put(XPATH_BOOLEAN, XPathConstants.BOOLEAN); m.put(XPATH_NUMBER, XPathConstants.NUMBER); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java b/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java index 4420f109f..ac2f06729 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java @@ -124,13 +124,13 @@ public class TraXLiaison implements XSLTLiaison4, ErrorListener, XSLTLoggerAware private final Vector outputProperties = new Vector<>(); /** stylesheet parameters */ - private final Hashtable params = new Hashtable(); + private final Hashtable params = new Hashtable<>(); /** factory attributes */ - private final List attributes = new ArrayList(); + private final List attributes = new ArrayList<>(); /** factory features */ - private final Map features = new HashMap(); + private final Map features = new HashMap<>(); /** whether to suppress warnings */ private boolean suppressWarnings = false; 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 5058abd72..6be14cde6 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 @@ -37,13 +37,13 @@ import java.util.stream.IntStream; public class ConstantPool { /** The entries in the constant pool. */ - private final List entries = new ArrayList(); + private final List entries = new ArrayList<>(); /** * A Hashtable of UTF8 entries - used to get constant pool indexes of * the UTF8 values quickly */ - private final Map utf8Indexes = new HashMap(); + private final Map utf8Indexes = new HashMap<>(); /** Initialise the constant pool. */ public ConstantPool() { diff --git a/src/main/org/apache/tools/ant/types/ArchiveScanner.java b/src/main/org/apache/tools/ant/types/ArchiveScanner.java index 90e91e8b2..cd9eeb838 100644 --- a/src/main/org/apache/tools/ant/types/ArchiveScanner.java +++ b/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 fileEntries = new TreeMap(); + private Map fileEntries = new TreeMap<>(); /** * record list of all directory zip entries */ - private Map dirEntries = new TreeMap(); + private Map dirEntries = new TreeMap<>(); /** * record list of matching file zip entries */ - private Map matchFileEntries = new TreeMap(); + private Map matchFileEntries = new TreeMap<>(); /** * record list of matching directory zip entries */ - private Map matchDirEntries = new TreeMap(); + private Map matchDirEntries = new TreeMap<>(); /** * encoding of file names. diff --git a/src/main/org/apache/tools/ant/types/Assertions.java b/src/main/org/apache/tools/ant/types/Assertions.java index 0bb2f3031..c4a94c466 100644 --- a/src/main/org/apache/tools/ant/types/Assertions.java +++ b/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 assertionList = new ArrayList(); + private ArrayList assertionList = new ArrayList<>(); /** diff --git a/src/main/org/apache/tools/ant/types/Commandline.java b/src/main/org/apache/tools/ant/types/Commandline.java index 98173e0ce..3741ffa8d 100644 --- a/src/main/org/apache/tools/ant/types/Commandline.java +++ b/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 arguments = new ArrayList(); + private List 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 commands = new LinkedList(); + final List commands = new LinkedList<>(); addCommandToList(commands.listIterator()); return commands.toArray(new String[commands.size()]); } diff --git a/src/main/org/apache/tools/ant/types/DataType.java b/src/main/org/apache/tools/ant/types/DataType.java index ae181bac8..6572a394d 100644 --- a/src/main/org/apache/tools/ant/types/DataType.java +++ b/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(this), p); + dieOnCircularReference(new IdentityStack<>(this), p); } /** diff --git a/src/main/org/apache/tools/ant/types/FilterChain.java b/src/main/org/apache/tools/ant/types/FilterChain.java index 6bad602dc..ec4d88612 100644 --- a/src/main/org/apache/tools/ant/types/FilterChain.java +++ b/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 filterReaders = new Vector(); + private Vector filterReaders = new Vector<>(); /** * Add an AntFilterReader filter. diff --git a/src/main/org/apache/tools/ant/types/XMLCatalog.java b/src/main/org/apache/tools/ant/types/XMLCatalog.java index 707d0b358..b3601b8e7 100644 --- a/src/main/org/apache/tools/ant/types/XMLCatalog.java +++ b/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 elements = new Vector(); + private Vector elements = new Vector<>(); /** * Classpath in which to attempt to resolve resources. diff --git a/src/main/org/apache/tools/ant/types/resources/Files.java b/src/main/org/apache/tools/ant/types/resources/Files.java index 1652e527c..43feb64cc 100644 --- a/src/main/org/apache/tools/ant/types/resources/Files.java +++ b/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(additionalPatterns.size()); + f.additionalPatterns = new Vector<>(additionalPatterns.size()); for (PatternSet ps : additionalPatterns) { f.additionalPatterns.add((PatternSet) ps.clone()); } 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 f577151fc..8a02da2c3 100644 --- a/src/main/org/apache/tools/ant/types/resources/MultiRootFileSet.java +++ b/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 baseDirs = new ArrayList(); + private List baseDirs = new ArrayList<>(); private Union union; @Override diff --git a/src/main/org/apache/tools/ant/util/JavaEnvUtils.java b/src/main/org/apache/tools/ant/util/JavaEnvUtils.java index b465b61fb..b8cb9e1ae 100644 --- a/src/main/org/apache/tools/ant/util/JavaEnvUtils.java +++ b/src/main/org/apache/tools/ant/util/JavaEnvUtils.java @@ -463,7 +463,7 @@ public final class JavaEnvUtils { */ private static void buildJrePackages() { - jrePackages = new Vector(); + jrePackages = new Vector<>(); if (isAtLeastJavaVersion(JAVA_1_1)) { //things like sun.reflection, sun.misc, sun.net jrePackages.addElement("sun"); diff --git a/src/main/org/apache/tools/ant/util/StringUtils.java b/src/main/org/apache/tools/ant/util/StringUtils.java index c42a7c64c..7e3123ce6 100644 --- a/src/main/org/apache/tools/ant/util/StringUtils.java +++ b/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 split(String data, int ch) { - Vector elems = new Vector(); + Vector elems = new Vector<>(); int pos = -1; int i = 0; while ((pos = data.indexOf(ch, i)) != -1) { diff --git a/src/main/org/apache/tools/ant/util/VectorSet.java b/src/main/org/apache/tools/ant/util/VectorSet.java index ecd857e2f..982014713 100644 --- a/src/main/org/apache/tools/ant/util/VectorSet.java +++ b/src/main/org/apache/tools/ant/util/VectorSet.java @@ -40,7 +40,7 @@ import java.util.Vector; public final class VectorSet extends Vector { private static final long serialVersionUID = 1L; - private final HashSet set = new HashSet(); + private final HashSet set = new HashSet<>(); public VectorSet() { super(); diff --git a/src/main/org/apache/tools/tar/TarInputStream.java b/src/main/org/apache/tools/tar/TarInputStream.java index 8fd90f578..33c5004a8 100644 --- a/src/main/org/apache/tools/tar/TarInputStream.java +++ b/src/main/org/apache/tools/tar/TarInputStream.java @@ -419,7 +419,7 @@ public class TarInputStream extends FilterInputStream { } Map parsePaxHeaders(InputStream i) throws IOException { - Map headers = new HashMap(); + Map headers = new HashMap<>(); // Format is "length keyword=value\n"; while (true) { // get length int ch; diff --git a/src/main/org/apache/tools/tar/TarOutputStream.java b/src/main/org/apache/tools/tar/TarOutputStream.java index 217ed208d..7e92d7a31 100644 --- a/src/main/org/apache/tools/tar/TarOutputStream.java +++ b/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 paxHeaders = new HashMap(); + Map paxHeaders = new HashMap<>(); final String entryName = entry.getName(); boolean paxHeaderContainsPath = handleLongName(entry, entryName, paxHeaders, "path", TarConstants.LF_GNUTYPE_LONGNAME, "file name"); diff --git a/src/main/org/apache/tools/zip/ExtraFieldUtils.java b/src/main/org/apache/tools/zip/ExtraFieldUtils.java index 18bb85064..93efbe6f6 100644 --- a/src/main/org/apache/tools/zip/ExtraFieldUtils.java +++ b/src/main/org/apache/tools/zip/ExtraFieldUtils.java @@ -41,7 +41,7 @@ public class ExtraFieldUtils { private static final Map> implementations; static { - implementations = new ConcurrentHashMap>(); + 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 v = new ArrayList(); + List v = new ArrayList<>(); int start = 0; LOOP: while (start <= data.length - WORD) { diff --git a/src/main/org/apache/tools/zip/Simple8BitZipEncoding.java b/src/main/org/apache/tools/zip/Simple8BitZipEncoding.java index 789c04522..a399fb2a9 100644 --- a/src/main/org/apache/tools/zip/Simple8BitZipEncoding.java +++ b/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 temp = - new ArrayList(this.highChars.length); + new ArrayList<>(this.highChars.length); byte code = 127; diff --git a/src/main/org/apache/tools/zip/ZipEncodingHelper.java b/src/main/org/apache/tools/zip/ZipEncodingHelper.java index b9d4447c1..84ceafeda 100644 --- a/src/main/org/apache/tools/zip/ZipEncodingHelper.java +++ b/src/main/org/apache/tools/zip/ZipEncodingHelper.java @@ -66,8 +66,7 @@ public abstract class ZipEncodingHelper { private static final Map simpleEncodings; static { - final Map se = - new HashMap(); + final Map se = new HashMap<>(); final char[] cp437_high_chars = new char[] {0x00c7, 0x00fc, 0x00e9, 0x00e2, 0x00e4, 0x00e0, diff --git a/src/main/org/apache/tools/zip/ZipEntry.java b/src/main/org/apache/tools/zip/ZipEntry.java index 4d619d399..8667a21ad 100644 --- a/src/main/org/apache/tools/zip/ZipEntry.java +++ b/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 newFields = new ArrayList(); + List 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 newResult = new ArrayList(); + List newResult = new ArrayList<>(); for (ZipExtraField extraField : extraFields) { if (!type.equals(extraField.getHeaderId())) { newResult.add(extraField); diff --git a/src/main/org/apache/tools/zip/ZipOutputStream.java b/src/main/org/apache/tools/zip/ZipOutputStream.java index 16cff045b..dae83fc53 100644 --- a/src/main/org/apache/tools/zip/ZipOutputStream.java +++ b/src/main/org/apache/tools/zip/ZipOutputStream.java @@ -196,7 +196,7 @@ public class ZipOutputStream extends FilterOutputStream { * * @since 1.1 */ - private final List entries = new LinkedList(); + private final List 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 offsets = new HashMap(); + private final Map offsets = new HashMap<>(); /** * The encoding to use for filenames and the file comment. diff --git a/src/tests/junit/org/apache/tools/ant/DirectoryScannerTest.java b/src/tests/junit/org/apache/tools/ant/DirectoryScannerTest.java index ae40fa610..a44480797 100644 --- a/src/tests/junit/org/apache/tools/ant/DirectoryScannerTest.java +++ b/src/tests/junit/org/apache/tools/ant/DirectoryScannerTest.java @@ -480,11 +480,11 @@ public class DirectoryScannerTest { assertEquals("directories present: ", expectedDirectories.length, includedDirectories.length); - TreeSet files = new TreeSet(); + TreeSet files = new TreeSet<>(); for (String includedFile : includedFiles) { files.add(includedFile.replace(File.separatorChar, '/')); } - TreeSet directories = new TreeSet(); + TreeSet directories = new TreeSet<>(); for (String includedDirectory : includedDirectories) { directories.add(includedDirectory.replace(File.separatorChar, '/')); } diff --git a/src/tests/junit/org/apache/tools/ant/ExecutorTest.java b/src/tests/junit/org/apache/tools/ant/ExecutorTest.java index b17554c80..283b04e72 100644 --- a/src/tests/junit/org/apache/tools/ant/ExecutorTest.java +++ b/src/tests/junit/org/apache/tools/ant/ExecutorTest.java @@ -39,7 +39,7 @@ public class ExecutorTest implements BuildListener { private static final Vector TARGET_NAMES; static { - TARGET_NAMES = new Vector(); + 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 targetNames = new Vector(TARGET_NAMES); + Vector targetNames = new Vector<>(TARGET_NAMES); targetNames.add(0, "foo"); getProject(IGNORE_DEPS, true, true).executeTargets(targetNames); fail("should fail"); diff --git a/src/tests/junit/org/apache/tools/ant/MockBuildListener.java b/src/tests/junit/org/apache/tools/ant/MockBuildListener.java index ec03404b5..4829770b0 100644 --- a/src/tests/junit/org/apache/tools/ant/MockBuildListener.java +++ b/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 buffer = new Vector(); + private final Vector buffer = new Vector<>(); private final Project project; public MockBuildListener(final Project project) { diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/CallTargetTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/CallTargetTest.java index 337c6a460..98f041fbf 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/CallTargetTest.java +++ b/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 v = new Vector(); + Vector v = new Vector<>(); v.add("call-multi"); v.add("call-multi"); buildRule.getProject().executeTargets(v); diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapterTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapterTest.java index dd9563461..cf0e9cbfe 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapterTest.java +++ b/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 expected = new TreeSet(); + final Set expected = new TreeSet<>(); Collections.addAll(expected, java1.getAbsolutePath(), java2.getAbsolutePath()); - final Set actual = new TreeSet(cmdLine.subList(cmdLine.size() - 2, cmdLine.size())); + final Set 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 expectedFiles = new TreeSet(); + final Set expectedFiles = new TreeSet<>(); Collections.addAll(expectedFiles, java1.getAbsolutePath(), java2.getAbsolutePath(), java3.getAbsolutePath()); - final Set actualFiles = new TreeSet(cmdLine.subList(cmdLine.size() - 3, cmdLine.size())); + final Set 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 expectedFiles = new TreeSet(); + final Set expectedFiles = new TreeSet<>(); Collections.addAll(expectedFiles, java1.getAbsolutePath(), java2.getAbsolutePath()); - final Set actualFiles = new TreeSet(); + final Set actualFiles = new TreeSet<>(); for (File compileFile : compileList) { actualFiles.add(compileFile.getAbsolutePath()); } 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 bf7afab91..0496eec2b 100644 --- a/src/tests/junit/org/apache/tools/ant/util/LinkedHashtableTest.java +++ b/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 h2 = (Hashtable) h.clone(); + Hashtable h2 = (Hashtable) h.clone(); assertTrue(h2 instanceof LinkedHashtable); assertTrue(h2.containsKey(K1)); } 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 9c54ed2da..1ec09c9e8 100644 --- a/src/tests/junit/org/apache/tools/ant/util/VectorSetTest.java +++ b/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 list = new ArrayList(); + ArrayList list = new ArrayList<>(); for (int i = size - 4; i < 2 * size; i++) { list.add(i); v.add(i);