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
addb6950
Commit
addb6950
authored
Apr 20, 2016
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Perform analysis of failures caused by DataSourceBeanCreationException
Closes gh-5351
parent
e1cea8a9
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
121 additions
and
1 deletion
+121
-1
DataSourceBeanCreationFailureAnalyzer.java
...configure/jdbc/DataSourceBeanCreationFailureAnalyzer.java
+42
-0
DataSourceProperties.java
...amework/boot/autoconfigure/jdbc/DataSourceProperties.java
+1
-1
spring.factories
...utoconfigure/src/main/resources/META-INF/spring.factories
+4
-0
DataSourceBeanCreationFailureAnalyzerTests.java
...gure/jdbc/DataSourceBeanCreationFailureAnalyzerTests.java
+74
-0
No files found.
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceBeanCreationFailureAnalyzer.java
0 → 100644
View file @
addb6950
/*
* Copyright 2012-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org
.
springframework
.
boot
.
autoconfigure
.
jdbc
;
import
org.springframework.boot.autoconfigure.jdbc.DataSourceProperties.DataSourceBeanCreationException
;
import
org.springframework.boot.diagnostics.AbstractFailureAnalyzer
;
import
org.springframework.boot.diagnostics.FailureAnalysis
;
/**
* An {@link AbstractFailureAnalyzer} for failures caused by a
* {@link DataSourceBeanCreationException}.
*
* @author Andy Wilkinson
*/
class
DataSourceBeanCreationFailureAnalyzer
extends
AbstractFailureAnalyzer
<
DataSourceBeanCreationException
>
{
@Override
protected
FailureAnalysis
analyze
(
Throwable
rootFailure
,
DataSourceBeanCreationException
cause
)
{
String
description
=
cause
.
getMessage
()
.
substring
(
0
,
cause
.
getMessage
().
indexOf
(
"."
)).
trim
();
String
action
=
cause
.
getMessage
().
substring
(
cause
.
getMessage
().
indexOf
(
"."
)
+
1
)
.
trim
();
return
new
FailureAnalysis
(
description
,
action
,
cause
);
}
}
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java
View file @
addb6950
...
...
@@ -415,7 +415,7 @@ public class DataSourceProperties
}
private
static
class
DataSourceBeanCreationException
extends
BeanCreationException
{
static
class
DataSourceBeanCreationException
extends
BeanCreationException
{
DataSourceBeanCreationException
(
EmbeddedDatabaseConnection
connection
,
Environment
environment
,
String
property
)
{
...
...
spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
View file @
addb6950
...
...
@@ -99,6 +99,10 @@ org.springframework.boot.autoconfigure.websocket.WebSocketAutoConfiguration,\
org.springframework.boot.autoconfigure.websocket.WebSocketMessagingAutoConfiguration,\
org.springframework.boot.autoconfigure.webservices.WebServicesAutoConfiguration
# Failure analyzers
org.springframework.boot.diagnostics.FailureAnalyzer=\
org.springframework.boot.autoconfigure.jdbc.DataSourceBeanCreationFailureAnalyzer
# Template availability providers
org.springframework.boot.autoconfigure.template.TemplateAvailabilityProvider=\
org.springframework.boot.autoconfigure.freemarker.FreeMarkerTemplateAvailabilityProvider,\
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceBeanCreationFailureAnalyzerTests.java
0 → 100644
View file @
addb6950
/*
* Copyright 2012-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org
.
springframework
.
boot
.
autoconfigure
.
jdbc
;
import
org.junit.Test
;
import
org.junit.runner.RunWith
;
import
org.springframework.beans.factory.BeanCreationException
;
import
org.springframework.boot.autoconfigure.ImportAutoConfiguration
;
import
org.springframework.boot.diagnostics.FailureAnalysis
;
import
org.springframework.boot.testutil.ClassPathExclusions
;
import
org.springframework.boot.testutil.FilteredClassPathRunner
;
import
org.springframework.context.annotation.AnnotationConfigApplicationContext
;
import
org.springframework.context.annotation.Configuration
;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThat
;
/**
* Tests for {@link DataSourceBeanCreationFailureAnalyzer}.
*
* @author Andy Wilkinson
*/
@RunWith
(
FilteredClassPathRunner
.
class
)
@ClassPathExclusions
({
"h2-*.jar"
,
"hsqldb-*.jar"
})
public
class
DataSourceBeanCreationFailureAnalyzerTests
{
@Test
public
void
failureAnalysisIsPerformed
()
{
FailureAnalysis
failureAnalysis
=
performAnalysis
(
TestConfiguration
.
class
);
assertThat
(
failureAnalysis
.
getDescription
()).
isEqualTo
(
"Cannot determine embedded database driver class for database type NONE"
);
assertThat
(
failureAnalysis
.
getAction
()).
isEqualTo
(
"If you want an embedded "
+
"database please put a supported one on the classpath. If you have "
+
"database settings to be loaded from a particular profile you may "
+
"need to active it (no profiles are currently active)."
);
}
private
FailureAnalysis
performAnalysis
(
Class
<?>
configuration
)
{
BeanCreationException
failure
=
createFailure
(
configuration
);
assertThat
(
failure
).
isNotNull
();
return
new
DataSourceBeanCreationFailureAnalyzer
().
analyze
(
failure
);
}
private
BeanCreationException
createFailure
(
Class
<?>
configuration
)
{
try
{
new
AnnotationConfigApplicationContext
(
configuration
).
close
();
return
null
;
}
catch
(
BeanCreationException
ex
)
{
return
ex
;
}
}
@Configuration
@ImportAutoConfiguration
(
DataSourceAutoConfiguration
.
class
)
static
class
TestConfiguration
{
}
}
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