Skip to content

Commit e4f9186

Browse files
gavinkinggavinking
committed
minor cleanup in o.h.resource.jdbc.internal + o.h.tool.schema.internal.exec
1 parent 64d7849 commit e4f9186

16 files changed

+47
-71
lines changed

‎hibernate-core/src/main/java/org/hibernate/engine/jdbc/JdbcLogging.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,4 +189,7 @@ public interface JdbcLogging extends BasicLogger {
189189
@Message(value = "Could not obtain connection to query JDBC database metadata", id = 100046)
190190
void unableToObtainConnectionToQueryMetadata(@Cause Exception e);
191191

192+
@LogMessage(level = TRACE)
193+
@Message(value = "AutoCommit was initially %s", id = 100047)
194+
void initialAutoCommit(boolean wasInitiallyAutoCommit);
192195
}

‎hibernate-core/src/main/java/org/hibernate/query/QueryLogging.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@ static Logger subLogger(String subName) {
4646
return Logger.getLogger( subLoggerName( subName ) );
4747
}
4848

49-
static <T> T subLogger(String subName, Class<T> loggerJavaType) {
50-
return Logger.getMessageLogger( MethodHandles.lookup(), loggerJavaType, subLoggerName( subName ) );
51-
}
52-
5349
@LogMessage(level = ERROR)
5450
@Message(value = "Error in named query: %s", id = 90003001)
5551
void namedQueryError(String queryName, @Cause HibernateException e);

‎hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/AbstractLogicalConnectionImplementor.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import org.hibernate.resource.jdbc.spi.PhysicalJdbcTransaction;
1515
import org.hibernate.resource.transaction.spi.TransactionStatus;
1616

17-
import static org.hibernate.resource.jdbc.internal.LogicalConnectionLogging.LOGGER;
17+
import static org.hibernate.resource.jdbc.internal.LogicalConnectionLogging.CONNECTION_LOGGER;
1818

1919
/**
2020
* Base support for {@link LogicalConnection} implementations
@@ -64,9 +64,9 @@ public void afterTransaction() {
6464
public void begin() {
6565
try {
6666
if ( !doConnectionsFromProviderHaveAutoCommitDisabled() ) {
67-
LOGGER.preparingToBeginViaSetAutoCommitFalse();
67+
CONNECTION_LOGGER.preparingToBeginViaSetAutoCommitFalse();
6868
getConnectionForTransactionManagement().setAutoCommit( false );
69-
LOGGER.transactionBegunViaSetAutoCommitFalse();
69+
CONNECTION_LOGGER.transactionBegunViaSetAutoCommitFalse();
7070
}
7171
status = TransactionStatus.ACTIVE;
7272
}
@@ -78,7 +78,7 @@ public void begin() {
7878
@Override
7979
public void commit() {
8080
try {
81-
LOGGER.preparingToCommitViaConnectionCommit();
81+
CONNECTION_LOGGER.preparingToCommitViaConnectionCommit();
8282
status = TransactionStatus.COMMITTING;
8383
if ( isPhysicallyConnected() ) {
8484
getConnectionForTransactionManagement().commit();
@@ -87,7 +87,7 @@ public void commit() {
8787
errorIfClosed();
8888
}
8989
status = TransactionStatus.COMMITTED;
90-
LOGGER.transactionCommittedViaConnectionCommit();
90+
CONNECTION_LOGGER.transactionCommittedViaConnectionCommit();
9191
}
9292
catch( SQLException e ) {
9393
status = TransactionStatus.FAILED_COMMIT;
@@ -104,20 +104,20 @@ protected void afterCompletion() {
104104
protected void resetConnection(boolean initiallyAutoCommit) {
105105
try {
106106
if ( initiallyAutoCommit ) {
107-
LOGGER.reenablingAutoCommitAfterJdbcTransaction();
107+
CONNECTION_LOGGER.reenablingAutoCommitAfterJdbcTransaction();
108108
getConnectionForTransactionManagement().setAutoCommit( true );
109109
status = TransactionStatus.NOT_ACTIVE;
110110
}
111111
}
112112
catch ( Exception e ) {
113-
LOGGER.couldNotReEnableAutoCommit( e );
113+
CONNECTION_LOGGER.couldNotReEnableAutoCommit( e );
114114
}
115115
}
116116

117117
@Override
118118
public void rollback() {
119119
try {
120-
LOGGER.preparingToRollbackViaConnectionRollback();
120+
CONNECTION_LOGGER.preparingToRollbackViaConnectionRollback();
121121
status = TransactionStatus.ROLLING_BACK;
122122
if ( isPhysicallyConnected() ) {
123123
getConnectionForTransactionManagement().rollback();
@@ -126,7 +126,7 @@ public void rollback() {
126126
errorIfClosed();
127127
}
128128
status = TransactionStatus.ROLLED_BACK;
129-
LOGGER.transactionRolledBackViaConnectionRollback();
129+
CONNECTION_LOGGER.transactionRolledBackViaConnectionRollback();
130130
}
131131
catch( SQLException e ) {
132132
status = TransactionStatus.FAILED_ROLLBACK;
@@ -141,7 +141,7 @@ protected static boolean determineInitialAutoCommitMode(Connection providedConne
141141
return providedConnection.getAutoCommit();
142142
}
143143
catch (SQLException e) {
144-
LOGGER.unableToAscertainInitialAutoCommit();
144+
CONNECTION_LOGGER.unableToAscertainInitialAutoCommit();
145145
return true;
146146
}
147147
}

‎hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/LogicalConnectionLogging.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
@Internal
3434
public interface LogicalConnectionLogging extends BasicLogger {
3535
String LOGGER_NAME = SubSystemLogging.BASE + ".resource.jdbc";
36-
LogicalConnectionLogging LOGGER = Logger.getMessageLogger(
36+
LogicalConnectionLogging CONNECTION_LOGGER = Logger.getMessageLogger(
3737
MethodHandles.lookup(), LogicalConnectionLogging.class, LOGGER_NAME
3838
);
3939

‎hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/LogicalConnectionManagedImpl.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import static org.hibernate.ConnectionReleaseMode.AFTER_STATEMENT;
2424
import static org.hibernate.ConnectionReleaseMode.BEFORE_TRANSACTION_COMPLETION;
2525
import static org.hibernate.ConnectionReleaseMode.ON_CLOSE;
26-
import static org.hibernate.resource.jdbc.internal.LogicalConnectionLogging.LOGGER;
26+
import static org.hibernate.resource.jdbc.internal.LogicalConnectionLogging.CONNECTION_LOGGER;
2727
import static org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode.DELAYED_ACQUISITION_AND_RELEASE_AFTER_TRANSACTION;
2828

2929
/**
@@ -53,7 +53,7 @@ public LogicalConnectionManagedImpl(JdbcSessionOwner sessionOwner, ResourceRegis
5353
}
5454

5555
if ( sessionOwner.getJdbcSessionContext().doesConnectionProviderDisableAutoCommit() ) {
56-
LOGGER.connectionProviderDisablesAutoCommitEnabled();
56+
CONNECTION_LOGGER.connectionProviderDisablesAutoCommitEnabled();
5757
}
5858
}
5959

@@ -131,10 +131,10 @@ public void afterStatement() {
131131
super.afterStatement();
132132
if ( connectionHandlingMode.getReleaseMode() == AFTER_STATEMENT ) {
133133
if ( getResourceRegistry().hasRegisteredResources() ) {
134-
LOGGER.skipConnectionReleaseAfterStatementDueToResources( hashCode() );
134+
CONNECTION_LOGGER.skipConnectionReleaseAfterStatementDueToResources( hashCode() );
135135
}
136136
else {
137-
LOGGER.initiatingConnectionReleaseAfterStatement( hashCode() );
137+
CONNECTION_LOGGER.initiatingConnectionReleaseAfterStatement( hashCode() );
138138
releaseConnectionIfNeeded();
139139
}
140140
}
@@ -144,7 +144,7 @@ public void afterStatement() {
144144
public void beforeTransactionCompletion() {
145145
super.beforeTransactionCompletion();
146146
if ( connectionHandlingMode.getReleaseMode() == BEFORE_TRANSACTION_COMPLETION ) {
147-
LOGGER.initiatingConnectionReleaseBeforeTransactionCompletion( hashCode() );
147+
CONNECTION_LOGGER.initiatingConnectionReleaseBeforeTransactionCompletion( hashCode() );
148148
releaseConnectionIfNeeded();
149149
}
150150
}
@@ -157,7 +157,7 @@ public void afterTransaction() {
157157
// - AFTER_STATEMENT cases that were circumvented due to held resources
158158
// - BEFORE_TRANSACTION_COMPLETION cases that were circumvented because a rollback occurred
159159
// (we don't get a beforeTransactionCompletion event on rollback).
160-
LOGGER.initiatingConnectionReleaseAfterTransaction( hashCode() );
160+
CONNECTION_LOGGER.initiatingConnectionReleaseAfterTransaction( hashCode() );
161161
releaseConnectionIfNeeded();
162162
}
163163
}
@@ -238,7 +238,7 @@ private void beforeRelease() {
238238
jdbcSessionOwner.beforeReleaseConnection( physicalConnection );
239239
}
240240
catch (SQLException e) {
241-
LOGGER.errorBeforeReleasingJdbcConnection( hashCode(), e );
241+
CONNECTION_LOGGER.errorBeforeReleasingJdbcConnection( hashCode(), e );
242242
}
243243
}
244244

@@ -256,14 +256,14 @@ public static LogicalConnectionManagedImpl deserialize(ObjectInputStream ois, Jd
256256
public Connection close() {
257257
if ( !closed ) {
258258
getResourceRegistry().releaseResources();
259-
LOGGER.closingLogicalConnection( hashCode() );
259+
CONNECTION_LOGGER.closingLogicalConnection( hashCode() );
260260
try {
261261
releaseConnectionIfNeeded();
262262
}
263263
finally {
264264
// no matter what
265265
closed = true;
266-
LOGGER.logicalConnectionClosed( hashCode() );
266+
CONNECTION_LOGGER.logicalConnectionClosed( hashCode() );
267267
}
268268
}
269269
return null;

‎hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/LogicalConnectionProvidedImpl.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import java.io.ObjectOutputStream;
1010
import java.sql.Connection;
1111

12-
import static org.hibernate.resource.jdbc.internal.LogicalConnectionLogging.LOGGER;
12+
import static org.hibernate.resource.jdbc.internal.LogicalConnectionLogging.CONNECTION_LOGGER;
1313
import org.hibernate.resource.jdbc.ResourceRegistry;
1414
import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode;
1515

@@ -51,15 +51,15 @@ public boolean isOpen() {
5151

5252
@Override
5353
public Connection close() {
54-
LOGGER.closingLogicalConnection();
54+
CONNECTION_LOGGER.closingLogicalConnection();
5555
getResourceRegistry().releaseResources();
5656
try {
5757
return providedConnection;
5858
}
5959
finally {
6060
providedConnection = null;
6161
closed = true;
62-
LOGGER.logicalConnectionClosed();
62+
CONNECTION_LOGGER.logicalConnectionClosed();
6363
}
6464
}
6565

@@ -107,15 +107,15 @@ public void manualReconnect(Connection connection) {
107107
}
108108
else if ( connection == providedConnection ) {
109109
// likely an unmatched reconnect call (no matching disconnect call)
110-
LOGGER.reconnectingSameConnectionAlreadyConnected();
110+
CONNECTION_LOGGER.reconnectingSameConnectionAlreadyConnected();
111111
}
112112
else if ( providedConnection != null ) {
113113
throw new IllegalArgumentException(
114114
"Cannot reconnect to a new user-supplied connection because currently connected; must disconnect before reconnecting."
115115
);
116116
}
117117
providedConnection = connection;
118-
LOGGER.manuallyReconnectedLogicalConnection();
118+
CONNECTION_LOGGER.manuallyReconnectedLogicalConnection();
119119
}
120120

121121
@Override

‎hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/AbstractScriptTargetOutput.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,10 @@ public void prepare() {
2424
@Override
2525
public void accept(String command) {
2626
try {
27-
writer().write( command );
28-
writer().write( System.lineSeparator() );
29-
writer().flush();
27+
final var writer = writer();
28+
writer.write( command );
29+
writer.write( System.lineSeparator() );
30+
writer.flush();
3031
}
3132
catch (IOException e) {
3233
throw new CommandAcceptanceException( "Could not write \"" + command + "\" to target script file", e );

‎hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/GenerationTargetToDatabase.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,13 @@ public void accept(String command) {
7474
getSqlStatementLogger().logStatement( command, FormatStyle.NONE.getFormatter() );
7575

7676
try {
77-
final Statement jdbcStatement = jdbcStatement();
78-
jdbcStatement.execute( command );
77+
final var statement = jdbcStatement();
78+
statement.execute( command );
7979

8080
try {
81-
SQLWarning warnings = jdbcStatement.getWarnings();
81+
SQLWarning warnings = statement.getWarnings();
8282
if ( warnings != null) {
83-
getSqlExceptionHelper().logAndClearWarnings( jdbcStatement );
83+
getSqlExceptionHelper().logAndClearWarnings( statement );
8484
}
8585
}
8686
catch( SQLException e ) {

‎hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/GenerationTargetToScript.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,7 @@ public void prepare() {
3535

3636
@Override
3737
public void accept(String command) {
38-
if ( delimiter != null ) {
39-
command += delimiter;
40-
}
41-
scriptTarget.accept( command );
38+
scriptTarget.accept( delimiter == null ? command : command + delimiter );
4239
}
4340

4441
@Override

‎hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/GenerationTargetToStdout.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,7 @@ public void prepare() {
3131
@Override
3232
@AllowSysOut
3333
public void accept(String command) {
34-
if ( delimiter != null ) {
35-
command += delimiter;
36-
}
37-
System.out.println( command );
34+
System.out.println( delimiter == null ? command : command + delimiter );
3835
}
3936

4037
@Override

0 commit comments

Comments
 (0)