Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Create one connection pool for Oracle #1816

Closed
wants to merge 2 commits into from
+45 −24
Closed

Create one connection pool for Oracle #1816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
356e83b
1815-tns-error - Prepare branch
schauder Jun 13, 2024
007b45f
Create one connection pool for Oracle.
schauder Jun 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>org.springframework.data</groupId>
<artifactId>spring-data-relational-parent</artifactId>
<version>3.4.0-SNAPSHOT</version>
<version>3.4.0-1815-tns-error-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Spring Data Relational Parent</name>
Expand Down Expand Up @@ -33,14 +33,15 @@
<!-- note that these currently do not control the versions of databases used via Testcontainers for testing -->
<db2.version>11.5.8.0</db2.version>
<h2.version>2.1.214</h2.version>
<hikari.version>5.1.0</hikari.version>
<hsqldb.version>2.7.1</hsqldb.version>
<mariadb-java-client.version>3.1.3</mariadb-java-client.version>
<mssql.version>12.2.0.jre11</mssql.version>
<mysql-connector-java.version>8.0.32</mysql-connector-java.version>
<postgresql.version>42.6.0</postgresql.version>
<oracle.version>23.4.0.24.05</oracle.version>

<!-- test utilities-->
<!-- test dependencies -->
<awaitility.version>4.2.0</awaitility.version>
<archunit.version>1.0.1</archunit.version>

Expand Down
2 changes: 1 addition & 1 deletion spring-data-jdbc-distribution/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-relational-parent</artifactId>
<version>3.4.0-SNAPSHOT</version>
<version>3.4.0-1815-tns-error-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
10 changes: 8 additions & 2 deletions spring-data-jdbc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>spring-data-jdbc</artifactId>
<version>3.4.0-SNAPSHOT</version>
<version>3.4.0-1815-tns-error-SNAPSHOT</version>

<name>Spring Data JDBC</name>
<description>Spring Data module for JDBC repositories.</description>
Expand All @@ -15,7 +15,7 @@
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-relational-parent</artifactId>
<version>3.4.0-SNAPSHOT</version>
<version>3.4.0-1815-tns-error-SNAPSHOT</version>
</parent>

<properties>
Expand Down Expand Up @@ -233,6 +233,12 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>${hikari.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
2 changes: 2 additions & 0 deletions ...ata-jdbc/src/test/java/org/springframework/data/jdbc/testing/DataSourceConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@

import javax.sql.DataSource;

import com.zaxxer.hikari.HikariConfig;
import com.zaxxer.hikari.HikariDataSource;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.awaitility.Awaitility;
Expand Down
41 changes: 27 additions & 14 deletions ...bc/src/test/java/org/springframework/data/jdbc/testing/OracleDataSourceConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,13 @@
import org.testcontainers.oracle.OracleContainer;
import org.testcontainers.utility.DockerImageName;

import com.zaxxer.hikari.HikariConfig;
import com.zaxxer.hikari.HikariDataSource;

/**
* {@link DataSource} setup for Oracle Database 23ai FREE. Starts a docker container with an Oracle database.
*
* @see <a href=
* "https://github.com/gvenzl/oci-oracle-free">Oracle
* Docker Image</a>
* @see <a href= "https://github.com/gvenzl/oci-oracle-free">Oracle Docker Image</a>
* @see <a href="https://www.testcontainers.org/modules/databases/oraclexe/">Testcontainers Oracle</a>
* @author Thomas Lang
* @author Jens Schauder
Expand All @@ -44,16 +45,16 @@ public class OracleDataSourceConfiguration extends DataSourceConfiguration {

private static final Log LOG = LogFactory.getLog(OracleDataSourceConfiguration.class);

private static OracleContainer ORACLE_CONTAINER;
private static DataSource DATA_SOURCE;

public OracleDataSourceConfiguration(TestClass testClass, Environment environment) {
super(testClass, environment);
}

@Override
protected DataSource createDataSource() {
protected synchronized DataSource createDataSource() {

if (ORACLE_CONTAINER == null) {
if (DATA_SOURCE == null) {

LOG.info("Oracle starting...");
DockerImageName dockerImageName = DockerImageName.parse("gvenzl/oracle-free:23-slim");
Expand All @@ -63,21 +64,33 @@ protected DataSource createDataSource() {
container.start();
LOG.info("Oracle started");

ORACLE_CONTAINER = container;
initDb(container.getJdbcUrl(),container.getUsername(), container.getPassword());

DATA_SOURCE = poolDataSource(new DriverManagerDataSource(container.getJdbcUrl(),
container.getUsername(), container.getPassword()));
}
return DATA_SOURCE;
}

private DataSource poolDataSource(DataSource dataSource) {

HikariConfig config = new HikariConfig();
config.setDataSource(dataSource);

initDb();
config.setMaximumPoolSize(10);
config.setIdleTimeout(30000);
config.setMaxLifetime(600000);
config.setConnectionTimeout(30000);

return new DriverManagerDataSource(ORACLE_CONTAINER.getJdbcUrl(), ORACLE_CONTAINER.getUsername(),
ORACLE_CONTAINER.getPassword());
return new HikariDataSource(config);
}

private void initDb() {
private void initDb(String jdbcUrl, String username, String password) {

final DriverManagerDataSource dataSource = new DriverManagerDataSource(ORACLE_CONTAINER.getJdbcUrl(), "system",
ORACLE_CONTAINER.getPassword());
final DriverManagerDataSource dataSource = new DriverManagerDataSource(jdbcUrl, "system",
password);
final JdbcTemplate jdbc = new JdbcTemplate(dataSource);
jdbc.execute("GRANT ALL PRIVILEGES TO " + ORACLE_CONTAINER.getUsername());
jdbc.execute("GRANT ALL PRIVILEGES TO " + username);
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions spring-data-r2dbc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>spring-data-r2dbc</artifactId>
<version>3.4.0-SNAPSHOT</version>
<version>3.4.0-1815-tns-error-SNAPSHOT</version>

<name>Spring Data R2DBC</name>
<description>Spring Data module for R2DBC</description>
Expand All @@ -15,7 +15,7 @@
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-relational-parent</artifactId>
<version>3.4.0-SNAPSHOT</version>
<version>3.4.0-1815-tns-error-SNAPSHOT</version>
</parent>

<properties>
Expand Down
5 changes: 2 additions & 3 deletions spring-data-relational/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>spring-data-relational</artifactId>
<version>3.4.0-SNAPSHOT</version>
<version>3.4.0-1815-tns-error-SNAPSHOT</version>

<name>Spring Data Relational</name>
<description>Spring Data Relational support</description>

<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-relational-parent</artifactId>
<version>3.4.0-SNAPSHOT</version>
<version>3.4.0-1815-tns-error-SNAPSHOT</version>
</parent>

<properties>
Expand Down Expand Up @@ -104,7 +104,6 @@
<version>${jsqlparser}</version>
<scope>test</scope>
</dependency>

</dependencies>

</project>
Loading