From 50fbaeb05bc6b3d8ffaa887dc0dc64e53f1b6eb6 Mon Sep 17 00:00:00 2001 From: Tim te Beek Date: Sat, 19 Aug 2023 20:47:34 +0000 Subject: [PATCH 1/2] [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/it/MavenITmng0768OfflineModeTest.java | 2 +- .../it/MavenITmng4348NoUnnecessaryRepositoryAccessTest.java | 2 +- .../MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java | 2 +- .../it/MavenITmng4554PluginPrefixMappingUpdateTest.java | 6 +++--- ...2PluginVersionResolutionDoesntTouchDisabledRepoTest.java | 2 +- .../maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java | 2 +- .../maven/it/MavenITmng6057CheckReactorOrderTest.java | 2 +- .../org/apache/maven/it/MavenITmng6391PrintVersionTest.java | 2 +- .../src/main/java/org/apache/maven/it/mng3203/App.java | 2 +- .../TestLifecycleMappingDelegate.java | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java index 339fd6d38..4b6689b3b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java @@ -60,7 +60,7 @@ public MavenITmng0768OfflineModeTest() { public void testitMNG768() throws Exception { File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-0768"); - final List requestedUris = Collections.synchronizedList(new ArrayList()); + final List requestedUris = Collections.synchronizedList(new ArrayList<>()); Handler repoHandler = new AbstractHandler() { public void handle( diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4348NoUnnecessaryRepositoryAccessTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4348NoUnnecessaryRepositoryAccessTest.java index 799e7c406..e3e655a93 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4348NoUnnecessaryRepositoryAccessTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4348NoUnnecessaryRepositoryAccessTest.java @@ -60,7 +60,7 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); - final List requestedUris = Collections.synchronizedList(new ArrayList()); + final List requestedUris = Collections.synchronizedList(new ArrayList<>()); Handler repoHandler = new AbstractHandler() { @Override diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java index 4bb1ab022..ab0ad0cc5 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java @@ -62,7 +62,7 @@ public void testit() throws Exception { String pomUri = "/repo/org/apache/maven/its/mng4500/dep/0.1-SNAPSHOT/dep-0.1-20091219.230823-1.pom"; String jarUri = "/repo/org/apache/maven/its/mng4500/dep/0.1-SNAPSHOT/dep-0.1-20091219.230823-1.jar"; - final List requestedUris = Collections.synchronizedList(new ArrayList()); + final List requestedUris = Collections.synchronizedList(new ArrayList<>()); AbstractHandler logHandler = new AbstractHandler() { @Override diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java index dea98e65f..fefed4676 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java @@ -63,7 +63,7 @@ public void testitCached() throws Exception { String metadataUri = "/repo-1/org/apache/maven/its/mng4554/maven-metadata.xml"; - final List requestedUris = Collections.synchronizedList(new ArrayList()); + final List requestedUris = Collections.synchronizedList(new ArrayList<>()); AbstractHandler logHandler = new AbstractHandler() { @Override @@ -142,7 +142,7 @@ public void testitForcedUpdate() throws Exception { String metadataUri = "/repo-1/org/apache/maven/its/mng4554/maven-metadata.xml"; - final List requestedUris = Collections.synchronizedList(new ArrayList()); + final List requestedUris = Collections.synchronizedList(new ArrayList<>()); AbstractHandler logHandler = new AbstractHandler() { @Override @@ -224,7 +224,7 @@ public void testitRefetched() throws Exception { String metadataUri = "/repo-it/org/apache/maven/its/mng4554/maven-metadata.xml"; - final List requestedUris = Collections.synchronizedList(new ArrayList()); + final List requestedUris = Collections.synchronizedList(new ArrayList<>()); AbstractHandler logHandler = new AbstractHandler() { @Override diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4772PluginVersionResolutionDoesntTouchDisabledRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4772PluginVersionResolutionDoesntTouchDisabledRepoTest.java index 011a18b78..aea30bd82 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4772PluginVersionResolutionDoesntTouchDisabledRepoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4772PluginVersionResolutionDoesntTouchDisabledRepoTest.java @@ -59,7 +59,7 @@ public MavenITmng4772PluginVersionResolutionDoesntTouchDisabledRepoTest() { public void testit() throws Exception { File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-4772"); - final List requestedUris = Collections.synchronizedList(new ArrayList()); + final List requestedUris = Collections.synchronizedList(new ArrayList<>()); AbstractHandler logHandler = new AbstractHandler() { @Override diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java index 810201562..697cee2dd 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java @@ -61,7 +61,7 @@ public void testit() throws Exception { String metadataUri = "org/apache/maven/its/mng5064/dep/0.1-SNAPSHOT/maven-metadata.xml"; - final List requestedUris = Collections.synchronizedList(new ArrayList()); + final List requestedUris = Collections.synchronizedList(new ArrayList<>()); AbstractHandler logHandler = new AbstractHandler() { @Override diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6057CheckReactorOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6057CheckReactorOrderTest.java index 5ba8a4057..56e69d25e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6057CheckReactorOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6057CheckReactorOrderTest.java @@ -84,7 +84,7 @@ public void testitReactorShouldResultInExpectedOrder() throws Exception { * */ private List extractReactorBuildOrder(List loadedLines) { - List resultingLines = new LinkedList(); + List resultingLines = new LinkedList<>(); boolean start = false; for (String line : loadedLines) { if (start) { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6391PrintVersionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6391PrintVersionTest.java index 8bfac3282..cd56d7b7a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6391PrintVersionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6391PrintVersionTest.java @@ -144,7 +144,7 @@ public void testitShouldPrintVersionInAllLines() throws Exception { * */ private List extractReactorBuildOrder(List loadedLines) { - List resultingLines = new LinkedList(); + List resultingLines = new LinkedList<>(); boolean start = false; for (String line : loadedLines) { if (start) { diff --git a/core-it-suite/src/test/resources/mng-3203/src/main/java/org/apache/maven/it/mng3203/App.java b/core-it-suite/src/test/resources/mng-3203/src/main/java/org/apache/maven/it/mng3203/App.java index 569e06357..73b77163f 100644 --- a/core-it-suite/src/test/resources/mng-3203/src/main/java/org/apache/maven/it/mng3203/App.java +++ b/core-it-suite/src/test/resources/mng-3203/src/main/java/org/apache/maven/it/mng3203/App.java @@ -27,6 +27,6 @@ */ public class App { public static void main(String[] args) { - List stuff = new ArrayList(); + List stuff = new ArrayList<>(); } } diff --git a/core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/extension/src/main/java/org/apache/maven/its/mng5581/lifecyclemappingdelegate/TestLifecycleMappingDelegate.java b/core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/extension/src/main/java/org/apache/maven/its/mng5581/lifecyclemappingdelegate/TestLifecycleMappingDelegate.java index 88063a9e7..8439f0522 100644 --- a/core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/extension/src/main/java/org/apache/maven/its/mng5581/lifecyclemappingdelegate/TestLifecycleMappingDelegate.java +++ b/core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/extension/src/main/java/org/apache/maven/its/mng5581/lifecyclemappingdelegate/TestLifecycleMappingDelegate.java @@ -57,7 +57,7 @@ public Map> calculateLifecycleMappings( throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException, MojoNotFoundException, InvalidPluginDescriptorException { - Map> pluginExecutions = new LinkedHashMap>(); + Map> pluginExecutions = new LinkedHashMap<>(); for (Plugin plugin : project.getBuild().getPlugins()) { for (PluginExecution execution : plugin.getExecutions()) { From b4f1dc01b6abdc2705349b3fb36d5683f15f1558 Mon Sep 17 00:00:00 2001 From: Tim te Beek Date: Wed, 23 Aug 2023 10:08:04 +0100 Subject: [PATCH 2/2] Restore core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/extension/src/main/java/org/apache/maven/its/mng5581/lifecyclemappingdelegate/TestLifecycleMappingDelegate.java --- .../lifecyclemappingdelegate/TestLifecycleMappingDelegate.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/extension/src/main/java/org/apache/maven/its/mng5581/lifecyclemappingdelegate/TestLifecycleMappingDelegate.java b/core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/extension/src/main/java/org/apache/maven/its/mng5581/lifecyclemappingdelegate/TestLifecycleMappingDelegate.java index 8439f0522..88063a9e7 100644 --- a/core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/extension/src/main/java/org/apache/maven/its/mng5581/lifecyclemappingdelegate/TestLifecycleMappingDelegate.java +++ b/core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/extension/src/main/java/org/apache/maven/its/mng5581/lifecyclemappingdelegate/TestLifecycleMappingDelegate.java @@ -57,7 +57,7 @@ public Map> calculateLifecycleMappings( throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException, MojoNotFoundException, InvalidPluginDescriptorException { - Map> pluginExecutions = new LinkedHashMap<>(); + Map> pluginExecutions = new LinkedHashMap>(); for (Plugin plugin : project.getBuild().getPlugins()) { for (PluginExecution execution : plugin.getExecutions()) {