Skip to content

Commit 120e741

Browse files
committed
DRY
1 parent 8a567ac commit 120e741

File tree

4 files changed

+29
-60
lines changed

4 files changed

+29
-60
lines changed

hibernate-agroal/src/main/java/org/hibernate/agroal/internal/AgroalConnectionProvider.java

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
import static java.util.stream.Collectors.toMap;
4141
import static org.hibernate.cfg.AgroalSettings.AGROAL_CONFIG_PREFIX;
4242
import static org.hibernate.engine.jdbc.connections.internal.ConnectionProviderInitiator.toIsolationNiceName;
43+
import static org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl.getFetchSize;
44+
import static org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl.getIsolation;
4345
import static org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentInitiator.allowJdbcMetadataAccess;
4446

4547
/**
@@ -187,26 +189,6 @@ public DatabaseConnectionInfo getDatabaseConnectionInfo(Dialect dialect) {
187189
);
188190
}
189191

190-
private static Integer getFetchSize(DataSource dataSource) {
191-
try ( var conn = dataSource.getConnection() ) {
192-
try ( var statement = conn.createStatement() ) {
193-
return statement.getFetchSize();
194-
}
195-
}
196-
catch ( SQLException ignored ) {
197-
return null;
198-
}
199-
}
200-
201-
private static Integer getIsolation(DataSource dataSource) {
202-
try ( var conn = dataSource.getConnection() ) {
203-
return conn.getTransactionIsolation();
204-
}
205-
catch ( SQLException ignored ) {
206-
return null;
207-
}
208-
}
209-
210192
private String extractDriverNameFromMetadata() {
211193
if (isMetadataAccessAllowed) {
212194
try ( Connection conn = getConnection() ) {

hibernate-c3p0/src/main/java/org/hibernate/c3p0/internal/C3P0ConnectionProvider.java

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@
4343
import static org.hibernate.engine.jdbc.connections.internal.ConnectionProviderInitiator.extractSetting;
4444
import static org.hibernate.engine.jdbc.connections.internal.ConnectionProviderInitiator.getConnectionProperties;
4545
import static org.hibernate.engine.jdbc.connections.internal.ConnectionProviderInitiator.toIsolationNiceName;
46+
import static org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl.getFetchSize;
47+
import static org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl.getIsolation;
4648
import static org.hibernate.internal.util.config.ConfigurationHelper.getBoolean;
4749
import static org.hibernate.internal.util.config.ConfigurationHelper.getInteger;
4850

@@ -176,26 +178,6 @@ public void configure(Map<String, Object> properties) {
176178
);
177179
}
178180

179-
private static Integer getFetchSize(DataSource dataSource) {
180-
try ( var conn = dataSource.getConnection() ) {
181-
try ( var statement = conn.createStatement() ) {
182-
return statement.getFetchSize();
183-
}
184-
}
185-
catch ( SQLException ignored ) {
186-
return null;
187-
}
188-
}
189-
190-
private static Integer getIsolation(DataSource dataSource) {
191-
try ( var conn = dataSource.getConnection() ) {
192-
return conn.getTransactionIsolation();
193-
}
194-
catch ( SQLException ignored ) {
195-
return null;
196-
}
197-
}
198-
199181
private DataSource createDataSource(String jdbcUrl, Properties connectionProps, Map<String, Object> poolProperties) {
200182
try {
201183
return pooledDataSource( unpooledDataSource( jdbcUrl, connectionProps ), poolProperties );

hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DatabaseConnectionInfoImpl.java

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
*/
55
package org.hibernate.engine.jdbc.connections.internal;
66

7+
import java.sql.SQLException;
78
import java.util.Map;
89

910
import org.checkerframework.checker.nullness.qual.Nullable;
@@ -15,6 +16,8 @@
1516
import org.hibernate.internal.util.NullnessHelper;
1617
import org.hibernate.internal.util.config.ConfigurationHelper;
1718

19+
import javax.sql.DataSource;
20+
1821
import static org.hibernate.dialect.SimpleDatabaseVersion.ZERO_VERSION;
1922
import static org.hibernate.engine.jdbc.connections.internal.ConnectionProviderInitiator.interpretIsolation;
2023
import static org.hibernate.engine.jdbc.connections.internal.ConnectionProviderInitiator.toIsolationNiceName;
@@ -80,6 +83,26 @@ public DatabaseConnectionInfoImpl(Dialect dialect) {
8083
this( null, null, null, dialect.getVersion(), null, null, null, null, null );
8184
}
8285

86+
public static Integer getFetchSize(DataSource dataSource) {
87+
try ( var conn = dataSource.getConnection() ) {
88+
try ( var statement = conn.createStatement() ) {
89+
return statement.getFetchSize();
90+
}
91+
}
92+
catch ( SQLException ignored ) {
93+
return null;
94+
}
95+
}
96+
97+
public static Integer getIsolation(DataSource dataSource) {
98+
try ( var conn = dataSource.getConnection() ) {
99+
return conn.getTransactionIsolation();
100+
}
101+
catch ( SQLException ignored ) {
102+
return null;
103+
}
104+
}
105+
83106
@Override
84107
public String getJdbcUrl() {
85108
return jdbcUrl;

hibernate-hikaricp/src/main/java/org/hibernate/hikaricp/internal/HikariCPConnectionProvider.java

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
import com.zaxxer.hikari.HikariDataSource;
2626

2727
import static org.hibernate.engine.jdbc.connections.internal.ConnectionProviderInitiator.toIsolationNiceName;
28+
import static org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl.getFetchSize;
29+
import static org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl.getIsolation;
2830
import static org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentInitiator.allowJdbcMetadataAccess;
2931
import static org.hibernate.hikaricp.internal.HikariConfigurationUtil.loadConfiguration;
3032
import static org.hibernate.internal.util.StringHelper.isBlank;
@@ -115,26 +117,6 @@ public DatabaseConnectionInfo getDatabaseConnectionInfo(Dialect dialect) {
115117
);
116118
}
117119

118-
private static Integer getFetchSize(DataSource dataSource) {
119-
try ( var conn = dataSource.getConnection() ) {
120-
try ( var statement = conn.createStatement() ) {
121-
return statement.getFetchSize();
122-
}
123-
}
124-
catch ( SQLException ignored ) {
125-
return null;
126-
}
127-
}
128-
129-
private static Integer getIsolation(DataSource dataSource) {
130-
try ( var conn = dataSource.getConnection() ) {
131-
return conn.getTransactionIsolation();
132-
}
133-
catch ( SQLException ignored ) {
134-
return null;
135-
}
136-
}
137-
138120
private String extractDriverNameFromMetadata() {
139121
if ( isMetadataAccessAllowed ) {
140122
try ( Connection conn = getConnection() ) {

0 commit comments

Comments
 (0)