diff --git a/components/sbm-recipes-boot-upgrade/src/main/resources/recipes/boot-2.7-3.0-upgrade-report.yaml b/components/sbm-recipes-boot-upgrade/src/main/resources/recipes/boot-2.7-3.0-upgrade-report.yaml index af16cc6f7..9834e8659 100644 --- a/components/sbm-recipes-boot-upgrade/src/main/resources/recipes/boot-2.7-3.0-upgrade-report.yaml +++ b/components/sbm-recipes-boot-upgrade/src/main/resources/recipes/boot-2.7-3.0-upgrade-report.yaml @@ -13,7 +13,6 @@ description: "Adds default spring boot properties to project. For multi-module project, adds default spring boot properties to every module with jar packaging" condition: type: org.springframework.sbm.boot.upgrade_27_30.conditions.LoggingDateFormatCondition - addDefaultPropertiesFileToTopModules: true - type: org.springframework.sbm.boot.upgrade_27_30.actions.Boot_27_30_AddLoggingDateFormat description: "Sets logging date format to yyyy-MM-dd HH:mm:ss.SSS" condition: diff --git a/components/sbm-support-boot/src/main/java/org/springframework/sbm/boot/properties/actions/AddSpringBootApplicationPropertiesAction.java b/components/sbm-support-boot/src/main/java/org/springframework/sbm/boot/properties/actions/AddSpringBootApplicationPropertiesAction.java index d2be10695..e4013caa3 100644 --- a/components/sbm-support-boot/src/main/java/org/springframework/sbm/boot/properties/actions/AddSpringBootApplicationPropertiesAction.java +++ b/components/sbm-support-boot/src/main/java/org/springframework/sbm/boot/properties/actions/AddSpringBootApplicationPropertiesAction.java @@ -30,7 +30,6 @@ import java.nio.file.Path; @NoArgsConstructor -@AllArgsConstructor @Getter @Setter @SuperBuilder @@ -38,25 +37,24 @@ public class AddSpringBootApplicationPropertiesAction extends AbstractAction { public static final Path APPLICATION_PROPERTIES_PATH = Path.of("src/main/resources/application.properties"); - private Boolean addDefaultPropertiesFileToTopModules = Boolean.FALSE; - @Override public void apply(ProjectContext context) { - if(addDefaultPropertiesFileToTopModules){ - context.getApplicationModules() - .getTopmostApplicationModules() - .stream() - .forEach(this::apply); - } else { - SpringBootApplicationProperties springBootApplicationProperties = - SpringBootApplicationProperties.newApplicationProperties( - context.getProjectRootDirectory(), APPLICATION_PROPERTIES_PATH); - context.getProjectResources().add(springBootApplicationProperties); - } + if(context.getApplicationModules().isSingleModuleApplication()) { + Module rootModule = context.getApplicationModules().getRootModule(); + this.apply(rootModule); + } else { + context.getApplicationModules() + .getTopmostApplicationModules() + .forEach(this::apply); + } } public void apply(Module module) { - SpringBootApplicationProperties springBootApplicationProperties = SpringBootApplicationProperties.newApplicationProperties(module.getProjectRootDirectory(), module.getModulePath().resolve(APPLICATION_PROPERTIES_PATH)); + SpringBootApplicationProperties springBootApplicationProperties = SpringBootApplicationProperties + .newApplicationProperties( + module.getProjectRootDirectory(), + module.getModulePath().resolve(APPLICATION_PROPERTIES_PATH) + ); module.getMainResourceSet().addResource(springBootApplicationProperties); } diff --git a/components/sbm-support-boot/src/main/resources/recipes/initialize-spring-boot-migration.yaml b/components/sbm-support-boot/src/main/resources/recipes/initialize-spring-boot-migration.yaml index 39feb4eee..ca01d300b 100644 --- a/components/sbm-support-boot/src/main/resources/recipes/initialize-spring-boot-migration.yaml +++ b/components/sbm-support-boot/src/main/resources/recipes/initialize-spring-boot-migration.yaml @@ -115,7 +115,6 @@ - type: org.springframework.sbm.boot.properties.actions.AddSpringBootApplicationPropertiesAction - addDefaultPropertiesFileToTopModules: true condition: type: org.springframework.sbm.boot.properties.conditions.NoSpringBootApplicationPropertiesExists description: Create application.properties file.