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

Polish 

See gh-23720
This commit is contained in:
Johnny Lim 2020-10-16 23:51:22 +09:00 committed by Stephane Nicoll
parent 8d4498ef6c
commit 20f1c0ef0e
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataNotFoundFailureAnalyzer.java
View File

@ -33,8 +33,7 @@ class ConfigDataNotFoundFailureAnalyzer extends AbstractFailureAnalyzer<ConfigDa
protected FailureAnalysis analyze(Throwable rootFailure, ConfigDataNotFoundException cause) {
ConfigDataLocation location = getLocation(cause);
Origin origin = Origin.from(location);
StringBuilder message = new StringBuilder(
String.format("Config data %s does not exist", cause.getReferenceDescription()));
String message = String.format("Config data %s does not exist", cause.getReferenceDescription());
StringBuilder action = new StringBuilder("Check that the value ");
if (location != null) {
action.append(String.format("'%s' ", location));
@ -46,7 +45,7 @@ class ConfigDataNotFoundFailureAnalyzer extends AbstractFailureAnalyzer<ConfigDa
if (location != null && !location.isOptional()) {
action.append(String.format(", or prefix it with '%s'", ConfigDataLocation.OPTIONAL_PREFIX));
}
return new FailureAnalysis(message.toString(), action.toString(), cause);
return new FailureAnalysis(message, action.toString(), cause);
}
private ConfigDataLocation getLocation(ConfigDataNotFoundException cause) {

1
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/EmbeddedDatabaseConnection.java
View File

@ -71,6 +71,7 @@ public enum EmbeddedDatabaseConnection {
/**
* HSQL Database Connection.
* @since 2.4.0
*/
HSQLDB(EmbeddedDatabaseType.HSQL, DatabaseDriver.HSQLDB.getDriverClassName(), "org.hsqldb.jdbcDriver",
"jdbc:hsqldb:mem:%s", (url) -> url.contains(":hsqldb:mem:"));

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServerFactory.java
View File

@ -287,7 +287,7 @@ public class UndertowServletWebServerFactory extends AbstractServletWebServerFac
}
/**
* Return where the request path should be preserved on forward.
* Return whether the request path should be preserved on forward.
* @return {@code true} if the path should be preserved when a request is forwarded,
* otherwise {@code false}.
* @since 2.4.0

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataNotFoundFailureAnalyzerTests.java
View File

@ -24,7 +24,7 @@ import org.springframework.boot.origin.Origin;
import static org.assertj.core.api.Assertions.assertThat;
/**
* Tests for {@link ConfigDataNotFoundFailureAnalyzer}
* Tests for {@link ConfigDataNotFoundFailureAnalyzer}.
*
* @author Michal Mlak
* @author Phillip Webb