From 23a4fe916cb200ca7233135e011062322c2bf2f3 Mon Sep 17 00:00:00 2001 From: Tim te Beek Date: Sun, 20 Aug 2023 12:24:03 +0000 Subject: [PATCH] [MNG-6847] Use diamond operator As discussed on - https://github.com/apache/maven-scm/pull/184 - https://issues.apache.org/jira/browse/MNG-6847 Review requested of @elharo Use this link to re-run the recipe: https://app.moderne.io/recipes/org.openrewrite.staticanalysis.UseDiamondOperator?organizationId=QXBhY2hlIE1hdmVu Co-authored-by: Moderne --- .../eclipse/aether/internal/impl/DefaultRepositorySystem.java | 2 +- .../aether/internal/impl/StubFileTransformerManager.java | 2 +- .../aether/internal/test/util/IniArtifactDataReader.java | 2 +- .../java/org/eclipse/aether/transport/http/HttpServer.java | 2 +- .../util/filter/PatternExclusionsDependencyFilterTest.java | 4 ++-- .../util/filter/PatternInclusionsDependencyFilterTest.java | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositorySystem.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositorySystem.java index 8477d5bb3..b0e816cc2 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositorySystem.java +++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositorySystem.java @@ -419,7 +419,7 @@ public List newResolutionRepositories( validateRepositories(repositories); repositories = remoteRepositoryManager.aggregateRepositories( - session, new ArrayList(), repositories, true); + session, new ArrayList<>(), repositories, true); return repositories; } diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StubFileTransformerManager.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StubFileTransformerManager.java index 284858bbb..808f60537 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StubFileTransformerManager.java +++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StubFileTransformerManager.java @@ -37,7 +37,7 @@ public Collection getTransformersForArtifact(Artifact artifact) public void addFileTransformer(String extension, FileTransformer fileTransformer) { if (!fileTransformers.containsKey(extension)) { - fileTransformers.put(extension, new HashSet()); + fileTransformers.put(extension, new HashSet<>()); } fileTransformers.get(extension).add(fileTransformer); } diff --git a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/IniArtifactDataReader.java b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/IniArtifactDataReader.java index 3d0718dd2..c524acfb4 100644 --- a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/IniArtifactDataReader.java +++ b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/IniArtifactDataReader.java @@ -118,7 +118,7 @@ private ArtifactDescription parse(Reader reader) throws IOException { String name = line.substring(1, line.length() - 1); name = name.replace("-", "").toUpperCase(Locale.ENGLISH); state = State.valueOf(name); - sections.put(state, new ArrayList()); + sections.put(state, new ArrayList<>()); } catch (IllegalArgumentException e) { throw new IOException("unknown section: " + line); } diff --git a/maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpServer.java b/maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpServer.java index 0c46e31fa..29ff91a55 100644 --- a/maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpServer.java +++ b/maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpServer.java @@ -113,7 +113,7 @@ public enum ChecksumHeader { private final AtomicInteger connectionsToClose = new AtomicInteger(0); - private List logEntries = Collections.synchronizedList(new ArrayList()); + private List logEntries = Collections.synchronizedList(new ArrayList<>()); public String getHost() { return "localhost"; diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/PatternExclusionsDependencyFilterTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/PatternExclusionsDependencyFilterTest.java index 3a716b390..e6d1c00e3 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/PatternExclusionsDependencyFilterTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/PatternExclusionsDependencyFilterTest.java @@ -177,11 +177,11 @@ public void acceptTestRange() { } private boolean dontAccept(DependencyNode node, String expression) { - return !new PatternExclusionsDependencyFilter(expression).accept(node, new LinkedList()); + return !new PatternExclusionsDependencyFilter(expression).accept(node, new LinkedList<>()); } private boolean dontAcceptVersionRange(DependencyNode node, String... expression) { return !new PatternExclusionsDependencyFilter(new GenericVersionScheme(), expression) - .accept(node, new LinkedList()); + .accept(node, new LinkedList<>()); } } diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/PatternInclusionsDependencyFilterTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/PatternInclusionsDependencyFilterTest.java index 3117a24ad..9b022d595 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/PatternInclusionsDependencyFilterTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/PatternInclusionsDependencyFilterTest.java @@ -169,11 +169,11 @@ public void acceptTestRange() { } public boolean accept(DependencyNode node, String expression) { - return new PatternInclusionsDependencyFilter(expression).accept(node, new LinkedList()); + return new PatternInclusionsDependencyFilter(expression).accept(node, new LinkedList<>()); } public boolean acceptVersionRange(DependencyNode node, String... expression) { return new PatternInclusionsDependencyFilter(new GenericVersionScheme(), expression) - .accept(node, new LinkedList()); + .accept(node, new LinkedList<>()); } }