From 6f4a8cc0c3c0354ddf5a0806fc46d6d945def0f0 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 11 Jan 2024 14:44:07 +0000 Subject: [PATCH] Polish "Change log messages to use singular or plural instead of "noun(s)"" See gh-37017 --- .../boot/maven/AbstractRunMojo.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java index 4408252061..9ed48bcbe5 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java @@ -277,14 +277,12 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo { private void addArgs(List args) { RunArguments applicationArguments = resolveApplicationArguments(); Collections.addAll(args, applicationArguments.asArray()); - String suffix = (applicationArguments.asArray().length == 1) ? "" : "s"; - logArguments("Application argument" + suffix + ": ", applicationArguments.asArray()); + logArguments("Application argument", applicationArguments.asArray()); } private Map determineEnvironmentVariables() { EnvVariables envVariables = resolveEnvVariables(); - String suffix = (envVariables.asArray().length == 1) ? "" : "s"; - logArguments("Environment variable" + suffix + ": ", envVariables.asArray()); + logArguments("Environment variable", envVariables.asArray()); return envVariables.asMap(); } @@ -309,8 +307,7 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo { private void addJvmArgs(List args) { RunArguments jvmArguments = resolveJvmArguments(); Collections.addAll(args, jvmArguments.asArray()); - String suffix = (jvmArguments.asArray().length == 1) ? "" : "s"; - logArguments("JVM argument" + suffix + ": ", jvmArguments.asArray()); + logArguments("JVM argument", jvmArguments.asArray()); } private void addAgents(List args) { @@ -337,8 +334,7 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo { } } arguments.getArgs().addFirst(arg.toString()); - String suffix = (this.profiles.length == 1) ? "" : "s"; - logArguments("Active profile" + suffix + ": ", this.profiles); + logArguments("Active profile", 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()) { + String message = (args.length == 1) ? name + ": " : name + "s: "; getLog().debug(Arrays.stream(args).collect(Collectors.joining(" ", message, ""))); } }