Skip to content

Commit 1361d62

Browse files
committed
Move report generation into runner
1 parent 6df6928 commit 1361d62

File tree

2 files changed

+9
-23
lines changed

2 files changed

+9
-23
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class ReportController{
2828
@GetMapping(path = "/spring-boot-upgrade", produces = MediaType.TEXT_HTML_VALUE)
2929
@ResponseBody
3030
public String upgrade() {
31-
applyCommand.execute(contextHolder.getProjectContext(), "boot-2.7-3.0-upgrade-report2");
31+
// applyCommand.execute(contextHolder.getProjectContext(), "boot-2.7-3.0-upgrade-report2");
3232
return reportHolder.getReport();
3333
}
3434

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

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,48 +15,34 @@
1515
*/
1616
package org.springframework.sbm;
1717

18-
import org.springframework.beans.factory.annotation.Autowired;
18+
import lombok.RequiredArgsConstructor;
1919
import org.springframework.boot.ApplicationArguments;
2020
import org.springframework.boot.ApplicationRunner;
21-
import org.springframework.boot.SpringApplication;
22-
import org.springframework.boot.autoconfigure.SpringBootApplication;
2321
import org.springframework.context.annotation.Configuration;
24-
import org.springframework.context.event.EventListener;
25-
import org.springframework.http.MediaType;
26-
import org.springframework.sbm.boot.upgrade_27_30.report.SpringBootUpgradeReportFileSystemRenderer;
27-
import org.springframework.sbm.boot.upgrade_27_30.report.SpringBootUpgradeReportRenderer;
2822
import org.springframework.sbm.engine.commands.ApplyCommand;
2923
import org.springframework.sbm.engine.commands.ScanCommand;
3024
import org.springframework.sbm.engine.context.ProjectContext;
3125
import org.springframework.sbm.engine.context.ProjectContextHolder;
32-
import org.springframework.sbm.engine.events.*;
33-
import org.springframework.stereotype.Controller;
34-
import org.springframework.web.bind.annotation.GetMapping;
35-
import org.springframework.web.bind.annotation.PostMapping;
36-
import org.springframework.web.bind.annotation.RequestParam;
37-
import org.springframework.web.bind.annotation.ResponseBody;
38-
39-
import java.util.List;
4026

4127
@Configuration
42-
public class SpringBootMigratorRunner implements ApplicationRunner {
43-
44-
@Autowired
45-
private ScanCommand scanCommand;
28+
@RequiredArgsConstructor
29+
public class SpringBootMigratorRunner implements ApplicationRunner {
4630

47-
@Autowired
48-
private ProjectContextHolder contextHolder;
31+
private final ScanCommand scanCommand;
32+
private final ProjectContextHolder contextHolder;
33+
private final ApplyCommand applyCommand;
4934

5035
@Override
5136
public void run(ApplicationArguments args) {
52-
if(args.getSourceArgs().length == 0) {
37+
if (args.getSourceArgs().length == 0) {
5338
System.err.println("PLease provide the path to the application as parameter.");
5439
return;
5540
}
5641
String applicationPath = args.getSourceArgs()[0];
5742
System.out.println("Scanning " + applicationPath);
5843
ProjectContext context = scanCommand.execute(applicationPath);
5944
contextHolder.setProjectContext(context);
45+
applyCommand.execute(contextHolder.getProjectContext(), "boot-2.7-3.0-upgrade-report2");
6046
System.out.println("finished scan. Please open: http://localhost:8080/spring-boot-upgrade");
6147
}
6248

0 commit comments

Comments
 (0)