WIP

Author: fabapp2

applications/rest-service/src/main/java/org/springframework/sbm/ReportController.java

@@ -38,6 +38,8 @@ class ReportController{
     @Autowired
     private ProjectContextHolder contextHolder;
 
+    private final String REPORT_RECIPE = "sbu30-report";
+
     @GetMapping(path = "/spring-boot-upgrade", produces = MediaType.TEXT_HTML_VALUE)
     @ResponseBody
     public String upgrade() {
@@ -48,34 +50,18 @@ public String upgrade() {
     @PostMapping(path = "/spring-boot-upgrade", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.TEXT_HTML_VALUE)
     @ResponseBody
     public String applyRecipes(@RequestParam("recipeNames[]") String[] recipeNames) {
-        /*
         ProjectContext context = contextHolder.getProjectContext();
         List.of(recipeNames).forEach(recipeName -> applyCommand.execute(context, recipeName));
-        applyCommand.execute(context, "boot-2.7-3.0-upgrade-report2");
-
-         */
-        try {
-            Thread.sleep(5000);
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-        }
+        applyCommand.execute(context, REPORT_RECIPE);
         return reportHolder.getReport();
     }
 
     @PostMapping(path = "/spring-boot-upgrade")
     @ResponseBody
     public void applyRecipes2(@RequestBody String recipeNames) {
-        /*
         ProjectContext context = contextHolder.getProjectContext();
         List.of(recipeNames).forEach(recipeName -> applyCommand.execute(context, recipeName));
-        applyCommand.execute(context, "boot-2.7-3.0-upgrade-report2");
-
-         */
-        try {
-            Thread.sleep(5000);
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-        }
+        applyCommand.execute(context, REPORT_RECIPE);
     }
 
 }

applications/rest-service/src/main/java/org/springframework/sbm/SpringBootMigratorRunner.java

@@ -31,6 +31,7 @@ public class SpringBootMigratorRunner implements ApplicationRunner {
     private final ScanCommand scanCommand;
     private final ProjectContextHolder contextHolder;
     private final ApplyCommand applyCommand;
+    private final String REPORT_RECIPE = "sbu30-report";
 
     @Override
     public void run(ApplicationArguments args) {
@@ -42,7 +43,7 @@ public void run(ApplicationArguments args) {
         System.out.println("Scanning " + applicationPath);
         ProjectContext context = scanCommand.execute(applicationPath);
         contextHolder.setProjectContext(context);
-        applyCommand.execute(contextHolder.getProjectContext(), "boot-2.7-3.0-upgrade-report2");
+        applyCommand.execute(contextHolder.getProjectContext(), REPORT_RECIPE);
         System.out.println("finished scan. Please open: http://localhost:8080/spring-boot-upgrade");
     }
 

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

@@ -31,7 +31,7 @@
 @RequiredArgsConstructor
 public class SbmRecipeLoader implements RecipeLoader {
 
-    static final String PATTERN = "classpath*:/recipes/*";
+    static final String PATTERN = "classpath*:/recipes/**/*.yaml";
     private final RecipeParser recipeParser;
     private final ResourceHelper resourceHelper;
 

components/sbm-recipes-boot-upgrade/src/main/java/org/springframework/sbm/boot/upgrade_27_30/report/SpringBootUpgradeReportSection.java

@@ -241,6 +241,7 @@ private String renderRemediation() {
         sb.append(remediation.getDescription()).append(ls).append(ls);
         if(remediation.getPossibilities().isEmpty()) {
             renderResourcesList(sb, remediation);
+            renderRecipeButton(sb, remediation.getRecipe());
         } else {
             remediation.getPossibilities().forEach(p -> renderRemediationPossibility(sb, p));
         }
@@ -251,8 +252,11 @@ private void renderRemediationPossibility(StringBuilder sb, RemediationPossibili
         sb.append("===== ").append(p.getTitle()).append(ls);
         sb.append(p.getDescription()).append(ls).append(ls);
         renderResourcesList(sb, p);
+        renderRecipeButton(sb, p.getRecipe());
+    }
 
-        if(p.getRecipe() != null) {
+    private void renderRecipeButton(StringBuilder sb, String recipe) {
+        if(recipe != null && !recipe.isEmpty()) {
             sb.append(ls).append(ls);
             /*
             <!--
@@ -275,10 +279,9 @@ private void renderRemediationPossibility(StringBuilder sb, RemediationPossibili
                     </div>                
                     ++++
                     """;
-            buttonCode = buttonCode.replace("<RECIPE>", p.getRecipe());
+            buttonCode = buttonCode.replace("<RECIPE>", recipe);
             sb.append(buttonCode);
         }
-
     }
 
     private void renderResourcesList(StringBuilder sb, ResourceList p) {

components/sbm-recipes-boot-upgrade/src/main/resources/recipes/27_30/report/sbu30-report.yaml

@@ -85,6 +85,19 @@
         This section lists the changes SBM found to be applicable to upgrade the scanned application to Spring Boot 3.0.0.
 
       sections:
+        - title: Add Spring Boot dependency and plugin milestone repository
+          helper: org.springframework.sbm.boot.upgrade_27_30.report.helper.MissingHelper
+          change: |-
+            As currently only milestone releases exist these are required
+          affected: |-
+            You want to update to 3.0 so you're affected
+          remediation:
+            description: |-
+              Add Spring Boot milestone repositories.
+            recipe: sbu30-add-milestone-repositories
+          gitHubIssue: 441
+          contributors:
+            - "Fabian Krüger[@fabapp2]"
 
         - title: Changes to Data Properties
           helper: org.springframework.sbm.boot.upgrade_27_30.report.helper.ChangesToDataPropertiesHelper
@@ -123,8 +136,8 @@
           remediation:
             description: |-
               Set `logging.pattern.dateformat=yyyy-MM-dd HH:mm:ss.SSS` to fall back to the previous log format.
+            recipe: sbu30-225-logging-date-format
           gitHubIssue: 489
-          recipe: sbu30-225-logging-date-format
           contributors:
             - "Fabian Krüger[@fabapp2]"
 
@@ -175,6 +188,7 @@
               for more information
             resources:
               - https://github.com/spring-projects-experimental/spring-boot-migrator/issues/166[Issue 166]
+            recipe: sbu30-remove-construtor-binding
           gitHubIssue: 166
           recipe: boot-2.7-3.0-upgrade-report
           contributors:
@@ -320,6 +334,7 @@
           remediation:
             description: |-
               If one requires the old behavior one must extend not only the sorting repository, but also the respective CRUD repository explicitly. This was done so the sorting support could easily be combined with the List repositories introduced above.
+            recipe: sbu30-paging-and-sorting-repository
           gitHubIssue: 518
           contributors:
             - "Sandeep Nagaraj[@sanagaraj-pivotal]"