Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change log messages to use singular or plural instead of "noun(s)"

Browse Source 
See gh-37017
This commit is contained in:
teacmity
2023-08-17 12:52:15 +00:00
committed by Andy Wilkinson
parent ef59326b44
commit c6c7fbc15f
6 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/RunIntegrationTests.java
View File

@@ -38,7 +38,7 @@ class RunIntegrationTests {
@TestTemplate
void whenTheRunGoalIsExecutedTheApplicationIsForkedWithOptimizedJvmArguments(MavenBuild mavenBuild) {
mavenBuild.project("run").goals("spring-boot:run", "-X").execute((project) -> {
String jvmArguments = "JVM argument(s): -XX:TieredStopAtLevel=1";
String jvmArguments = "JVM argument: -XX:TieredStopAtLevel=1";
assertThat(buildLog(project)).contains("I haz been run").contains(jvmArguments);
});
}

12
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java
View File

@@ -277,12 +277,14 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
private void addArgs(List<String> args) {
RunArguments applicationArguments = resolveApplicationArguments();
Collections.addAll(args, applicationArguments.asArray());
logArguments("Application argument(s): ", applicationArguments.asArray());
String suffix = (applicationArguments.asArray().length == 1) ? "" : "s";
logArguments("Application argument" + suffix + ": ", applicationArguments.asArray());
}
private Map<String, String> determineEnvironmentVariables() {
EnvVariables envVariables = resolveEnvVariables();
logArguments("Environment variable(s): ", envVariables.asArray());
String suffix = (envVariables.asArray().length == 1) ? "" : "s";
logArguments("Environment variable" + suffix + ": ", envVariables.asArray());
return envVariables.asMap();
}
@@ -307,7 +309,8 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
private void addJvmArgs(List<String> args) {
RunArguments jvmArguments = resolveJvmArguments();
Collections.addAll(args, jvmArguments.asArray());
logArguments("JVM argument(s): ", jvmArguments.asArray());
String suffix = (jvmArguments.asArray().length == 1) ? "" : "s";
logArguments("JVM argument" + suffix + ": ", jvmArguments.asArray());
}
private void addAgents(List<String> args) {
@@ -334,7 +337,8 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
}
}
arguments.getArgs().addFirst(arg.toString());
logArguments("Active profile(s): ", this.profiles);
String suffix = (this.profiles.length == 1) ? "" : "s";
logArguments("Active profile" + suffix + ": ", this.profiles);
}
}