diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/JdbcLogging.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/JdbcLogging.java index bccf8bcefb8f..5c69484fa99f 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/JdbcLogging.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/JdbcLogging.java @@ -189,4 +189,7 @@ public interface JdbcLogging extends BasicLogger { @Message(value = "Could not obtain connection to query JDBC database metadata", id = 100046) void unableToObtainConnectionToQueryMetadata(@Cause Exception e); + @LogMessage(level = TRACE) + @Message(value = "AutoCommit was initially %s", id = 100047) + void initialAutoCommit(boolean wasInitiallyAutoCommit); } diff --git a/hibernate-core/src/main/java/org/hibernate/query/QueryLogging.java b/hibernate-core/src/main/java/org/hibernate/query/QueryLogging.java index 7a956cf3b2ff..c3165a97e5a3 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/QueryLogging.java +++ b/hibernate-core/src/main/java/org/hibernate/query/QueryLogging.java @@ -46,10 +46,6 @@ static Logger subLogger(String subName) { return Logger.getLogger( subLoggerName( subName ) ); } - static T subLogger(String subName, Class loggerJavaType) { - return Logger.getMessageLogger( MethodHandles.lookup(), loggerJavaType, subLoggerName( subName ) ); - } - @LogMessage(level = ERROR) @Message(value = "Error in named query: %s", id = 90003001) void namedQueryError(String queryName, @Cause HibernateException e); diff --git a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/AbstractLogicalConnectionImplementor.java b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/AbstractLogicalConnectionImplementor.java index 8e743bef09d0..c28826c335e2 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/AbstractLogicalConnectionImplementor.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/AbstractLogicalConnectionImplementor.java @@ -14,7 +14,7 @@ import org.hibernate.resource.jdbc.spi.PhysicalJdbcTransaction; import org.hibernate.resource.transaction.spi.TransactionStatus; -import static org.hibernate.resource.jdbc.internal.LogicalConnectionLogging.LOGGER; +import static org.hibernate.resource.jdbc.internal.LogicalConnectionLogging.CONNECTION_LOGGER; /** * Base support for {@link LogicalConnection} implementations @@ -64,9 +64,9 @@ public void afterTransaction() { public void begin() { try { if ( !doConnectionsFromProviderHaveAutoCommitDisabled() ) { - LOGGER.preparingToBeginViaSetAutoCommitFalse(); + CONNECTION_LOGGER.preparingToBeginViaSetAutoCommitFalse(); getConnectionForTransactionManagement().setAutoCommit( false ); - LOGGER.transactionBegunViaSetAutoCommitFalse(); + CONNECTION_LOGGER.transactionBegunViaSetAutoCommitFalse(); } status = TransactionStatus.ACTIVE; } @@ -78,7 +78,7 @@ public void begin() { @Override public void commit() { try { - LOGGER.preparingToCommitViaConnectionCommit(); + CONNECTION_LOGGER.preparingToCommitViaConnectionCommit(); status = TransactionStatus.COMMITTING; if ( isPhysicallyConnected() ) { getConnectionForTransactionManagement().commit(); @@ -87,7 +87,7 @@ public void commit() { errorIfClosed(); } status = TransactionStatus.COMMITTED; - LOGGER.transactionCommittedViaConnectionCommit(); + CONNECTION_LOGGER.transactionCommittedViaConnectionCommit(); } catch( SQLException e ) { status = TransactionStatus.FAILED_COMMIT; @@ -104,20 +104,20 @@ protected void afterCompletion() { protected void resetConnection(boolean initiallyAutoCommit) { try { if ( initiallyAutoCommit ) { - LOGGER.reenablingAutoCommitAfterJdbcTransaction(); + CONNECTION_LOGGER.reenablingAutoCommitAfterJdbcTransaction(); getConnectionForTransactionManagement().setAutoCommit( true ); status = TransactionStatus.NOT_ACTIVE; } } catch ( Exception e ) { - LOGGER.couldNotReEnableAutoCommit( e ); + CONNECTION_LOGGER.couldNotReEnableAutoCommit( e ); } } @Override public void rollback() { try { - LOGGER.preparingToRollbackViaConnectionRollback(); + CONNECTION_LOGGER.preparingToRollbackViaConnectionRollback(); status = TransactionStatus.ROLLING_BACK; if ( isPhysicallyConnected() ) { getConnectionForTransactionManagement().rollback(); @@ -126,7 +126,7 @@ public void rollback() { errorIfClosed(); } status = TransactionStatus.ROLLED_BACK; - LOGGER.transactionRolledBackViaConnectionRollback(); + CONNECTION_LOGGER.transactionRolledBackViaConnectionRollback(); } catch( SQLException e ) { status = TransactionStatus.FAILED_ROLLBACK; @@ -141,7 +141,7 @@ protected static boolean determineInitialAutoCommitMode(Connection providedConne return providedConnection.getAutoCommit(); } catch (SQLException e) { - LOGGER.unableToAscertainInitialAutoCommit(); + CONNECTION_LOGGER.unableToAscertainInitialAutoCommit(); return true; } } diff --git a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/LogicalConnectionLogging.java b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/LogicalConnectionLogging.java index 1fe245ccc9ba..a92125d364e6 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/LogicalConnectionLogging.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/LogicalConnectionLogging.java @@ -33,7 +33,7 @@ @Internal public interface LogicalConnectionLogging extends BasicLogger { String LOGGER_NAME = SubSystemLogging.BASE + ".resource.jdbc"; - LogicalConnectionLogging LOGGER = Logger.getMessageLogger( + LogicalConnectionLogging CONNECTION_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), LogicalConnectionLogging.class, LOGGER_NAME ); diff --git a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/LogicalConnectionManagedImpl.java b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/LogicalConnectionManagedImpl.java index 644099581cde..62afa85b72dc 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/LogicalConnectionManagedImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/LogicalConnectionManagedImpl.java @@ -23,7 +23,7 @@ import static org.hibernate.ConnectionReleaseMode.AFTER_STATEMENT; import static org.hibernate.ConnectionReleaseMode.BEFORE_TRANSACTION_COMPLETION; import static org.hibernate.ConnectionReleaseMode.ON_CLOSE; -import static org.hibernate.resource.jdbc.internal.LogicalConnectionLogging.LOGGER; +import static org.hibernate.resource.jdbc.internal.LogicalConnectionLogging.CONNECTION_LOGGER; import static org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode.DELAYED_ACQUISITION_AND_RELEASE_AFTER_TRANSACTION; /** @@ -53,7 +53,7 @@ public LogicalConnectionManagedImpl(JdbcSessionOwner sessionOwner, ResourceRegis } if ( sessionOwner.getJdbcSessionContext().doesConnectionProviderDisableAutoCommit() ) { - LOGGER.connectionProviderDisablesAutoCommitEnabled(); + CONNECTION_LOGGER.connectionProviderDisablesAutoCommitEnabled(); } } @@ -131,10 +131,10 @@ public void afterStatement() { super.afterStatement(); if ( connectionHandlingMode.getReleaseMode() == AFTER_STATEMENT ) { if ( getResourceRegistry().hasRegisteredResources() ) { - LOGGER.skipConnectionReleaseAfterStatementDueToResources( hashCode() ); + CONNECTION_LOGGER.skipConnectionReleaseAfterStatementDueToResources( hashCode() ); } else { - LOGGER.initiatingConnectionReleaseAfterStatement( hashCode() ); + CONNECTION_LOGGER.initiatingConnectionReleaseAfterStatement( hashCode() ); releaseConnectionIfNeeded(); } } @@ -144,7 +144,7 @@ public void afterStatement() { public void beforeTransactionCompletion() { super.beforeTransactionCompletion(); if ( connectionHandlingMode.getReleaseMode() == BEFORE_TRANSACTION_COMPLETION ) { -LOGGER.initiatingConnectionReleaseBeforeTransactionCompletion( hashCode() ); +CONNECTION_LOGGER.initiatingConnectionReleaseBeforeTransactionCompletion( hashCode() ); releaseConnectionIfNeeded(); } } @@ -157,7 +157,7 @@ public void afterTransaction() { // - AFTER_STATEMENT cases that were circumvented due to held resources // - BEFORE_TRANSACTION_COMPLETION cases that were circumvented because a rollback occurred // (we don't get a beforeTransactionCompletion event on rollback). -LOGGER.initiatingConnectionReleaseAfterTransaction( hashCode() ); +CONNECTION_LOGGER.initiatingConnectionReleaseAfterTransaction( hashCode() ); releaseConnectionIfNeeded(); } } @@ -238,7 +238,7 @@ private void beforeRelease() { jdbcSessionOwner.beforeReleaseConnection( physicalConnection ); } catch (SQLException e) { -LOGGER.errorBeforeReleasingJdbcConnection( hashCode(), e ); +CONNECTION_LOGGER.errorBeforeReleasingJdbcConnection( hashCode(), e ); } } @@ -256,14 +256,14 @@ public static LogicalConnectionManagedImpl deserialize(ObjectInputStream ois, Jd public Connection close() { if ( !closed ) { getResourceRegistry().releaseResources(); -LOGGER.closingLogicalConnection( hashCode() ); +CONNECTION_LOGGER.closingLogicalConnection( hashCode() ); try { releaseConnectionIfNeeded(); } finally { // no matter what closed = true; - LOGGER.logicalConnectionClosed( hashCode() ); + CONNECTION_LOGGER.logicalConnectionClosed( hashCode() ); } } return null; diff --git a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/LogicalConnectionProvidedImpl.java b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/LogicalConnectionProvidedImpl.java index 1787037db60c..cef982818fcd 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/LogicalConnectionProvidedImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/LogicalConnectionProvidedImpl.java @@ -9,7 +9,7 @@ import java.io.ObjectOutputStream; import java.sql.Connection; -import static org.hibernate.resource.jdbc.internal.LogicalConnectionLogging.LOGGER; +import static org.hibernate.resource.jdbc.internal.LogicalConnectionLogging.CONNECTION_LOGGER; import org.hibernate.resource.jdbc.ResourceRegistry; import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode; @@ -51,7 +51,7 @@ public boolean isOpen() { @Override public Connection close() { - LOGGER.closingLogicalConnection(); + CONNECTION_LOGGER.closingLogicalConnection(); getResourceRegistry().releaseResources(); try { return providedConnection; @@ -59,7 +59,7 @@ public Connection close() { finally { providedConnection = null; closed = true; - LOGGER.logicalConnectionClosed(); + CONNECTION_LOGGER.logicalConnectionClosed(); } } @@ -107,7 +107,7 @@ public void manualReconnect(Connection connection) { } else if ( connection == providedConnection ) { // likely an unmatched reconnect call (no matching disconnect call) - LOGGER.reconnectingSameConnectionAlreadyConnected(); + CONNECTION_LOGGER.reconnectingSameConnectionAlreadyConnected(); } else if ( providedConnection != null ) { throw new IllegalArgumentException( @@ -115,7 +115,7 @@ else if ( providedConnection != null ) { ); } providedConnection = connection; - LOGGER.manuallyReconnectedLogicalConnection(); + CONNECTION_LOGGER.manuallyReconnectedLogicalConnection(); } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/AbstractScriptTargetOutput.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/AbstractScriptTargetOutput.java index 61a2f6afede1..00f0b96f9b75 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/AbstractScriptTargetOutput.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/AbstractScriptTargetOutput.java @@ -24,9 +24,10 @@ public void prepare() { @Override public void accept(String command) { try { - writer().write( command ); - writer().write( System.lineSeparator() ); - writer().flush(); + final var writer = writer(); + writer.write( command ); + writer.write( System.lineSeparator() ); + writer.flush(); } catch (IOException e) { throw new CommandAcceptanceException( "Could not write \"" + command + "\" to target script file", e ); diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/GenerationTargetToDatabase.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/GenerationTargetToDatabase.java index bafc4d195088..70c925f6a059 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/GenerationTargetToDatabase.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/GenerationTargetToDatabase.java @@ -74,13 +74,13 @@ public void accept(String command) { getSqlStatementLogger().logStatement( command, FormatStyle.NONE.getFormatter() ); try { - final Statement jdbcStatement = jdbcStatement(); - jdbcStatement.execute( command ); + final var statement = jdbcStatement(); + statement.execute( command ); try { - SQLWarning warnings = jdbcStatement.getWarnings(); + SQLWarning warnings = statement.getWarnings(); if ( warnings != null) { - getSqlExceptionHelper().logAndClearWarnings( jdbcStatement ); + getSqlExceptionHelper().logAndClearWarnings( statement ); } } catch( SQLException e ) { diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/GenerationTargetToScript.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/GenerationTargetToScript.java index b2d0158b413f..81a3494410a8 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/GenerationTargetToScript.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/GenerationTargetToScript.java @@ -35,10 +35,7 @@ public void prepare() { @Override public void accept(String command) { - if ( delimiter != null ) { - command += delimiter; - } - scriptTarget.accept( command ); + scriptTarget.accept( delimiter == null ? command : command + delimiter ); } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/GenerationTargetToStdout.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/GenerationTargetToStdout.java index df1c9cd2fc49..3d79188b17d1 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/GenerationTargetToStdout.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/GenerationTargetToStdout.java @@ -31,10 +31,7 @@ public void prepare() { @Override @AllowSysOut public void accept(String command) { - if ( delimiter != null ) { - command += delimiter; - } - System.out.println( command ); + System.out.println( delimiter == null ? command : command + delimiter ); } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/JdbcConnectionAccessConnectionProviderImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/JdbcConnectionAccessConnectionProviderImpl.java index d50c9e864785..56a94103a756 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/JdbcConnectionAccessConnectionProviderImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/JdbcConnectionAccessConnectionProviderImpl.java @@ -11,8 +11,6 @@ import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; import org.hibernate.engine.jdbc.connections.spi.JdbcConnectionAccess; -import org.jboss.logging.Logger; - import static org.hibernate.engine.jdbc.JdbcLogging.JDBC_LOGGER; /** @@ -22,7 +20,6 @@ * @author Steve Ebersole */ public class JdbcConnectionAccessConnectionProviderImpl implements JdbcConnectionAccess { - private static final Logger LOG = Logger.getLogger( JdbcConnectionAccessConnectionProviderImpl.class ); private final ConnectionProvider connectionProvider; private final Connection jdbcConnection; @@ -32,7 +29,7 @@ public JdbcConnectionAccessConnectionProviderImpl(ConnectionProvider connectionP this.connectionProvider = connectionProvider; try { - this.jdbcConnection = connectionProvider.getConnection(); + jdbcConnection = connectionProvider.getConnection(); } catch (SQLException e) { throw new PersistenceException( "Unable to obtain JDBC Connection", e ); @@ -61,7 +58,7 @@ public JdbcConnectionAccessConnectionProviderImpl(ConnectionProvider connectionP wasInitiallyAutoCommit = false; } - LOG.tracef( "wasInitiallyAutoCommit=%s", wasInitiallyAutoCommit ); + JDBC_LOGGER.initialAutoCommit( wasInitiallyAutoCommit ); this.wasInitiallyAutoCommit = wasInitiallyAutoCommit; } diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/JdbcConnectionAccessProvidedConnectionImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/JdbcConnectionAccessProvidedConnectionImpl.java index 72317dc272ac..dcdfa6ba9da1 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/JdbcConnectionAccessProvidedConnectionImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/JdbcConnectionAccessProvidedConnectionImpl.java @@ -10,8 +10,6 @@ import org.hibernate.engine.jdbc.connections.spi.JdbcConnectionAccess; -import org.jboss.logging.Logger; - import static org.hibernate.engine.jdbc.JdbcLogging.JDBC_LOGGER; /** @@ -21,7 +19,6 @@ * @author Steve Ebersole */ public class JdbcConnectionAccessProvidedConnectionImpl implements JdbcConnectionAccess { - private static final Logger LOG = Logger.getLogger( JdbcConnectionAccessProvidedConnectionImpl.class ); private final Connection jdbcConnection; private final boolean wasInitiallyAutoCommit; @@ -52,7 +49,7 @@ public JdbcConnectionAccessProvidedConnectionImpl(Connection jdbcConnection) { wasInitiallyAutoCommit = false; } - LOG.tracef( "wasInitiallyAutoCommit=%s", wasInitiallyAutoCommit ); + JDBC_LOGGER.initialAutoCommit( wasInitiallyAutoCommit ); this.wasInitiallyAutoCommit = wasInitiallyAutoCommit; } diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptSourceInputAggregate.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptSourceInputAggregate.java index d708a2667113..d70a73bfbfdd 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptSourceInputAggregate.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptSourceInputAggregate.java @@ -39,9 +39,9 @@ public List extract(Function> extractor) { final List[] lists = new List[inputs.length]; int size = 0; for ( int i = 0; i < inputs.length; i++ ) { - final AbstractScriptSourceInput scriptSourceInput = inputs[i]; + final var scriptSourceInput = inputs[i]; if ( scriptSourceInput.exists() ) { - final Reader reader = scriptSourceInput.prepareReader(); + final var reader = scriptSourceInput.prepareReader(); try { CORE_LOGGER.executingScript( scriptSourceInput.getScriptDescription() ); lists[i] = extractor.apply( reader ); @@ -62,8 +62,8 @@ public List extract(Function> extractor) { @Override public boolean containsScript(URL url) { - for ( int i = 0; i < inputs.length; i++ ) { - if ( inputs[i].containsScript( url ) ) { + for ( var input : inputs ) { + if ( input.containsScript( url ) ) { return true; } } diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptSourceInputFromFile.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptSourceInputFromFile.java index 56dcb632810d..2807032bba7c 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptSourceInputFromFile.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptSourceInputFromFile.java @@ -52,12 +52,12 @@ private static Reader toReader(File file, String charsetName) { LOG.warnf( "Specified schema generation script file [%s] did not exist for reading", file ); return new Reader() { @Override - public int read(char[] cbuf, int off, int len) throws IOException { + public int read(char[] cbuf, int off, int len) { return -1; } @Override - public void close() throws IOException { + public void close() { } }; } diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptSourceInputFromReader.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptSourceInputFromReader.java index f8678c83793d..fe3fde5e6bf5 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptSourceInputFromReader.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptSourceInputFromReader.java @@ -5,7 +5,6 @@ package org.hibernate.tool.schema.internal.exec; import java.io.Reader; -import java.net.URL; /** * ScriptSourceInput implementation for explicitly given Readers. @@ -39,11 +38,6 @@ protected void releaseReader(Reader reader) { // nothing to do } - @Override - public boolean containsScript(URL url) { - return false; - } - @Override public String toString() { return "ScriptSourceInputFromReader()"; diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptSourceInputNonExistentImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptSourceInputNonExistentImpl.java index 172274040f61..b2a0efd9f997 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptSourceInputNonExistentImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptSourceInputNonExistentImpl.java @@ -5,7 +5,6 @@ package org.hibernate.tool.schema.internal.exec; import java.io.Reader; -import java.net.URL; import java.util.Collections; import java.util.List; import java.util.function.Function; @@ -37,11 +36,6 @@ protected void releaseReader(Reader reader) { } - @Override - public boolean containsScript(URL url) { - return false; - } - @Override public List extract(Function> extractor) { return Collections.emptyList();