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
e84477cf
Commit
e84477cf
authored
Jul 17, 2019
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Only perform Quartz DataSource init when using JDBC store
Fixes gh-17545
parent
309329ac
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
7 deletions
+20
-7
QuartzAutoConfiguration.java
...rk/boot/autoconfigure/quartz/QuartzAutoConfiguration.java
+7
-7
QuartzAutoConfigurationTests.java
...ot/autoconfigure/quartz/QuartzAutoConfigurationTests.java
+13
-0
No files found.
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfiguration.java
View file @
e84477cf
...
...
@@ -32,6 +32,7 @@ import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import
org.springframework.boot.autoconfigure.EnableAutoConfiguration
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnClass
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnSingleCandidate
;
import
org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
;
import
org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration
;
...
...
@@ -124,6 +125,7 @@ public class QuartzAutoConfiguration {
@Configuration
@ConditionalOnSingleCandidate
(
DataSource
.
class
)
@ConditionalOnProperty
(
prefix
=
"spring.quartz"
,
name
=
"job-store-type"
,
havingValue
=
"jdbc"
)
protected
static
class
JdbcStoreTypeConfiguration
{
@Bean
...
...
@@ -132,13 +134,11 @@ public class QuartzAutoConfiguration {
@QuartzDataSource
ObjectProvider
<
DataSource
>
quartzDataSource
,
ObjectProvider
<
PlatformTransactionManager
>
transactionManager
)
{
return
(
schedulerFactoryBean
)
->
{
if
(
properties
.
getJobStoreType
()
==
JobStoreType
.
JDBC
)
{
DataSource
dataSourceToUse
=
getDataSource
(
dataSource
,
quartzDataSource
);
schedulerFactoryBean
.
setDataSource
(
dataSourceToUse
);
PlatformTransactionManager
txManager
=
transactionManager
.
getIfUnique
();
if
(
txManager
!=
null
)
{
schedulerFactoryBean
.
setTransactionManager
(
txManager
);
}
DataSource
dataSourceToUse
=
getDataSource
(
dataSource
,
quartzDataSource
);
schedulerFactoryBean
.
setDataSource
(
dataSourceToUse
);
PlatformTransactionManager
txManager
=
transactionManager
.
getIfUnique
();
if
(
txManager
!=
null
)
{
schedulerFactoryBean
.
setTransactionManager
(
txManager
);
}
};
}
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfigurationTests.java
View file @
e84477cf
...
...
@@ -104,6 +104,19 @@ public class QuartzAutoConfigurationTests {
.
withPropertyValues
(
"spring.quartz.job-store-type=jdbc"
).
run
(
assertDataSourceJobStore
(
"dataSource"
));
}
@Test
public
void
withDataSourceAndInMemoryStoreDoesNotInitializeDataSource
()
{
this
.
contextRunner
.
withUserConfiguration
(
QuartzJobsConfiguration
.
class
)
.
withConfiguration
(
AutoConfigurations
.
of
(
DataSourceAutoConfiguration
.
class
,
DataSourceTransactionManagerAutoConfiguration
.
class
))
.
withPropertyValues
(
"spring.quartz.job-store-type=memory"
).
run
((
context
)
->
{
JdbcTemplate
jdbcTemplate
=
new
JdbcTemplate
(
context
.
getBean
(
"dataSource"
,
DataSource
.
class
));
assertThat
(
jdbcTemplate
.
queryForList
(
"SHOW TABLES"
).
stream
()
.
map
((
table
)
->
(
String
)
table
.
get
(
"TABLE_NAME"
)))
.
noneMatch
((
name
)
->
name
.
startsWith
(
"QRTZ"
));
});
}
@Test
public
void
withDataSourceNoTransactionManager
()
{
this
.
contextRunner
.
withUserConfiguration
(
QuartzJobsConfiguration
.
class
)
...
...
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