Refactor Database Starters (#67)

* Refactor Database Starters

---------

Signed-off-by: Anders Swanson <anders.swanson@oracle.com>

Author: anders-swanson

database/starters/oracle-spring-boot-starter-aqjms/pom.xml

@@ -51,16 +51,10 @@
 
     <dependencies>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.oracle.database.spring</groupId>
             <artifactId>oracle-spring-boot-starter-ucp</artifactId>
             <version>${project.version}</version>
-            <type>pom</type>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -88,6 +82,12 @@
             <groupId>jakarta.management.j2ee</groupId>
             <artifactId>jakarta.management.j2ee-api</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -3,9 +3,19 @@
 
 package com.oracle.spring.aqjms;
 
+import javax.sql.DataSource;
+
+import java.sql.SQLException;
+
+import com.oracle.spring.ucp.UCPAutoConfiguration;
+import jakarta.annotation.PostConstruct;
 import jakarta.jms.ConnectionFactory;
 
+import oracle.jdbc.pool.OracleDataSource;
+import oracle.ucp.jdbc.PoolDataSourceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -14,39 +24,22 @@
 import oracle.jakarta.jms.AQjmsFactory;
 import oracle.ucp.jdbc.PoolDataSource;
 import oracle.ucp.jdbc.PoolDataSourceFactory;
+import org.springframework.util.ClassUtils;
 
 /**
  * This class autowires the configuration and injects both a JDBC DataSource
  * and a JMSConnectionFactory into your application.
  */
-@Configuration
-@EnableConfigurationProperties(AqJmsConfigurationProperties.class)
+@AutoConfiguration
+@ConditionalOnClass({UCPAutoConfiguration.class})
 public class AqJmsAutoConfiguration {
-
-	@Autowired
-    private AqJmsConfigurationProperties properties;
-
-    @Bean
-	@ConditionalOnMissingBean
-	public PoolDataSource dataSource() {
-		PoolDataSource ds = PoolDataSourceFactory.getPoolDataSource();
-		try {
-			ds.setConnectionFactoryClassName("oracle.jdbc.pool.OracleDataSource");
-			ds.setURL(properties.getUrl());
-			ds.setUser(properties.getUsername());
-			ds.setPassword(properties.getPassword());
-		} catch (Exception ignore) {}
-		return ds;
-	}
-
 	@Bean
 	@ConditionalOnMissingBean
-	public ConnectionFactory aqJmsConnectionFactory(PoolDataSource ds) {
+	public ConnectionFactory aqJmsConnectionFactory(DataSource ds) {
 		ConnectionFactory connectionFactory = null;
 		try {
 			connectionFactory = AQjmsFactory.getConnectionFactory(ds);
 		} catch (Exception ignore) {}
 		return connectionFactory;
 	}
-
 }

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

@@ -0,0 +1,44 @@
+// Copyright (c) 2024, Oracle and/or its affiliates.
+// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+package com.oracle.spring.aqjms;
+
+import javax.sql.DataSource;
+
+import com.oracle.spring.ucp.UCPAutoConfiguration;
+import jakarta.jms.ConnectionFactory;
+import oracle.ucp.jdbc.PoolDataSourceImpl;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Import;
+import org.springframework.test.context.TestPropertySource;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@SpringBootTest(classes = {AqJmsAutoConfiguration.class, UCPAutoConfiguration.class})
+@Import(Config.class)
+public class AqJmsAutoConfigurationTest {
+    @Autowired
+    DataSource dataSource;
+
+    @Autowired
+    ConnectionFactory connectionFactory;
+
+    @Test
+    void dataSourceConfigured() {
+        assertThat(dataSource).isNotNull();
+        if (dataSource instanceof PoolDataSourceImpl ds) {
+            assertThat(ds.getInitialPoolSize()).isEqualTo(15);
+            assertThat(ds.getConnectionFactoryClassName()).isEqualTo("oracle.jdbc.pool.OracleDataSource");
+            assertThat(ds.getConnectionPoolName()).isEqualTo("SpringConnectionPool");
+        } else {
+            Assertions.fail("Datasource is not a PoolDataSourceImpl: " + dataSource.getClass().getName());
+        }
+    }
+
+    @Test
+    void aqjmsFactoryConfigured() {
+        assertThat(connectionFactory).isNotNull();
+    }
+}

database/starters/oracle-spring-boot-starter-aqjms/src/test/java/com/oracle/spring/aqjms/AqJmsAutoConfigurationTest.java

@@ -0,0 +1,15 @@
+package com.oracle.spring.aqjms;
+
+import javax.sql.DataSource;
+
+import oracle.ucp.jdbc.PoolDataSourceFactory;
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.context.annotation.Bean;
+
+@TestConfiguration
+public class Config {
+    @Bean
+    DataSource dataSource() {
+        return PoolDataSourceFactory.getPoolDataSource();
+    }
+}

database/starters/oracle-spring-boot-starter-aqjms/src/test/java/com/oracle/spring/aqjms/Config.java

@@ -48,6 +48,10 @@
     </scm>
 
     <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
@@ -62,6 +66,18 @@
             <groupId>com.oracle.database.jdbc</groupId>
             <artifactId>ucp</artifactId>
             <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.zaxxer</groupId>
+                    <artifactId>HikariCP</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 </project>

database/starters/oracle-spring-boot-starter-ucp/pom.xml

@@ -0,0 +1,50 @@
+// Copyright (c) 2024, Oracle and/or its affiliates.
+// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+package com.oracle.spring.ucp;
+
+import javax.sql.DataSource;
+
+import java.sql.SQLException;
+
+import jakarta.annotation.PostConstruct;
+import oracle.jdbc.pool.OracleDataSource;
+import oracle.ucp.jdbc.PoolDataSourceImpl;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+
+@AutoConfiguration
+@ConditionalOnClass({OracleDataSource.class})
+public class UCPAutoConfiguration {
+    private final DataSource dataSource;
+
+    public UCPAutoConfiguration(DataSource dataSource) {
+        this.dataSource = dataSource;
+    }
+
+    @PostConstruct
+    public void init() {
+        if (dataSource instanceof PoolDataSourceImpl ds) {
+            try {
+                ds.setConnectionFactoryClassName("oracle.jdbc.pool.OracleDataSource");
+                setIfNull(ds.getConnectionPoolName(), () -> ds.setConnectionPoolName("SpringConnectionPool"));
+                setIfNull(ds.getInitialPoolSize(), () -> ds.setInitialPoolSize(15));
+            } catch (SQLException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
+    private <T> void setIfNull(T value, Setter setter) throws SQLException {
+        if (value == null) {
+            setter.set();
+        } else if (value instanceof Integer intValue) {
+            if (intValue < 1) {
+                setter.set();
+            }
+        }
+    }
+
+    private interface Setter {
+        void set() throws SQLException;
+    }
+}

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

@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.oracle.spring.ucp.UCPAutoConfiguration

database/starters/oracle-spring-boot-starter-ucp/src/main/resources/META-INF/spring.factories

@@ -0,0 +1 @@
+com.oracle.spring.ucp.UCPAutoConfiguration

database/starters/oracle-spring-boot-starter-ucp/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1,15 @@
+package com.oracle.spring.ucp;
+
+import javax.sql.DataSource;
+
+import oracle.ucp.jdbc.PoolDataSourceFactory;
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.context.annotation.Bean;
+
+@TestConfiguration
+public class Config {
+    @Bean
+    DataSource dataSource() {
+        return PoolDataSourceFactory.getPoolDataSource();
+    }
+}