Skip to content

Refactor #461 - Remove addDefaultPropertiesFileToTopModules flag #469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 14, 2022
Merged

Refactor #461 - Remove addDefaultPropertiesFileToTopModules flag #469

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d6839b7
Refactor #461 - Remove `addDefaultPropertiesFileToTopModules` flag
Oct 7, 2022
3689eda
Merge branch 'main' into gh-461
fabapp2 Oct 7, 2022
776d751
Merge branch 'main' into gh-461
fabapp2 Oct 7, 2022
bc08523
Changes as per review comments
Oct 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ...ents/sbm-recipes-boot-upgrade/src/main/resources/recipes/boot-2.7-3.0-upgrade-report.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
32 changes: 17 additions & 15 deletions ...springframework/sbm/boot/properties/actions/AddSpringBootApplicationPropertiesAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,33 +30,35 @@
import java.nio.file.Path;

@NoArgsConstructor
@AllArgsConstructor
@Getter
@Setter
@SuperBuilder
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()) {
SpringBootApplicationProperties springBootApplicationProperties =
SpringBootApplicationProperties.newApplicationProperties(
context.getProjectRootDirectory(), APPLICATION_PROPERTIES_PATH);
context.getApplicationModules()
.getRootModule().getMainResourceSet()
.addResource(springBootApplicationProperties);
} 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);
}

Expand Down
1 change: 0 additions & 1 deletion components/sbm-support-boot/src/main/resources/recipes/initialize-spring-boot-migration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@
</build>

- type: org.springframework.sbm.boot.properties.actions.AddSpringBootApplicationPropertiesAction
addDefaultPropertiesFileToTopModules: true
condition:
type: org.springframework.sbm.boot.properties.conditions.NoSpringBootApplicationPropertiesExists
description: Create application.properties file.
Expand Down