mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Change log messages to use singular or plural instead of "noun(s)"
See gh-37017
This commit is contained in:
parent
ef59326b44
commit
c6c7fbc15f
@ -169,8 +169,9 @@ public abstract class UpgradeDependencies extends DefaultTask {
|
|||||||
if (!availableLabels.containsAll(issueLabels)) {
|
if (!availableLabels.containsAll(issueLabels)) {
|
||||||
List<String> unknownLabels = new ArrayList<>(issueLabels);
|
List<String> unknownLabels = new ArrayList<>(issueLabels);
|
||||||
unknownLabels.removeAll(availableLabels);
|
unknownLabels.removeAll(availableLabels);
|
||||||
|
String suffix = (unknownLabels.size() == 1) ? "" : "s";
|
||||||
throw new InvalidUserDataException(
|
throw new InvalidUserDataException(
|
||||||
"Unknown label(s): " + StringUtils.collectionToCommaDelimitedString(unknownLabels));
|
"Unknown label" + suffix + ": " + StringUtils.collectionToCommaDelimitedString(unknownLabels));
|
||||||
}
|
}
|
||||||
return issueLabels;
|
return issueLabels;
|
||||||
}
|
}
|
||||||
|
@ -55,7 +55,9 @@ public class EndpointLinksResolver {
|
|||||||
public EndpointLinksResolver(Collection<? extends ExposableEndpoint<?>> endpoints, String basePath) {
|
public EndpointLinksResolver(Collection<? extends ExposableEndpoint<?>> endpoints, String basePath) {
|
||||||
this.endpoints = endpoints;
|
this.endpoints = endpoints;
|
||||||
if (logger.isInfoEnabled()) {
|
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 + "'");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -62,8 +62,9 @@ public class FreeMarkerAutoConfiguration {
|
|||||||
if (logger.isWarnEnabled() && this.properties.isCheckTemplateLocation()) {
|
if (logger.isWarnEnabled() && this.properties.isCheckTemplateLocation()) {
|
||||||
List<TemplateLocation> locations = getLocations();
|
List<TemplateLocation> locations = getLocations();
|
||||||
if (locations.stream().noneMatch(this::locationExists)) {
|
if (locations.stream().noneMatch(this::locationExists)) {
|
||||||
logger.warn("Cannot find template location(s): " + locations + " (please add some templates, "
|
String suffix = (locations.size() == 1) ? "" : "s";
|
||||||
+ "check your FreeMarker configuration, or set "
|
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.freemarker.check-template-location=false)");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -38,7 +38,7 @@ class RunIntegrationTests {
|
|||||||
@TestTemplate
|
@TestTemplate
|
||||||
void whenTheRunGoalIsExecutedTheApplicationIsForkedWithOptimizedJvmArguments(MavenBuild mavenBuild) {
|
void whenTheRunGoalIsExecutedTheApplicationIsForkedWithOptimizedJvmArguments(MavenBuild mavenBuild) {
|
||||||
mavenBuild.project("run").goals("spring-boot:run", "-X").execute((project) -> {
|
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);
|
assertThat(buildLog(project)).contains("I haz been run").contains(jvmArguments);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -277,12 +277,14 @@ 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());
|
||||||
logArguments("Application argument(s): ", applicationArguments.asArray());
|
String suffix = (applicationArguments.asArray().length == 1) ? "" : "s";
|
||||||
|
logArguments("Application argument" + suffix + ": ", applicationArguments.asArray());
|
||||||
}
|
}
|
||||||
|
|
||||||
private Map<String, String> determineEnvironmentVariables() {
|
private Map<String, String> determineEnvironmentVariables() {
|
||||||
EnvVariables envVariables = resolveEnvVariables();
|
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();
|
return envVariables.asMap();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -307,7 +309,8 @@ 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());
|
||||||
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) {
|
private void addAgents(List<String> args) {
|
||||||
@ -334,7 +337,8 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
arguments.getArgs().addFirst(arg.toString());
|
arguments.getArgs().addFirst(arg.toString());
|
||||||
logArguments("Active profile(s): ", this.profiles);
|
String suffix = (this.profiles.length == 1) ? "" : "s";
|
||||||
|
logArguments("Active profile" + suffix + ": ", this.profiles);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -107,7 +107,8 @@ final class GracefulShutdown {
|
|||||||
callback.shutdownComplete(GracefulShutdownResult.IDLE);
|
callback.shutdownComplete(GracefulShutdownResult.IDLE);
|
||||||
}
|
}
|
||||||
else {
|
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);
|
callback.shutdownComplete(GracefulShutdownResult.REQUESTS_ACTIVE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user