From b205cf22515521274ef70ca4ffec06db5cae40d7 Mon Sep 17 00:00:00 2001 From: Tim te Beek Date: Sat, 19 Aug 2023 20:48:42 +0000 Subject: [PATCH] [MNG-6847] Use diamond operator Use this link to re-run the recipe: https://app.moderne.io/recipes/org.openrewrite.staticanalysis.UseDiamondOperator?organizationId=QXBhY2hlIE1hdmVu Co-authored-by: Moderne --- .../org/apache/maven/shared/utils/Os.java | 2 +- .../maven/shared/utils/cli/Commandline.java | 2 +- .../shared/utils/cli/shell/BourneShell.java | 2 +- .../maven/shared/utils/cli/shell/Shell.java | 2 +- .../shared/utils/introspection/ClassMap.java | 2 +- .../shared/utils/introspection/MethodMap.java | 8 +++---- .../ReflectionValueExtractor.java | 2 +- .../maven/shared/utils/io/FileUtils.java | 8 +++---- .../maven/shared/utils/io/MatchPattern.java | 2 +- .../maven/shared/utils/io/SelectorUtils.java | 4 ++-- .../maven/shared/utils/io/WalkCollector.java | 2 +- .../utils/xml/PrettyPrintXMLWriter.java | 2 +- .../maven/shared/utils/xml/Xpp3Dom.java | 12 +++++----- .../shared/utils/xml/Xpp3DomBuilder.java | 4 ++-- .../maven/shared/utils/xml/Xpp3DomUtils.java | 2 +- .../maven/shared/utils/StringUtilsTest.java | 4 ++-- .../ReflectionValueExtractorTest.java | 24 +++++++++---------- .../shared/utils/io/DirectoryScannerTest.java | 2 +- .../maven/shared/utils/io/FileUtilsTest.java | 2 +- 19 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/utils/Os.java b/src/main/java/org/apache/maven/shared/utils/Os.java index c6151bb8..eb48a46f 100644 --- a/src/main/java/org/apache/maven/shared/utils/Os.java +++ b/src/main/java/org/apache/maven/shared/utils/Os.java @@ -159,7 +159,7 @@ public static Set getValidFamilies() { return VALID_FAMILIES; } - Set valid = new HashSet(); + Set valid = new HashSet<>(); valid.add(FAMILY_DOS); valid.add(FAMILY_MAC); valid.add(FAMILY_NETWARE); diff --git a/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java b/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java index 51eae4cf..44527967 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java @@ -64,7 +64,7 @@ public class Commandline implements Cloneable { private final List arguments = new Vector<>(); - private final Map envVars = Collections.synchronizedMap(new LinkedHashMap()); + private final Map envVars = Collections.synchronizedMap(new LinkedHashMap<>()); private Shell shell; diff --git a/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java b/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java index 0825bb45..5ba6e3fc 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java @@ -54,7 +54,7 @@ public String getExecutable() { /** {@inheritDoc} */ public List getShellArgsList() { - List shellArgs = new ArrayList(); + List shellArgs = new ArrayList<>(); List existingShellArgs = super.getShellArgsList(); if ((existingShellArgs != null) && !existingShellArgs.isEmpty()) { diff --git a/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java b/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java index c8208af3..ff92c7a9 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java @@ -42,7 +42,7 @@ public class Shell implements Cloneable { private String shellCommand; - private final List shellArgs = new ArrayList(); + private final List shellArgs = new ArrayList<>(); private boolean quotedArgumentsEnabled = true; diff --git a/src/main/java/org/apache/maven/shared/utils/introspection/ClassMap.java b/src/main/java/org/apache/maven/shared/utils/introspection/ClassMap.java index 17f2593f..071398c8 100644 --- a/src/main/java/org/apache/maven/shared/utils/introspection/ClassMap.java +++ b/src/main/java/org/apache/maven/shared/utils/introspection/ClassMap.java @@ -51,7 +51,7 @@ private static final class CacheMiss {} * Cache of Methods, or CACHE_MISS, keyed by method * name and actual arguments used to find it. */ - private final Map methodCache = new Hashtable(); + private final Map methodCache = new Hashtable<>(); private MethodMap methodMap = new MethodMap(); diff --git a/src/main/java/org/apache/maven/shared/utils/introspection/MethodMap.java b/src/main/java/org/apache/maven/shared/utils/introspection/MethodMap.java index edafdfb1..b8460d44 100644 --- a/src/main/java/org/apache/maven/shared/utils/introspection/MethodMap.java +++ b/src/main/java/org/apache/maven/shared/utils/introspection/MethodMap.java @@ -44,7 +44,7 @@ class MethodMap { /** * Keep track of all methods with the same name. */ - private final Map> methodByNameMap = new Hashtable>(); + private final Map> methodByNameMap = new Hashtable<>(); /** * Add a method to a list of methods by name. @@ -59,7 +59,7 @@ void add(Method method) { List l = get(methodName); if (l == null) { - l = new ArrayList(); + l = new ArrayList<>(); methodByNameMap.put(methodName, l); } @@ -153,7 +153,7 @@ private static Method getMostSpecific(List methods, Class... classes) * (the most specific method) otherwise we have ambiguity. */ - LinkedList maximals = new LinkedList(); + LinkedList maximals = new LinkedList<>(); for (Method app : applicables) { Class[] appArgs = app.getParameterTypes(); @@ -255,7 +255,7 @@ private static int moreSpecific(Class[] c1, Class[] c2) { * to formal types through a method invocation conversion). */ private static LinkedList getApplicables(List methods, Class... classes) { - LinkedList list = new LinkedList(); + LinkedList list = new LinkedList<>(); for (Method method : methods) { if (isApplicable(method, classes)) { diff --git a/src/main/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractor.java b/src/main/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractor.java index 7e212778..1c6965ea 100644 --- a/src/main/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractor.java +++ b/src/main/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractor.java @@ -52,7 +52,7 @@ public class ReflectionValueExtractor { * This approach prevents permgen space overflows due to retention of discarded * classloaders. */ - private static final Map, ClassMap> CLASS_MAPS = new WeakHashMap, ClassMap>(); + private static final Map, ClassMap> CLASS_MAPS = new WeakHashMap<>(); static final int EOF = -1; diff --git a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java index 296b494c..62c5bcbf 100644 --- a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java @@ -458,7 +458,7 @@ public static void fileDelete(@Nonnull String fileName) { * @return an array of files for the wanted extensions */ public static String[] getFilesFromExtension(@Nonnull String directory, @Nonnull String... extensions) { - List files = new ArrayList(); + List files = new ArrayList<>(); File currentDir = new File(directory); @@ -1291,7 +1291,7 @@ public static List getFiles( throws IOException { List fileNames = getFileNames(directory, includes, excludes, includeBasedir); - List files = new ArrayList(); + List files = new ArrayList<>(); for (String filename : fileNames) { files.add(new File(filename)); @@ -1423,7 +1423,7 @@ public static List getFileAndDirectoryNames( scanner.scan(); - List list = new ArrayList(); + List list = new ArrayList<>(); if (getFiles) { String[] files = scanner.getIncludedFiles(); @@ -1835,7 +1835,7 @@ private static void copyFilePermissions(@Nonnull File source, @Nonnull File dest @Deprecated @Nonnull public static List loadFile(@Nonnull File file) throws IOException { - List lines = new ArrayList(); + List lines = new ArrayList<>(); if (file.exists()) { try (BufferedReader reader = Files.newBufferedReader(file.toPath(), Charset.defaultCharset())) { diff --git a/src/main/java/org/apache/maven/shared/utils/io/MatchPattern.java b/src/main/java/org/apache/maven/shared/utils/io/MatchPattern.java index 523b0a92..75ad557f 100644 --- a/src/main/java/org/apache/maven/shared/utils/io/MatchPattern.java +++ b/src/main/java/org/apache/maven/shared/utils/io/MatchPattern.java @@ -117,7 +117,7 @@ public boolean startsWith(String string) { } static String[] tokenizePathToString(@Nonnull String path, @Nonnull String separator) { - List ret = new ArrayList(); + List ret = new ArrayList<>(); StringTokenizer st = new StringTokenizer(path, separator); while (st.hasMoreTokens()) { ret.add(st.nextToken()); diff --git a/src/main/java/org/apache/maven/shared/utils/io/SelectorUtils.java b/src/main/java/org/apache/maven/shared/utils/io/SelectorUtils.java index f22dee0f..007d292a 100644 --- a/src/main/java/org/apache/maven/shared/utils/io/SelectorUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/io/SelectorUtils.java @@ -504,7 +504,7 @@ private static boolean equals(char c1, char c2, boolean isCaseSensitive) { * @return a List of path elements from the tokenized path */ private static List tokenizePath(String path, String separator) { - List ret = new ArrayList(); + List ret = new ArrayList<>(); StringTokenizer st = new StringTokenizer(path, separator); while (st.hasMoreTokens()) { ret.add(st.nextToken()); @@ -519,7 +519,7 @@ static boolean matchAntPathPatternStart( } private static String[] tokenizePathToString(@Nonnull String path, @Nonnull String separator) { - List ret = new ArrayList(); + List ret = new ArrayList<>(); StringTokenizer st = new StringTokenizer(path, separator); while (st.hasMoreTokens()) { ret.add(st.nextToken()); diff --git a/src/main/java/org/apache/maven/shared/utils/io/WalkCollector.java b/src/main/java/org/apache/maven/shared/utils/io/WalkCollector.java index f2923bc8..9f671f46 100644 --- a/src/main/java/org/apache/maven/shared/utils/io/WalkCollector.java +++ b/src/main/java/org/apache/maven/shared/utils/io/WalkCollector.java @@ -43,7 +43,7 @@ public class WalkCollector implements DirectoryWalkListener { * Create an instance. */ public WalkCollector() { - steps = new ArrayList(); + steps = new ArrayList<>(); startCount = 0; finishCount = 0; percentageLow = 0; diff --git a/src/main/java/org/apache/maven/shared/utils/xml/PrettyPrintXMLWriter.java b/src/main/java/org/apache/maven/shared/utils/xml/PrettyPrintXMLWriter.java index 673703a7..7f3838d5 100644 --- a/src/main/java/org/apache/maven/shared/utils/xml/PrettyPrintXMLWriter.java +++ b/src/main/java/org/apache/maven/shared/utils/xml/PrettyPrintXMLWriter.java @@ -37,7 +37,7 @@ public class PrettyPrintXMLWriter implements XMLWriter { private PrintWriter writer; - private ArrayList elementStack = new ArrayList(); + private ArrayList elementStack = new ArrayList<>(); private boolean processingElement = false; diff --git a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java index e4b91558..2ba422da 100644 --- a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java +++ b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java @@ -92,8 +92,8 @@ public class Xpp3Dom implements Iterable { */ public Xpp3Dom(String name) { this.name = name; - childList = new ArrayList(); - childMap = new HashMap(); + childList = new ArrayList<>(); + childMap = new HashMap<>(); } /** @@ -113,8 +113,8 @@ public Xpp3Dom(@Nonnull Xpp3Dom src, String name) { this.name = name; int size = src.getChildCount(); - childList = new ArrayList(size); - childMap = new HashMap(); + childList = new ArrayList<>(size); + childMap = new HashMap<>(); setValue(src.getValue()); @@ -177,7 +177,7 @@ public void setAttribute(@Nonnull String nameParameter, @Nonnull String valuePar throw new NullPointerException("name can not be null"); } if (attributes == null) { - attributes = new HashMap(); + attributes = new HashMap<>(); } attributes.put(nameParameter, valueParameter); @@ -234,7 +234,7 @@ List getChildrenList(String nameParameter) { if (childList == null) { return Collections.emptyList(); } else { - ArrayList children = new ArrayList(); + ArrayList children = new ArrayList<>(); for (Xpp3Dom aChildList : childList) { if (nameParameter.equals(aChildList.getName())) { children.add(aChildList); diff --git a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java index 62cc849a..09362183 100644 --- a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java +++ b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java @@ -146,9 +146,9 @@ private static XMLReader instantiate(String s) { } private static class DocHandler extends DefaultHandler { - private final List elemStack = new ArrayList(); + private final List elemStack = new ArrayList<>(); - private final List values = new ArrayList(); + private final List values = new ArrayList<>(); Xpp3Dom result = null; diff --git a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomUtils.java b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomUtils.java index 803e2c0f..a9c8faa2 100644 --- a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomUtils.java @@ -98,7 +98,7 @@ public static Xpp3Dom merge(Xpp3Dom dominant, Xpp3Dom recessive, Boolean childMe } private static Map> getCommonChildren(Xpp3Dom dominant, Xpp3Dom recessive) { - Map> commonChildren = new HashMap>(); + Map> commonChildren = new HashMap<>(); for (String childName : recessive.childMap.keySet()) { List dominantChildren = dominant.getChildrenList(childName); diff --git a/src/test/java/org/apache/maven/shared/utils/StringUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/StringUtilsTest.java index 5ef56f6e..3cd129a8 100644 --- a/src/test/java/org/apache/maven/shared/utils/StringUtilsTest.java +++ b/src/test/java/org/apache/maven/shared/utils/StringUtilsTest.java @@ -564,7 +564,7 @@ public void testInterpolate_NPE2() { @Test public void testInterpolate() { - Map variables = new HashMap(); + Map variables = new HashMap<>(); assertThat( StringUtils.interpolate("This ${text} will get replaced", variables), is("This ${text} will get replaced")); @@ -767,7 +767,7 @@ public void testJoin_Iterator_NPE() { @Test public void testJoin_Iterator() { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); assertThat(StringUtils.join(list.iterator(), null), is("")); diff --git a/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java b/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java index 1842f1ee..0e3a4678 100644 --- a/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java +++ b/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java @@ -144,37 +144,37 @@ public void testValueExtractorWithAInvalidExpression() throws IntrospectionExcep } public void testMappedDottedKey() throws IntrospectionException { - Map map = new HashMap(); + Map map = new HashMap<>(); map.put("a.b", "a.b-value"); assertEquals("a.b-value", ReflectionValueExtractor.evaluate("h.value(a.b)", new ValueHolder(map))); } public void testIndexedMapped() throws IntrospectionException { - Map map = new HashMap(); + Map map = new HashMap<>(); map.put("a", "a-value"); - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(map); assertEquals("a-value", ReflectionValueExtractor.evaluate("h.value[0](a)", new ValueHolder(list))); } public void testMappedIndexed() throws IntrospectionException { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add("a-value"); - Map map = new HashMap(); + Map map = new HashMap<>(); map.put("a", list); assertEquals("a-value", ReflectionValueExtractor.evaluate("h.value(a)[0]", new ValueHolder(map))); } public void testMappedMissingDot() throws IntrospectionException { - Map map = new HashMap(); + Map map = new HashMap<>(); map.put("a", new ValueHolder("a-value")); assertNull(ReflectionValueExtractor.evaluate("h.value(a)value", new ValueHolder(map))); } public void testIndexedMissingDot() throws IntrospectionException { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(new ValueHolder("a-value")); assertNull(ReflectionValueExtractor.evaluate("h.value[0]value", new ValueHolder(list))); } @@ -184,7 +184,7 @@ public void testDotDot() throws IntrospectionException { } public void testBadIndexedSyntax() throws IntrospectionException { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add("a-value"); Object value = new ValueHolder(list); @@ -197,7 +197,7 @@ public void testBadIndexedSyntax() throws IntrospectionException { } public void testBadMappedSyntax() throws IntrospectionException { - Map map = new HashMap(); + Map map = new HashMap<>(); map.put("a", "a-value"); Object value = new ValueHolder(map); @@ -304,7 +304,7 @@ public static class Project { private Scm scm; - private final List dependencies = new ArrayList(); + private final List dependencies = new ArrayList<>(); private Build build; @@ -314,7 +314,7 @@ public static class Project { private String version; - private Map artifactMap = new HashMap(); + private Map artifactMap = new HashMap<>(); private String description; @@ -388,7 +388,7 @@ public Dependency[] getDependenciesAsArray() { } public Map getDependenciesAsMap() { - Map ret = new HashMap(); + Map ret = new HashMap<>(); for (Object o : getDependencies()) { Dependency dep = (Dependency) o; ret.put(dep.getArtifactId(), dep); diff --git a/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java b/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java index 74a3f32c..f600d610 100644 --- a/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java +++ b/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java @@ -349,7 +349,7 @@ private void checkFiles(String category, String[] expectedFiles, String[] resolv } private static class TestScanConductor implements ScanConductor { - final List visitedFiles = new ArrayList(); + final List visitedFiles = new ArrayList<>(); public ScanConductor.ScanAction visitDirectory(String name, File directory) { assertTrue(directory.isDirectory()); diff --git a/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java index 718227fb..5b088c95 100644 --- a/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java +++ b/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java @@ -993,7 +993,7 @@ public void getDefaultExcludesAsList() throws Exception { @Test public void getDefaultExcludesAsString() throws Exception { assertThat( - new HashSet( + new HashSet<>( Arrays.asList(FileUtils.getDefaultExcludesAsString().split(","))), hasItems(MINIMUM_DEFAULT_EXCLUDES)); }