Skip to content

S
spring-boot
Commit 9c59758a authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Merge branch '1.5.x'

parents dff9fb12 d4ecda90
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 7 deletions
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/jta/JtaAutoConfigurationTests.java
View file @ 9c59758a
...@@ -43,7 +43,6 @@ import org.junit.rules.ExpectedException; ...@@ -43,7 +43,6 @@ import org.junit.rules.ExpectedException;
import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.springframework.boot.autoconfigure.transaction.TransactionAutoConfiguration; import org.springframework.boot.autoconfigure.transaction.TransactionAutoConfiguration;
import org.springframework.boot.autoconfigure.transaction.jta.JtaAutoConfigurationTests.CustomNarayanaRecoveryManagerConfiguration.CustomNarayanaRecoveryManagerBean;
import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.jta.XAConnectionFactoryWrapper; import org.springframework.boot.jta.XAConnectionFactoryWrapper;
import org.springframework.boot.jta.XADataSourceWrapper; import org.springframework.boot.jta.XADataSourceWrapper;
...@@ -347,14 +346,14 @@ public class JtaAutoConfigurationTests { ...@@ -347,14 +346,14 @@ public class JtaAutoConfigurationTests {
return new CustomNarayanaRecoveryManagerBean(recoveryManagerService); return new CustomNarayanaRecoveryManagerBean(recoveryManagerService);
} }
static final class CustomNarayanaRecoveryManagerBean }
extends NarayanaRecoveryManagerBean {
private CustomNarayanaRecoveryManagerBean( static final class CustomNarayanaRecoveryManagerBean
RecoveryManagerService recoveryManagerService) { extends NarayanaRecoveryManagerBean {
super(recoveryManagerService);
}
private CustomNarayanaRecoveryManagerBean(
RecoveryManagerService recoveryManagerService) {
super(recoveryManagerService);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment