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

See gh-37017

Author: teacmity

buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/UpgradeDependencies.java

@@ -169,8 +169,9 @@ private List<String> verifyLabels(GitHubRepository repository) {
 		if (!availableLabels.containsAll(issueLabels)) {
 			List<String> unknownLabels = new ArrayList<>(issueLabels);
 			unknownLabels.removeAll(availableLabels);
+			String suffix = (unknownLabels.size() == 1) ? "" : "s";
 			throw new InvalidUserDataException(
-					"Unknown label(s): " + StringUtils.collectionToCommaDelimitedString(unknownLabels));
+					"Unknown label" + suffix + ": " + StringUtils.collectionToCommaDelimitedString(unknownLabels));
 		}
 		return issueLabels;
 	}

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/EndpointLinksResolver.java

@@ -55,7 +55,9 @@ public EndpointLinksResolver(Collection<? extends ExposableEndpoint<?>> endpoint
 	public EndpointLinksResolver(Collection<? extends ExposableEndpoint<?>> endpoints, String basePath) {
 		this.endpoints = endpoints;
 		if (logger.isInfoEnabled()) {
-			logger.info("Exposing " + endpoints.size() + " endpoint(s) beneath base path '" + basePath + "'");
+			String suffix = (endpoints.size() == 1) ? "" : "s";
+			logger
+				.info("Exposing " + endpoints.size() + " endpoint" + suffix + " beneath base path '" + basePath + "'");
 		}
 	}
 

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfiguration.java

@@ -62,8 +62,9 @@ public void checkTemplateLocationExists() {
 		if (logger.isWarnEnabled() && this.properties.isCheckTemplateLocation()) {
 			List<TemplateLocation> locations = getLocations();
 			if (locations.stream().noneMatch(this::locationExists)) {
-				logger.warn("Cannot find template location(s): " + locations + " (please add some templates, "
-						+ "check your FreeMarker configuration, or set "
+				String suffix = (locations.size() == 1) ? "" : "s";
+				logger.warn("Cannot find template location" + suffix + ": " + locations
+						+ " (please add some templates, " + "check your FreeMarker configuration, or set "
 						+ "spring.freemarker.check-template-location=false)");
 			}
 		}

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

@@ -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);
 		});
 	}

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

@@ -277,12 +277,14 @@ protected EnvVariables resolveEnvVariables() {
 	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 @@ protected RunArguments resolveJvmArguments() {
 	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 @@ private void addActiveProfileArgument(RunArguments arguments) {
 				}
 			}
 			arguments.getArgs().addFirst(arg.toString());
-			logArguments("Active profile(s): ", this.profiles);
+			String suffix = (this.profiles.length == 1) ? "" : "s";
+			logArguments("Active profile" + suffix + ": ", this.profiles);
 		}
 	}
 

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/GracefulShutdown.java

@@ -107,7 +107,8 @@ private void awaitShutdown(GracefulShutdownCallback callback) {
 			callback.shutdownComplete(GracefulShutdownResult.IDLE);
 		}
 		else {
-			logger.info(LogMessage.format("Graceful shutdown aborted with %d request(s) still active", activeRequests));
+			logger.info(LogMessage.format("Graceful shutdown aborted with %d request%s still active", activeRequests,
+					(activeRequests == 1) ? "" : "s"));
 			callback.shutdownComplete(GracefulShutdownResult.REQUESTS_ACTIVE);
 		}
 	}