From bfd63ab085eca84596b7c0122a2427678128f436 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 21 Dec 2018 15:10:29 +0000 Subject: [PATCH] Polish "Stop JtaAutoConfiguration from enabling JtaProperties when not used" Closes gh-15550 --- .../transaction/jta/JtaAutoConfigurationTests.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/jta/JtaAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/jta/JtaAutoConfigurationTests.java index 97384a186460..722e3b024b77 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/jta/JtaAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/jta/JtaAutoConfigurationTests.java @@ -172,8 +172,7 @@ public void atomikosConnectionFactoryPoolConfiguration() { .of("spring.jta.atomikos.connectionfactory.minPoolSize:5", "spring.jta.atomikos.connectionfactory.maxPoolSize:10") .applyTo(this.context); - this.context.register(AtomikosJtaConfiguration.class, - PoolConfiguration.class); + this.context.register(AtomikosJtaConfiguration.class, PoolConfiguration.class); this.context.refresh(); AtomikosConnectionFactoryBean connectionFactory = this.context .getBean(AtomikosConnectionFactoryBean.class); @@ -188,8 +187,7 @@ public void bitronixConnectionFactoryPoolConfiguration() { .of("spring.jta.bitronix.connectionfactory.minPoolSize:5", "spring.jta.bitronix.connectionfactory.maxPoolSize:10") .applyTo(this.context); - this.context.register(BitronixJtaConfiguration.class, - PoolConfiguration.class); + this.context.register(BitronixJtaConfiguration.class, PoolConfiguration.class); this.context.refresh(); PoolingConnectionFactoryBean connectionFactory = this.context .getBean(PoolingConnectionFactoryBean.class); @@ -204,8 +202,7 @@ public void atomikosDataSourcePoolConfiguration() { .of("spring.jta.atomikos.datasource.minPoolSize:5", "spring.jta.atomikos.datasource.maxPoolSize:10") .applyTo(this.context); - this.context.register(AtomikosJtaConfiguration.class, - PoolConfiguration.class); + this.context.register(AtomikosJtaConfiguration.class, PoolConfiguration.class); this.context.refresh(); AtomikosDataSourceBean dataSource = this.context .getBean(AtomikosDataSourceBean.class); @@ -220,8 +217,7 @@ public void bitronixDataSourcePoolConfiguration() { .of("spring.jta.bitronix.datasource.minPoolSize:5", "spring.jta.bitronix.datasource.maxPoolSize:10") .applyTo(this.context); - this.context.register(BitronixJtaConfiguration.class, - PoolConfiguration.class); + this.context.register(BitronixJtaConfiguration.class, PoolConfiguration.class); this.context.refresh(); PoolingDataSourceBean dataSource = this.context .getBean(PoolingDataSourceBean.class);