Add missing ConditionalOnMissingBean annotations

Gytis Trikleris · Gytis Trikleris · commit f56bcdbae6de · 2018-02-12T13:19:33.000+01:00
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/NarayanaJtaConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/NarayanaJtaConfiguration.java
@@ -135,6 +135,7 @@ public NarayanaRecoveryManagerBean narayanaRecoveryManager(
 	}
 
 	@Bean
+	@ConditionalOnMissingBean
 	public JtaTransactionManager transactionManager(UserTransaction userTransaction,
 			TransactionManager transactionManager) {
 		JtaTransactionManager jtaTransactionManager = new JtaTransactionManager(
@@ -146,6 +147,7 @@ public JtaTransactionManager transactionManager(UserTransaction userTransaction,
 	}
 
 	@Bean
+	@ConditionalOnMissingBean
 	public DbcpXaDataSourceWrapper dbcpXaDataSourceWrapper(TransactionManager transactionManager,
 			NarayanaProperties.PoolProperties narayanaPoolProperties) {
 		return new DbcpXaDataSourceWrapper(transactionManager, narayanaPoolProperties);

Original file line number	Diff line number	Diff line change
`@@ -135,6 +135,7 @@ public NarayanaRecoveryManagerBean narayanaRecoveryManager(`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`@Bean`
	`138`	`+ @ConditionalOnMissingBean`
`138`	`139`	`public JtaTransactionManager transactionManager(UserTransaction userTransaction,`
`139`	`140`	`TransactionManager transactionManager) {`
`140`	`141`	`JtaTransactionManager jtaTransactionManager = new JtaTransactionManager(`
`@@ -146,6 +147,7 @@ public JtaTransactionManager transactionManager(UserTransaction userTransaction,`
`146`	`147`	`}`
`147`	`148`
`148`	`149`	`@Bean`
	`150`	`+ @ConditionalOnMissingBean`
`149`	`151`	`public DbcpXaDataSourceWrapper dbcpXaDataSourceWrapper(TransactionManager transactionManager,`
`150`	`152`	`NarayanaProperties.PoolProperties narayanaPoolProperties) {`
`151`	`153`	`return new DbcpXaDataSourceWrapper(transactionManager, narayanaPoolProperties);`