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

Polish "Stop JtaAutoConfiguration from enabling JtaProperties when not used" 

Closes gh-15550
This commit is contained in:
Andy Wilkinson 2018-12-21 15:10:29 +00:00
parent 0b29da14b3
commit bfd63ab085
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/jta/JtaAutoConfigurationTests.java
View File

@ -172,8 +172,7 @@ public class JtaAutoConfigurationTests {
.of("spring.jta.atomikos.connectionfactory.minPoolSize:5", .of("spring.jta.atomikos.connectionfactory.minPoolSize:5",
"spring.jta.atomikos.connectionfactory.maxPoolSize:10") "spring.jta.atomikos.connectionfactory.maxPoolSize:10")
.applyTo(this.context); .applyTo(this.context);
this.context.register(AtomikosJtaConfiguration.class, this.context.register(AtomikosJtaConfiguration.class, PoolConfiguration.class);
PoolConfiguration.class);
this.context.refresh(); this.context.refresh();
AtomikosConnectionFactoryBean connectionFactory = this.context AtomikosConnectionFactoryBean connectionFactory = this.context
.getBean(AtomikosConnectionFactoryBean.class); .getBean(AtomikosConnectionFactoryBean.class);
@ -188,8 +187,7 @@ public class JtaAutoConfigurationTests {
.of("spring.jta.bitronix.connectionfactory.minPoolSize:5", .of("spring.jta.bitronix.connectionfactory.minPoolSize:5",
"spring.jta.bitronix.connectionfactory.maxPoolSize:10") "spring.jta.bitronix.connectionfactory.maxPoolSize:10")
.applyTo(this.context); .applyTo(this.context);
this.context.register(BitronixJtaConfiguration.class, this.context.register(BitronixJtaConfiguration.class, PoolConfiguration.class);
PoolConfiguration.class);
this.context.refresh(); this.context.refresh();
PoolingConnectionFactoryBean connectionFactory = this.context PoolingConnectionFactoryBean connectionFactory = this.context
.getBean(PoolingConnectionFactoryBean.class); .getBean(PoolingConnectionFactoryBean.class);
@ -204,8 +202,7 @@ public class JtaAutoConfigurationTests {
.of("spring.jta.atomikos.datasource.minPoolSize:5", .of("spring.jta.atomikos.datasource.minPoolSize:5",
"spring.jta.atomikos.datasource.maxPoolSize:10") "spring.jta.atomikos.datasource.maxPoolSize:10")
.applyTo(this.context); .applyTo(this.context);
this.context.register(AtomikosJtaConfiguration.class, this.context.register(AtomikosJtaConfiguration.class, PoolConfiguration.class);
PoolConfiguration.class);
this.context.refresh(); this.context.refresh();
AtomikosDataSourceBean dataSource = this.context AtomikosDataSourceBean dataSource = this.context
.getBean(AtomikosDataSourceBean.class); .getBean(AtomikosDataSourceBean.class);
@ -220,8 +217,7 @@ public class JtaAutoConfigurationTests {
.of("spring.jta.bitronix.datasource.minPoolSize:5", .of("spring.jta.bitronix.datasource.minPoolSize:5",
"spring.jta.bitronix.datasource.maxPoolSize:10") "spring.jta.bitronix.datasource.maxPoolSize:10")
.applyTo(this.context); .applyTo(this.context);
this.context.register(BitronixJtaConfiguration.class, this.context.register(BitronixJtaConfiguration.class, PoolConfiguration.class);
PoolConfiguration.class);
this.context.refresh(); this.context.refresh();
PoolingDataSourceBean dataSource = this.context PoolingDataSourceBean dataSource = this.context
.getBean(PoolingDataSourceBean.class); .getBean(PoolingDataSourceBean.class);