root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

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

See gh-37017
This commit is contained in:
Andy Wilkinson 2024-01-11 14:44:07 +00:00
parent c6c7fbc15f
commit 6f4a8cc0c3
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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