Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-05 00:56:58 +08:00
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,8 +169,9 @@ public abstract class UpgradeDependencies extends DefaultTask {
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;
}

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

@ -55,7 +55,9 @@ public class EndpointLinksResolver {
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 + "'");
}
}

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

@ -62,8 +62,9 @@ public class FreeMarkerAutoConfiguration {
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)");
}
}

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

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

@ -107,7 +107,8 @@ final class GracefulShutdown {
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);
}
}