Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
995c0c82
Commit
995c0c82
authored
Oct 17, 2020
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #23720 from izeye
* pr/23720: Polish Closes gh-23720
parents
8d4498ef
20f1c0ef
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
ConfigDataNotFoundFailureAnalyzer.java
...oot/context/config/ConfigDataNotFoundFailureAnalyzer.java
+2
-3
EmbeddedDatabaseConnection.java
...springframework/boot/jdbc/EmbeddedDatabaseConnection.java
+1
-0
UndertowServletWebServerFactory.java
...eb/embedded/undertow/UndertowServletWebServerFactory.java
+1
-1
ConfigDataNotFoundFailureAnalyzerTests.java
...ontext/config/ConfigDataNotFoundFailureAnalyzerTests.java
+1
-1
No files found.
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataNotFoundFailureAnalyzer.java
View file @
995c0c82
...
...
@@ -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
)
{
...
...
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/EmbeddedDatabaseConnection.java
View file @
995c0c82
...
...
@@ -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:"
));
...
...
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServerFactory.java
View file @
995c0c82
...
...
@@ -287,7 +287,7 @@ public class UndertowServletWebServerFactory extends AbstractServletWebServerFac
}
/**
* Return whe
re
the request path should be preserved on forward.
* Return whe
ther
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
...
...
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataNotFoundFailureAnalyzerTests.java
View file @
995c0c82
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment