MigrateJaxRsRecipe adds required=false to all @RequestParam with unset required (#422)

Author: fabapp2

components/sbm-core/src/main/java/org/springframework/sbm/engine/recipe/OpenRewriteDeclarativeRecipeAdapter.java

@@ -18,12 +18,12 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.*;
+import lombok.experimental.SuperBuilder;
 import org.openrewrite.Recipe;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.sbm.engine.context.ProjectContext;
 
-@Builder
-@NoArgsConstructor
+@SuperBuilder
 @AllArgsConstructor
 public class OpenRewriteDeclarativeRecipeAdapter extends AbstractAction {
     @Setter
@@ -32,11 +32,17 @@ public class OpenRewriteDeclarativeRecipeAdapter extends AbstractAction {
 
     @Autowired
     @JsonIgnore
+    @Setter
     private RewriteRecipeLoader rewriteRecipeLoader;
     @JsonIgnore
     @Autowired
+    @Setter
     private RewriteRecipeRunner rewriteRecipeRunner;
 
+    public OpenRewriteDeclarativeRecipeAdapter() {
+        super(builder());
+    }
+
     @Override
     public boolean isApplicable(ProjectContext context) {
         return super.isApplicable(context);

components/sbm-core/src/test/java/org/springframework/sbm/engine/recipe/OpenRewriteDeclarativeRecipeAdapterIntegrationTest.java

@@ -61,6 +61,8 @@ void adapterActionShouldExecuteOpenRewriteYamlRecipe() throws IOException {
                         "    type: org.springframework.sbm.common.migration.conditions.TrueCondition\n" +
                         "  actions:\n" +
                         "    - type: org.springframework.sbm.engine.recipe.OpenRewriteDeclarativeRecipeAdapter\n" +
+                        "      condition:\n" +
+                        "        type: org.springframework.sbm.common.migration.conditions.TrueCondition\n" +
                         "      description: Call a OpenRewrite recipe\n" +
                         "      openRewriteRecipe: |-\n" +
                         "        type: specs.openrewrite.org/v1beta/recipe\n" +

components/sbm-recipes-jee-to-boot/src/main/java/org/springframework/sbm/jee/jaxrs/MigrateJaxRsRecipe.java

@@ -23,8 +23,12 @@
 import org.springframework.sbm.build.api.Dependency;
 import org.springframework.sbm.build.migration.actions.AddDependencies;
 import org.springframework.sbm.build.migration.conditions.NoExactDependencyExist;
+import org.springframework.sbm.engine.recipe.OpenRewriteDeclarativeRecipeAdapter;
 import org.springframework.sbm.engine.recipe.Recipe;
+import org.springframework.sbm.engine.recipe.RewriteRecipeLoader;
+import org.springframework.sbm.engine.recipe.RewriteRecipeRunner;
 import org.springframework.sbm.java.JavaRecipeAction;
+import org.springframework.sbm.java.impl.ClasspathRegistry;
 import org.springframework.sbm.java.migration.actions.ReplaceTypeAction;
 import org.springframework.sbm.java.migration.conditions.HasAnnotation;
 import org.springframework.sbm.java.migration.conditions.HasImportStartingWith;
@@ -34,19 +38,21 @@
 import org.springframework.sbm.jee.jaxrs.recipes.SwapCacheControl;
 import org.springframework.sbm.jee.jaxrs.recipes.SwapHttHeaders;
 import org.springframework.sbm.jee.jaxrs.recipes.SwapResponseWithResponseEntity;
+import org.springframework.sbm.support.openrewrite.java.AddOrReplaceAnnotationAttribute;
 
 import java.util.List;
 import java.util.function.Supplier;
 
 @Configuration
-@RequiredArgsConstructor
+//@RequiredArgsConstructor
 public class MigrateJaxRsRecipe {
 
 
-    private final JavaParser javaParserSupplier;
+    private final JavaParser javaParserSupplier = JavaParser.fromJavaVersion().classpath(
+            ClasspathRegistry.getInstance().getCurrentDependencies()).build();
 
     @Bean
-    public Recipe jaxRs() {
+    public Recipe jaxRs(RewriteRecipeLoader rewriteRecipeLoader, RewriteRecipeRunner rewriteRecipeRunner) {
         return Recipe.builder()
                 .name("migrate-jax-rs")
                 .order(60)
@@ -121,6 +127,26 @@ public Recipe jaxRs() {
                                         .condition(HasImportStartingWith.builder().value("javax.ws.rs.core.Response").build())
                                         .description("Replace JaxRs Response and ResponseBuilder with it's Spring equivalent.")
                                         .recipe(new SwapResponseWithResponseEntity(() -> javaParserSupplier))
+                                        .build(),
+
+                                OpenRewriteDeclarativeRecipeAdapter.builder()
+                                        .condition(HasAnnotation.builder().annotation("org.springframework.web.bind.annotation.RequestParam").build())
+                                        .description("Adds required=false to all @RequestParam annotations")
+                                        .rewriteRecipeLoader(rewriteRecipeLoader)
+                                        .rewriteRecipeRunner(rewriteRecipeRunner)
+                                        .openRewriteRecipe(
+                                                """
+                                                type: specs.openrewrite.org/v1beta/recipe
+                                                name: org.openrewrite.java.spring.boot3.data.UpgradeSpringData30
+                                                displayName: Upgrade to SpringBoot 3.0
+                                                description: 'Upgrade to SpringBoot to 3.0 from any prior version.'
+                                                recipeList:
+                                                  - org.openrewrite.java.AddOrUpdateAnnotationAttribute:
+                                                      annotationType: "org.springframework.web.bind.annotation.RequestParam"
+                                                      attributeName: "required"
+                                                      attributeValue: "false"
+                                                      addOnly: true
+                                                """)
                                         .build()
                         )
                 )

components/sbm-recipes-jee-to-boot/src/test/java/org/springframework/sbm/jee/jaxrs/recipes/BootifyJaxRsAnnotationsRecipeTest.java

@@ -15,6 +15,7 @@
  */
 package org.springframework.sbm.jee.jaxrs.recipes;
 
+import org.springframework.sbm.engine.recipe.OpenRewriteDeclarativeRecipeAdapter;
 import org.springframework.sbm.java.impl.RewriteJavaParser;
 import org.springframework.sbm.project.resource.SbmApplicationProperties;
 import org.springframework.sbm.test.RecipeTestSupport;
@@ -33,7 +34,7 @@ public class BootifyJaxRsAnnotationsRecipeTest {
     @Test
     void test() {
 
-        Recipe jaxRsRecipe = new MigrateJaxRsRecipe(new RewriteJavaParser(new SbmApplicationProperties())).jaxRs();
+        Recipe jaxRsRecipe = new MigrateJaxRsRecipe().jaxRs(null, null);
         Optional<Recipe> recipe = Optional.of(jaxRsRecipe);
         RecipeTestSupport.assertThatRecipeExists(recipe);
         RecipeTestSupport.assertThatRecipeHasActions(recipe,
@@ -46,6 +47,7 @@ void test() {
                 JavaRecipeAction.class,
                 JavaRecipeAction.class,
                 JavaRecipeAction.class,
-                JavaRecipeAction.class);
+                JavaRecipeAction.class,
+                OpenRewriteDeclarativeRecipeAdapter.class);
     }
 }

components/sbm-support-boot/src/test/java/org/springframework/sbm/boot/common/conditions/HasSpringBootDependencyManuallyManagedTest.java

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.sbm.boot.common.conditions;
 
 import org.junit.jupiter.api.Test;