ConditionalOnBean for starters (#159)

Signed-off-by: Anders Swanson <[email protected]>

Author: anders-swanson

database/starters/oracle-spring-boot-starter-aqjms/src/main/java/com/oracle/spring/aqjms/AqJmsAutoConfiguration.java

@@ -15,6 +15,7 @@
 import oracle.ucp.jdbc.PoolDataSourceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -35,6 +36,7 @@
 public class AqJmsAutoConfiguration {
 	@Bean
 	@ConditionalOnMissingBean
+	@ConditionalOnBean(DataSource.class)
 	public ConnectionFactory aqJmsConnectionFactory(DataSource ds) {
 		ConnectionFactory connectionFactory = null;
 		try {

database/starters/oracle-spring-boot-starter-ucp/src/main/java/com/oracle/spring/ucp/UCPAutoConfiguration.java

@@ -10,10 +10,12 @@
 import oracle.jdbc.pool.OracleDataSource;
 import oracle.ucp.jdbc.PoolDataSourceImpl;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 
 @AutoConfiguration
 @ConditionalOnClass({OracleDataSource.class})
+@ConditionalOnBean(DataSource.class)
 public class UCPAutoConfiguration {
     private final DataSource dataSource;