Skip to content

Commit a277580

Browse files
authored
Refactor #461 - Remove addDefaultPropertiesFileToTopModules flag (#469)
1 parent 8525fb8 commit a277580

File tree

3 files changed

+13
-17
lines changed

3 files changed

+13
-17
lines changed

components/sbm-recipes-boot-upgrade/src/main/resources/recipes/boot-2.7-3.0-upgrade-report.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
description: "Adds default spring boot properties to project. For multi-module project, adds default spring boot properties to every module with jar packaging"
1414
condition:
1515
type: org.springframework.sbm.boot.upgrade_27_30.conditions.LoggingDateFormatCondition
16-
addDefaultPropertiesFileToTopModules: true
1716
- type: org.springframework.sbm.boot.upgrade_27_30.actions.Boot_27_30_AddLoggingDateFormat
1817
description: "Sets logging date format to yyyy-MM-dd HH:mm:ss.SSS"
1918
condition:

components/sbm-support-boot/src/main/java/org/springframework/sbm/boot/properties/actions/AddSpringBootApplicationPropertiesAction.java

+13-15
Original file line numberDiff line numberDiff line change
@@ -30,33 +30,31 @@
3030
import java.nio.file.Path;
3131

3232
@NoArgsConstructor
33-
@AllArgsConstructor
3433
@Getter
3534
@Setter
3635
@SuperBuilder
3736
public class AddSpringBootApplicationPropertiesAction extends AbstractAction {
3837

3938
public static final Path APPLICATION_PROPERTIES_PATH = Path.of("src/main/resources/application.properties");
4039

41-
private Boolean addDefaultPropertiesFileToTopModules = Boolean.FALSE;
42-
4340
@Override
4441
public void apply(ProjectContext context) {
45-
if(addDefaultPropertiesFileToTopModules){
46-
context.getApplicationModules()
47-
.getTopmostApplicationModules()
48-
.stream()
49-
.forEach(this::apply);
50-
} else {
51-
SpringBootApplicationProperties springBootApplicationProperties =
52-
SpringBootApplicationProperties.newApplicationProperties(
53-
context.getProjectRootDirectory(), APPLICATION_PROPERTIES_PATH);
54-
context.getProjectResources().add(springBootApplicationProperties);
55-
}
42+
if(context.getApplicationModules().isSingleModuleApplication()) {
43+
Module rootModule = context.getApplicationModules().getRootModule();
44+
this.apply(rootModule);
45+
} else {
46+
context.getApplicationModules()
47+
.getTopmostApplicationModules()
48+
.forEach(this::apply);
49+
}
5650
}
5751

5852
public void apply(Module module) {
59-
SpringBootApplicationProperties springBootApplicationProperties = SpringBootApplicationProperties.newApplicationProperties(module.getProjectRootDirectory(), module.getModulePath().resolve(APPLICATION_PROPERTIES_PATH));
53+
SpringBootApplicationProperties springBootApplicationProperties = SpringBootApplicationProperties
54+
.newApplicationProperties(
55+
module.getProjectRootDirectory(),
56+
module.getModulePath().resolve(APPLICATION_PROPERTIES_PATH)
57+
);
6058
module.getMainResourceSet().addResource(springBootApplicationProperties);
6159
}
6260

components/sbm-support-boot/src/main/resources/recipes/initialize-spring-boot-migration.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@
115115
</build>
116116
117117
- type: org.springframework.sbm.boot.properties.actions.AddSpringBootApplicationPropertiesAction
118-
addDefaultPropertiesFileToTopModules: true
119118
condition:
120119
type: org.springframework.sbm.boot.properties.conditions.NoSpringBootApplicationPropertiesExists
121120
description: Create application.properties file.

0 commit comments

Comments
 (0)