Merge branch 'main' into clarify-scope-of-maven-RemoveDependency

Author: timtebeek

rewrite-core/src/test/java/org/openrewrite/RecipeEstimatedEffortTest.java

@@ -39,7 +39,6 @@
 
 import static java.util.Collections.emptyList;
 import static java.util.Objects.requireNonNull;
-import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.openrewrite.Tree.randomId;
 import static org.openrewrite.marker.GitProvenance.AutoCRLF.False;
@@ -132,12 +131,12 @@ void customEstimatedEffortForRecipeThatGeneratesSourceFiles() {
           ));
     }
 
-    @ParameterizedTest
     @CsvSource({
       "'foo is here', 'bar is here', 10",           // Only recipe1 applies
       "'baz is here', 'qux is here', 5",            // Only recipe2 applies
       "'foo and baz are here', 'bar and qux are here', 15" // Both recipes apply
     })
+    @ParameterizedTest
     void estimatedTimeSavingsForMultipleRecipes(String beforeContent, String afterContent, int expectedMinutes) {
         // Create composite recipe with 2 recipes that have different estimated efforts
         Recipe recipe1 = new CustomEstimatedEffortFindReplaceRecipe("foo", "bar", Duration.ofMinutes(10));
@@ -288,7 +287,7 @@ public Collection<SourceFile> generate(AtomicBoolean shouldCreate, ExecutionCont
             if (shouldCreate.get()) {
                 return PlainTextParser.builder().build().parse(fileContents)
                   .map(brandNewFile -> (SourceFile) brandNewFile.withSourcePath(Path.of(relativeFileName)))
-                  .collect(toList());
+                  .toList();
             }
             return emptyList();
         }

rewrite-core/src/test/java/org/openrewrite/SingletonTest.java

@@ -39,8 +39,8 @@ class SingletonTest implements RewriteTest {
      * A simplified recipe that appends content to a text file.
      * Uses Singleton to ensure only one instance with the same content parameter makes changes.
      */
-    @Value
     @EqualsAndHashCode(callSuper = false)
+    @Value
     static class SingletonAppend extends Recipe {
         String content;
 

rewrite-core/src/test/java/org/openrewrite/TreeTest.java

@@ -57,11 +57,11 @@ public String afterSyntax(Marker marker, Cursor cursor, UnaryOperator<String> co
         );
     }
 
-    @ParameterizedTest
     @CsvSource({
         "true, '\uFEFFHello World'",
         "false, 'Hello World'"
     })
+    @ParameterizedTest
     void printBomHandling(boolean charsetBomMarked, String expected) {
         PlainText sourceFile = new PlainText(
             Tree.randomId(),

rewrite-docker/src/test/java/org/openrewrite/docker/search/FindBaseImagesTest.java

@@ -17,11 +17,12 @@
 
 import org.junit.jupiter.api.Test;
 import org.openrewrite.DocumentExample;
-import org.openrewrite.docker.Assertions;
 import org.openrewrite.docker.table.BaseImages;
 import org.openrewrite.test.RecipeSpec;
 import org.openrewrite.test.RewriteTest;
 
+import static org.openrewrite.docker.Assertions.docker;
+
 class FindBaseImagesTest implements RewriteTest {
 
     @Override
@@ -40,7 +41,7 @@ void findAllBaseImages() {
               Dockerfile,,ubuntu,22.04,,
               """
           ),
-          Assertions.docker(
+          docker(
             """
               FROM ubuntu:22.04
               RUN apt-get update
@@ -64,7 +65,7 @@ void findBaseImageWithPattern() {
                 Dockerfile,,ubuntu,22.04,,
                 """
             ),
-          Assertions.docker(
+          docker(
             """
               FROM ubuntu:22.04
               RUN apt-get update
@@ -81,7 +82,7 @@ void findBaseImageWithPattern() {
     void noMatchWithPattern() {
         rewriteRun(
           spec -> spec.recipe(new FindBaseImages("alpine*", null, null, null)),
-          Assertions.docker(
+          docker(
             """
               FROM ubuntu:22.04
               RUN apt-get update
@@ -100,7 +101,7 @@ void findBaseImageWithDigest() {
               Dockerfile,,ubuntu,,sha256:abc123,
               """
           ),
-          Assertions.docker(
+          docker(
             """
               FROM ubuntu@sha256:abc123
               RUN apt-get update
@@ -123,7 +124,7 @@ void findBaseImageWithPlatform() {
               Dockerfile,,ubuntu,22.04,,linux/amd64
               """
           ),
-          Assertions.docker(
+          docker(
             """
               FROM --platform=linux/amd64 ubuntu:22.04
               RUN apt-get update
@@ -146,7 +147,7 @@ void findBaseImageWithStageName() {
               Dockerfile,builder,golang,1.21,,
               """
           ),
-          Assertions.docker(
+          docker(
             """
               FROM golang:1.21 AS builder
               RUN go build -o app .
@@ -170,7 +171,7 @@ void findMultipleBaseImages() {
               Dockerfile,,alpine,latest,,
               """
           ),
-          Assertions.docker(
+          docker(
             """
               FROM golang:1.21 AS builder
               RUN go build -o app .
@@ -200,7 +201,7 @@ void filterByPatternInMultiStage() {
                 Dockerfile,,alpine,latest,,
                 """
             ),
-          Assertions.docker(
+          docker(
             """
               FROM golang:1.21 AS builder
               RUN go build -o app .
@@ -229,7 +230,7 @@ void findBaseImageWithAllDetails() {
               Dockerfile,base,ubuntu,22.04,,linux/arm64
               """
           ),
-          Assertions.docker(
+          docker(
             """
               FROM --platform=linux/arm64 ubuntu:22.04 AS base
               RUN apt-get update
@@ -252,7 +253,7 @@ void findBaseImageWithoutTag() {
               Dockerfile,,ubuntu,,,
               """
           ),
-          Assertions.docker(
+          docker(
             """
               FROM ubuntu
               RUN apt-get update
@@ -275,7 +276,7 @@ void findBaseImageWithGlobalArg() {
               Dockerfile,,"${BASE_IMAGE}","${BASE_TAG}",,
               """
           ),
-          Assertions.docker(
+          docker(
             """
               ARG BASE_IMAGE=ubuntu
               ARG BASE_TAG=22.04
@@ -303,7 +304,7 @@ void filterByTagPattern() {
                 Dockerfile,,ubuntu,22.04,,
                 """
             ),
-          Assertions.docker(
+          docker(
             """
               FROM ubuntu:22.04
               FROM ubuntu:20.04
@@ -329,7 +330,7 @@ void filterByDigestPattern() {
                 Dockerfile,,ubuntu,,sha256:abc123,
                 """
             ),
-          Assertions.docker(
+          docker(
             """
               FROM ubuntu@sha256:abc123
               FROM alpine@sha256:def456
@@ -353,7 +354,7 @@ void filterByPlatformPattern() {
                 Dockerfile,,ubuntu,22.04,,linux/arm64
                 """
             ),
-          Assertions.docker(
+          docker(
             """
               FROM --platform=linux/arm64 ubuntu:22.04
               FROM --platform=linux/amd64 alpine:latest
@@ -377,7 +378,7 @@ void filterByMultiplePatterns() {
                 Dockerfile,,ubuntu,22.04,,linux/amd64
                 """
             ),
-          Assertions.docker(
+          docker(
             """
               FROM --platform=linux/amd64 ubuntu:22.04
               FROM --platform=linux/arm64 ubuntu:22.04
@@ -398,7 +399,7 @@ void filterByMultiplePatterns() {
     void noMatchWithTagPattern() {
         rewriteRun(
           spec -> spec.recipe(new FindBaseImages(null, "18.*", null, null)),
-          Assertions.docker(
+          docker(
             """
               FROM ubuntu:22.04
               FROM ubuntu:20.04