diff --git a/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/SessionBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/SessionBuilderImpl.java index 330f6acfd5cc..5a23d775850c 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/SessionBuilderImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/SessionBuilderImpl.java @@ -20,7 +20,7 @@ import java.util.TimeZone; import static java.util.Collections.addAll; -import static org.hibernate.internal.CoreMessageLogger.LOGGER; +import static org.hibernate.internal.CoreMessageLogger.CORE_LOGGER; /** * SessionBuilder implementation. @@ -148,7 +148,7 @@ public List getCustomSessionEventListeners() { @Override public SessionImplementor openSession() { - LOGGER.tracef( "Opening Hibernate Session [tenant=%s]", tenantIdentifier ); + CORE_LOGGER.openingSession( tenantIdentifier ); return createSession(); } diff --git a/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/SharedSessionBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/SharedSessionBuilderImpl.java index 4e0300164d31..7b0fee5308e2 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/SharedSessionBuilderImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/SharedSessionBuilderImpl.java @@ -26,7 +26,7 @@ import java.util.TimeZone; import static java.util.Collections.addAll; -import static org.hibernate.internal.CoreMessageLogger.LOGGER; +import static org.hibernate.internal.CoreMessageLogger.CORE_LOGGER; /** * @author Steve Ebersole @@ -82,7 +82,7 @@ protected SharedSessionBuilderImplementor getThis() { @Override public SessionImplementor openSession() { - LOGGER.tracef( "Opening Session [tenant=%s]", tenantIdentifier ); + CORE_LOGGER.openingSession( tenantIdentifier ); if ( original.getFactory().getSessionFactoryOptions().isMultiTenancyEnabled() ) { if ( shareTransactionContext ) { if ( tenantIdChanged ) { diff --git a/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/SharedStatelessSessionBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/SharedStatelessSessionBuilderImpl.java index 5ede16df6b00..585579dbf1a8 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/SharedStatelessSessionBuilderImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/SharedStatelessSessionBuilderImpl.java @@ -22,7 +22,7 @@ import java.util.Objects; import java.util.TimeZone; -import static org.hibernate.internal.CoreMessageLogger.LOGGER; +import static org.hibernate.internal.CoreMessageLogger.CORE_LOGGER; /** * Builder for shared {@linkplain StatelessSessionImplementor stateless} sessions. @@ -60,7 +60,7 @@ protected SharedStatelessSessionBuilder getThis() { @Override public StatelessSessionImplementor open() { - LOGGER.tracef( "Opening StatelessSession [tenant=%s]", tenantIdentifier ); + CORE_LOGGER.openingStatelessSession( tenantIdentifier ); if ( original.getSessionFactory().getSessionFactoryOptions().isMultiTenancyEnabled() ) { if ( shareTransactionContext ) { final var tenantId = original.getTenantIdentifierValue(); diff --git a/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/StatelessSessionBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/StatelessSessionBuilderImpl.java index 35e49201ad98..38ac90bcf9ed 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/StatelessSessionBuilderImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/StatelessSessionBuilderImpl.java @@ -19,7 +19,7 @@ import java.util.List; import java.util.TimeZone; -import static org.hibernate.internal.CoreMessageLogger.LOGGER; +import static org.hibernate.internal.CoreMessageLogger.CORE_LOGGER; /** * @author Steve Ebersole @@ -42,7 +42,7 @@ protected StatelessSessionBuilder getThis() { @Override public StatelessSession openStatelessSession() { - LOGGER.tracef( "Opening StatelessSession [tenant=%s]", tenantIdentifier ); + CORE_LOGGER.openingStatelessSession( tenantIdentifier ); return createStatelessSession(); } 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 028f0e5de1b5..bccf8bcefb8f 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 @@ -39,7 +39,7 @@ public interface JdbcLogging extends BasicLogger { String NAME = SubSystemLogging.BASE + ".jdbc"; - JdbcLogging JDBC_MESSAGE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), JdbcLogging.class, NAME ); + JdbcLogging JDBC_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), JdbcLogging.class, NAME ); @LogMessage(level = WARN) @Message( diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchImpl.java index 540d0dfaba0d..e4d3e02b9257 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchImpl.java @@ -21,7 +21,7 @@ import org.hibernate.engine.jdbc.spi.SqlStatementLogger; import static java.util.Objects.requireNonNull; -import static org.hibernate.engine.jdbc.JdbcLogging.JDBC_MESSAGE_LOGGER; +import static org.hibernate.engine.jdbc.JdbcLogging.JDBC_LOGGER; import static org.hibernate.engine.jdbc.batch.JdbcBatchLogging.BATCH_MESSAGE_LOGGER; import static org.hibernate.sql.model.ModelMutationLogging.MODEL_MUTATION_LOGGER; @@ -284,7 +284,7 @@ private void checkRowCounts(int[] rowCounts, PreparedStatementDetails statementD throws SQLException, HibernateException { final int numberOfRowCounts = rowCounts.length; if ( batchPosition != 0 && numberOfRowCounts != batchPosition ) { - JDBC_MESSAGE_LOGGER.unexpectedRowCounts( + JDBC_LOGGER.unexpectedRowCounts( statementDetails.getMutatingTableDetails().getTableName(), numberOfRowCounts, batchPosition diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/ExtractedDatabaseMetaDataImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/ExtractedDatabaseMetaDataImpl.java index 690b0aca7255..d86b16601a43 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/ExtractedDatabaseMetaDataImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/ExtractedDatabaseMetaDataImpl.java @@ -22,7 +22,7 @@ import static java.sql.ResultSet.TYPE_SCROLL_INSENSITIVE; import static java.util.Collections.emptyList; import static java.util.stream.StreamSupport.stream; -import static org.hibernate.engine.jdbc.JdbcLogging.JDBC_MESSAGE_LOGGER; +import static org.hibernate.engine.jdbc.JdbcLogging.JDBC_LOGGER; import static org.hibernate.engine.jdbc.env.spi.SQLStateType.interpretReportedSQLStateType; /** @@ -271,7 +271,7 @@ private List sequenceInformationList() { connectionAccess.releaseConnection( connection ); } catch (SQLException exception) { - JDBC_MESSAGE_LOGGER.unableToReleaseConnection( exception ); + JDBC_LOGGER.unableToReleaseConnection( exception ); } } } diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentImpl.java index 9b80eb3b079f..d8e866d15429 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentImpl.java @@ -33,7 +33,7 @@ import static org.hibernate.cfg.MappingSettings.DEFAULT_CATALOG; import static org.hibernate.cfg.MappingSettings.DEFAULT_SCHEMA; import static org.hibernate.engine.config.spi.StandardConverters.STRING; -import static org.hibernate.engine.jdbc.JdbcLogging.JDBC_MESSAGE_LOGGER; +import static org.hibernate.engine.jdbc.JdbcLogging.JDBC_LOGGER; import static org.hibernate.engine.jdbc.env.internal.LobCreatorBuilderImpl.makeLobCreatorBuilder; /** @@ -117,7 +117,7 @@ private static IdentifierHelper identifierHelper(Dialect dialect, IdentifierHelp } catch (SQLException sqle) { // should never ever happen - JDBC_MESSAGE_LOGGER.noDatabaseMetaData( sqle ); + JDBC_LOGGER.noDatabaseMetaData( sqle ); } return builder.build(); } @@ -207,7 +207,7 @@ private IdentifierHelper identifierHelper(DatabaseMetaData databaseMetaData, Dia } catch (SQLException sqle) { // should never ever happen - JDBC_MESSAGE_LOGGER.noDatabaseMetaData( sqle ); + JDBC_LOGGER.noDatabaseMetaData( sqle ); } return identifierHelperBuilder.build(); } @@ -307,7 +307,7 @@ private IdentifierHelper identifierHelper( } catch (SQLException sqle) { // should never ever happen - JDBC_MESSAGE_LOGGER.noDatabaseMetaData( sqle ); + JDBC_LOGGER.noDatabaseMetaData( sqle ); } return builder.build(); } @@ -373,10 +373,10 @@ public LobCreatorBuilder getLobCreatorBuilder() { private static void logJdbcFetchSize(int defaultFetchSize, ConfigurationService cfgService) { if ( !cfgService.getSettings().containsKey( JdbcSettings.STATEMENT_FETCH_SIZE ) ) { if ( defaultFetchSize > 0 && defaultFetchSize < 100 ) { - JDBC_MESSAGE_LOGGER.warnLowFetchSize( defaultFetchSize ); + JDBC_LOGGER.warnLowFetchSize( defaultFetchSize ); } else { - JDBC_MESSAGE_LOGGER.usingFetchSize( defaultFetchSize ); + JDBC_LOGGER.usingFetchSize( defaultFetchSize ); } } } diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentInitiator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentInitiator.java index efb7db8751ba..2f92bf2e14f8 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentInitiator.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentInitiator.java @@ -45,7 +45,7 @@ import org.hibernate.stat.spi.StatisticsImplementor; -import static org.hibernate.engine.jdbc.JdbcLogging.JDBC_MESSAGE_LOGGER; +import static org.hibernate.engine.jdbc.JdbcLogging.JDBC_LOGGER; import static java.lang.Integer.parseInt; import static org.hibernate.cfg.AvailableSettings.CONNECTION_HANDLING; @@ -380,7 +380,7 @@ public JdbcEnvironmentImpl execute(Connection connection) { ); } catch (SQLException e) { - JDBC_MESSAGE_LOGGER.unableToObtainConnectionMetadata( e ); + JDBC_LOGGER.unableToObtainConnectionMetadata( e ); } // accessing the JDBC metadata failed @@ -411,7 +411,7 @@ private int databaseMicroVersion(DatabaseMetaData metadata) throws SQLException ); } catch ( Exception e ) { - JDBC_MESSAGE_LOGGER.unableToObtainConnectionToQueryMetadata( e ); + JDBC_LOGGER.unableToObtainConnectionToQueryMetadata( e ); } finally { //noinspection resource @@ -422,14 +422,14 @@ private int databaseMicroVersion(DatabaseMetaData metadata) throws SQLException } private static void logDatabaseAndDriver(DatabaseMetaData dbmd) throws SQLException { - if ( JDBC_MESSAGE_LOGGER.isDebugEnabled() ) { - JDBC_MESSAGE_LOGGER.logDatabaseInfo( + if ( JDBC_LOGGER.isDebugEnabled() ) { + JDBC_LOGGER.logDatabaseInfo( dbmd.getDatabaseProductName(), dbmd.getDatabaseProductVersion(), dbmd.getDatabaseMajorVersion(), dbmd.getDatabaseMinorVersion() ); - JDBC_MESSAGE_LOGGER.logDriverInfo( + JDBC_LOGGER.logDriverInfo( dbmd.getDriverName(), dbmd.getDriverVersion(), dbmd.getDriverMajorVersion(), diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcCoordinatorImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcCoordinatorImpl.java index f874f7a4c694..7d70641bfa30 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcCoordinatorImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcCoordinatorImpl.java @@ -35,7 +35,7 @@ import java.util.function.Supplier; import static org.hibernate.ConnectionReleaseMode.AFTER_STATEMENT; -import static org.hibernate.engine.jdbc.JdbcLogging.JDBC_MESSAGE_LOGGER; +import static org.hibernate.engine.jdbc.JdbcLogging.JDBC_LOGGER; import static org.hibernate.engine.jdbc.batch.JdbcBatchLogging.BATCH_MESSAGE_LOGGER; /** @@ -46,7 +46,7 @@ * @author Sanne Grinovero */ public class JdbcCoordinatorImpl implements JdbcCoordinator { - private static final boolean TRACE_ENABLED = JDBC_MESSAGE_LOGGER.isTraceEnabled(); + private static final boolean TRACE_ENABLED = JDBC_LOGGER.isTraceEnabled(); private transient final LogicalConnectionImplementor logicalConnection; private transient final JdbcSessionOwner owner; @@ -79,7 +79,7 @@ public JdbcCoordinatorImpl( this.isUserSuppliedConnection = userSuppliedConnection != null; this.logicalConnection = createLogicalConnection( userSuppliedConnection, owner ); if ( TRACE_ENABLED ) { - JDBC_MESSAGE_LOGGER.createdJdbcCoordinator( hashCode() ); + JDBC_LOGGER.createdJdbcCoordinator( hashCode() ); } } @@ -102,7 +102,7 @@ private JdbcCoordinatorImpl( this.owner = owner; this.jdbcServices = owner.getJdbcSessionContext().getJdbcServices(); if ( TRACE_ENABLED ) { - JDBC_MESSAGE_LOGGER.createdJdbcCoordinator( hashCode() ); + JDBC_LOGGER.createdJdbcCoordinator( hashCode() ); } } @@ -146,12 +146,12 @@ public void flushEnding() { @Override public Connection close() { if ( TRACE_ENABLED ) { - JDBC_MESSAGE_LOGGER.closingJdbcCoordinator( hashCode() ); + JDBC_LOGGER.closingJdbcCoordinator( hashCode() ); } final Connection connection; try { if ( currentBatch != null ) { - JDBC_MESSAGE_LOGGER.closingUnreleasedBatch( hashCode() ); + JDBC_LOGGER.closingUnreleasedBatch( hashCode() ); currentBatch.release(); currentBatch = null; } @@ -289,14 +289,14 @@ public int determineRemainingTransactionTimeOutPeriod() { public void afterStatementExecution() { final var connectionReleaseMode = connectionReleaseMode(); if ( TRACE_ENABLED ) { - JDBC_MESSAGE_LOGGER.statementExecutionComplete( connectionReleaseMode, hashCode() ); + JDBC_LOGGER.statementExecutionComplete( connectionReleaseMode, hashCode() ); } if ( connectionReleaseMode == AFTER_STATEMENT ) { if ( ! releasesEnabled ) { - JDBC_MESSAGE_LOGGER.trace( "Skipping aggressive release due to manual disabling" ); + JDBC_LOGGER.trace( "Skipping aggressive release due to manual disabling" ); } else if ( hasRegisteredResources() ) { - JDBC_MESSAGE_LOGGER.trace( "Skipping aggressive release due to registered resources" ); + JDBC_LOGGER.trace( "Skipping aggressive release due to registered resources" ); } else { getLogicalConnection().afterStatement(); @@ -397,7 +397,7 @@ public boolean isActive() { @Override public void afterTransactionBegin() { if ( TRACE_ENABLED ) { - JDBC_MESSAGE_LOGGER.transactionAfterBegin( hashCode() ); + JDBC_LOGGER.transactionAfterBegin( hashCode() ); } owner.afterTransactionBegin(); } @@ -405,7 +405,7 @@ public void afterTransactionBegin() { @Override public void beforeTransactionCompletion() { if ( TRACE_ENABLED ) { - JDBC_MESSAGE_LOGGER.transactionBeforeCompletion( hashCode() ); + JDBC_LOGGER.transactionBeforeCompletion( hashCode() ); } owner.beforeTransactionCompletion(); logicalConnection.beforeTransactionCompletion(); @@ -414,7 +414,7 @@ public void beforeTransactionCompletion() { @Override public void afterTransactionCompletion(boolean successful, boolean delayed) { if ( TRACE_ENABLED ) { - JDBC_MESSAGE_LOGGER.transactionAfterCompletion( + JDBC_LOGGER.transactionAfterCompletion( successful ? "successful" : "unsuccessful", hashCode() ); } diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/StatementPreparerImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/StatementPreparerImpl.java index 12b82f1c370f..5f752f5e6e48 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/StatementPreparerImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/StatementPreparerImpl.java @@ -21,7 +21,7 @@ import org.checkerframework.checker.nullness.qual.Nullable; -import static org.hibernate.engine.jdbc.JdbcLogging.JDBC_MESSAGE_LOGGER; +import static org.hibernate.engine.jdbc.JdbcLogging.JDBC_LOGGER; /** * Standard implementation of {@link StatementPreparer}. @@ -224,18 +224,18 @@ public void postProcess(PreparedStatement preparedStatement) throws SQLException private void setStatementFetchSize(PreparedStatement statement) throws SQLException { final Integer fetchSize = settings().getFetchSizeOrNull(); if ( fetchSize != null ) { - JDBC_MESSAGE_LOGGER.settingFetchSize( fetchSize ); + JDBC_LOGGER.settingFetchSize( fetchSize ); statement.setFetchSize( fetchSize ); } else { - if ( JDBC_MESSAGE_LOGGER.isDebugEnabled() ) { + if ( JDBC_LOGGER.isDebugEnabled() ) { final int defaultFetchSize = statement.getFetchSize(); if ( defaultFetchSize > 0 && defaultFetchSize < 100 ) { - JDBC_MESSAGE_LOGGER.lowFetchSize( defaultFetchSize ); + JDBC_LOGGER.lowFetchSize( defaultFetchSize ); } } - else if ( JDBC_MESSAGE_LOGGER.isTraceEnabled() ) { - JDBC_MESSAGE_LOGGER.fetchSize( statement.getFetchSize() ); + else if ( JDBC_LOGGER.isTraceEnabled() ) { + JDBC_LOGGER.fetchSize( statement.getFetchSize() ); } } } diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/IdentifierValue.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/IdentifierValue.java index ffec0f203432..63a8c557d930 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/IdentifierValue.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/IdentifierValue.java @@ -8,7 +8,7 @@ import org.checkerframework.checker.nullness.qual.Nullable; -import static org.hibernate.internal.CoreMessageLogger.LOGGER; +import static org.hibernate.internal.CoreMessageLogger.CORE_LOGGER; /** * A strategy for determining if an identifier value is an identifier of @@ -28,7 +28,7 @@ public class IdentifierValue implements UnsavedValueStrategy { public static final IdentifierValue ANY = new IdentifierValue() { @Override public Boolean isUnsaved(Object id) { - LOGGER.trace( "ID unsaved-value strategy ANY" ); + CORE_LOGGER.idUnsavedValueStrategy( "ANY" ); return Boolean.TRUE; } @@ -49,7 +49,7 @@ public String toString() { public static final IdentifierValue NONE = new IdentifierValue() { @Override public Boolean isUnsaved(Object id) { - LOGGER.trace( "ID unsaved-value strategy NONE" ); + CORE_LOGGER.idUnsavedValueStrategy( "NONE" ); return Boolean.FALSE; } @@ -71,7 +71,7 @@ public String toString() { public static final IdentifierValue NULL = new IdentifierValue() { @Override public Boolean isUnsaved(@Nullable Object id) { - LOGGER.trace( "ID unsaved-value strategy NULL" ); + CORE_LOGGER.idUnsavedValueStrategy( "NULL" ); return id == null; } @@ -92,7 +92,7 @@ public String toString() { public static final IdentifierValue UNDEFINED = new IdentifierValue() { @Override public @Nullable Boolean isUnsaved(Object id) { - LOGGER.trace( "ID unsaved-value strategy UNDEFINED" ); + CORE_LOGGER.idUnsavedValueStrategy( "UNDEFINED" ); return null; } @@ -124,7 +124,7 @@ public IdentifierValue(Object value) { */ @Override public @Nullable Boolean isUnsaved(@Nullable Object id) { - LOGGER.tracef( "ID unsaved-value: %s", value ); + CORE_LOGGER.idUnsavedValue( value ); return id == null || id.equals( value ); } diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/VersionValue.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/VersionValue.java index da88633d38d0..237658726e28 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/VersionValue.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/VersionValue.java @@ -9,7 +9,7 @@ import org.checkerframework.checker.nullness.qual.Nullable; -import static org.hibernate.internal.CoreMessageLogger.LOGGER; +import static org.hibernate.internal.CoreMessageLogger.CORE_LOGGER; /** * A strategy for determining if a version value is a version of @@ -29,7 +29,7 @@ public class VersionValue implements UnsavedValueStrategy { public static final VersionValue NULL = new VersionValue() { @Override public Boolean isUnsaved(@Nullable Object version) { - LOGGER.trace( "Version unsaved-value strategy NULL" ); + CORE_LOGGER.versionUnsavedValueStrategy( "NULL" ); return version == null; } @@ -51,7 +51,7 @@ public String toString() { public static final VersionValue UNDEFINED = new VersionValue() { @Override public @Nullable Boolean isUnsaved(@Nullable Object version) { - LOGGER.trace( "Version unsaved-value strategy UNDEFINED" ); + CORE_LOGGER.versionUnsavedValueStrategy( "UNDEFINED" ); return version == null ? Boolean.TRUE : null; } @@ -74,7 +74,7 @@ public String toString() { @Override public Boolean isUnsaved(@Nullable Object version) throws MappingException { - LOGGER.trace( "Version unsaved-value strategy NEGATIVE" ); + CORE_LOGGER.versionUnsavedValueStrategy( "NEGATIVE" ); if ( version == null ) { return Boolean.TRUE; } @@ -113,7 +113,7 @@ public VersionValue(Object value) { @Override public @Nullable Boolean isUnsaved(@Nullable Object version) throws MappingException { - LOGGER.tracef( "Version unsaved-value: %s", value ); + CORE_LOGGER.versionUnsavedValue( value ); return version == null || version.equals( value ); } diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/TransactionImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/TransactionImpl.java index 0da7f5dd1e70..4a165607323d 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/TransactionImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/TransactionImpl.java @@ -7,14 +7,13 @@ import jakarta.transaction.Synchronization; import org.checkerframework.checker.nullness.qual.Nullable; -import org.hibernate.HibernateException; import org.hibernate.TransactionException; import org.hibernate.engine.transaction.spi.TransactionImplementor; import org.hibernate.internal.AbstractSharedSessionContract; import org.hibernate.resource.transaction.spi.TransactionCoordinator; import org.hibernate.resource.transaction.spi.TransactionStatus; -import static org.hibernate.internal.CoreMessageLogger.LOGGER; +import static org.hibernate.internal.CoreMessageLogger.CORE_LOGGER; import static org.hibernate.resource.transaction.spi.TransactionCoordinator.TransactionDriver; /** @@ -33,20 +32,22 @@ public TransactionImpl( TransactionCoordinator transactionCoordinator, AbstractSharedSessionContract session) { this.transactionCoordinator = transactionCoordinator; - this.jpaCompliance = + this.session = session; + + jpaCompliance = session.getFactory().getSessionFactoryOptions().getJpaCompliance() .isJpaTransactionComplianceEnabled(); - this.session = session; if ( session.isOpen() && transactionCoordinator.isActive() ) { - this.transactionDriverControl = transactionCoordinator.getTransactionDriverControl(); + transactionDriverControl = + transactionCoordinator.getTransactionDriverControl(); } else { - LOGGER.debug( "TransactionImpl created on closed Session/EntityManager" ); + CORE_LOGGER.transactionCreatedOnClosedSession(); } - if ( LOGGER.isDebugEnabled() && jpaCompliance ) { - LOGGER.debugf( "TransactionImpl created in JPA compliant mode" ); + if ( CORE_LOGGER.isDebugEnabled() && jpaCompliance ) { + CORE_LOGGER.transactionCreatedInJpaCompliantMode(); } } @@ -57,7 +58,8 @@ public void begin() { } if ( transactionDriverControl == null ) { - transactionDriverControl = transactionCoordinator.getTransactionDriverControl(); + transactionDriverControl = + transactionCoordinator.getTransactionDriverControl(); } if ( isActive() ) { @@ -69,7 +71,7 @@ else if ( !transactionCoordinator.getTransactionCoordinatorBuilder().isJta() ) { } } else { - LOGGER.debug( "Beginning transaction" ); + CORE_LOGGER.beginningTransaction(); transactionDriverControl.begin(); } } @@ -82,7 +84,7 @@ public void commit() { throw new IllegalStateException( "Transaction not successfully started" ); } else { - LOGGER.debug( "Committing transaction" ); + CORE_LOGGER.committingTransaction(); try { internalGetTransactionDriverControl().commit(); } @@ -108,16 +110,16 @@ public void rollback() { throw new IllegalStateException( "rollback() called on inactive transaction (in JPA compliant mode)" ); } - final TransactionStatus status = getStatus(); + final var status = getStatus(); if ( status == TransactionStatus.ROLLED_BACK || status == TransactionStatus.NOT_ACTIVE ) { // allow rollback() on completed transaction as noop - LOGGER.debug( "rollback() called on an inactive transaction" ); + CORE_LOGGER.rollbackCalledOnInactiveTransaction(); } else if ( !status.canRollback() ) { throw new TransactionException( "Cannot roll back transaction in current status [" + status.name() + "]" ); } else if ( status != TransactionStatus.FAILED_COMMIT || allowFailedCommitToPhysicallyRollback() ) { - LOGGER.debug( "Rolling back transaction" ); + CORE_LOGGER.rollingBackTransaction(); internalGetTransactionDriverControl().rollback(); } } @@ -126,7 +128,8 @@ else if ( status != TransactionStatus.FAILED_COMMIT || allowFailedCommitToPhysic public boolean isActive() { if ( transactionDriverControl == null ) { if ( session.isOpen() ) { - transactionDriverControl = transactionCoordinator.getTransactionDriverControl(); + transactionDriverControl = + transactionCoordinator.getTransactionDriverControl(); } else { return false; @@ -139,7 +142,8 @@ public boolean isActive() { public TransactionStatus getStatus() { if ( transactionDriverControl == null ) { if ( session.isOpen() ) { - transactionDriverControl = transactionCoordinator.getTransactionDriverControl(); + transactionDriverControl = + transactionCoordinator.getTransactionDriverControl(); } else { return TransactionStatus.NOT_ACTIVE; @@ -149,8 +153,9 @@ public TransactionStatus getStatus() { } @Override - public void registerSynchronization(Synchronization synchronization) throws HibernateException { - transactionCoordinator.getLocalSynchronizations().registerSynchronization( synchronization ); + public void registerSynchronization(Synchronization synchronization) { + transactionCoordinator.getLocalSynchronizations() + .registerSynchronization( synchronization ); } @Override @@ -171,11 +176,10 @@ public void setTimeout(@Nullable Integer seconds) { @Override public void markRollbackOnly() { - // this is the Hibernate-specific API, whereas setRollbackOnly is the - // JPA-defined API. In our opinion it is much more user-friendly to - // always allow user/integration to indicate that the transaction - // should not be allowed to commit. - // + // This is the Hibernate-specific API, whereas setRollbackOnly is the + // JPA-defined API. In our opinion, it's much more user-friendly to + // always allow the client to indicate that the transaction should + // not be allowed to commit. if ( isActive() ) { internalGetTransactionDriverControl().markRollbackOnly(); } @@ -192,8 +196,8 @@ public void setRollbackOnly() { } else { // JpaCompliance disables the check, so this method - // is equivalent our native markRollbackOnly() - LOGGER.debug( "setRollbackOnly() called on a inactive transaction" ); + // is equivalent to our native markRollbackOnly() + CORE_LOGGER.setRollbackOnlyCalledOnInactiveTransaction(); } } else { diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/jta/JtaStatusHelper.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/jta/JtaStatusHelper.java index a118009b6ce9..f0333b2aaec7 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/jta/JtaStatusHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/jta/JtaStatusHelper.java @@ -4,13 +4,19 @@ */ package org.hibernate.engine.transaction.internal.jta; -import jakarta.transaction.Status; import jakarta.transaction.SystemException; import jakarta.transaction.TransactionManager; import jakarta.transaction.UserTransaction; import org.hibernate.TransactionException; +import static jakarta.transaction.Status.STATUS_ACTIVE; +import static jakarta.transaction.Status.STATUS_COMMITTED; +import static jakarta.transaction.Status.STATUS_MARKED_ROLLBACK; +import static jakarta.transaction.Status.STATUS_ROLLEDBACK; +import static jakarta.transaction.Status.STATUS_ROLLING_BACK; +import static jakarta.transaction.Status.STATUS_UNKNOWN; + /** * Utility for dealing with JTA statuses. * @@ -32,7 +38,7 @@ private JtaStatusHelper() { public static int getStatus(UserTransaction userTransaction) { try { final int status = userTransaction.getStatus(); - if ( status == Status.STATUS_UNKNOWN ) { + if ( status == STATUS_UNKNOWN ) { throw new TransactionException( "UserTransaction reported transaction status as unknown" ); } return status; @@ -55,7 +61,7 @@ public static int getStatus(UserTransaction userTransaction) { public static int getStatus(TransactionManager transactionManager) { try { final int status = transactionManager.getStatus(); - if ( status == Status.STATUS_UNKNOWN ) { + if ( status == STATUS_UNKNOWN ) { throw new TransactionException( "TransactionManager reported transaction status as unknwon" ); } return status; @@ -73,7 +79,7 @@ public static int getStatus(TransactionManager transactionManager) { * @return True if the code indicates active; false otherwise. */ public static boolean isActive(int status) { - return status == Status.STATUS_ACTIVE; + return status == STATUS_ACTIVE; } /** @@ -107,9 +113,9 @@ public static boolean isActive(TransactionManager transactionManager) { * @return True if the code indicates a roll back; false otherwise. */ public static boolean isRollback(int status) { - return status == Status.STATUS_MARKED_ROLLBACK - || status == Status.STATUS_ROLLING_BACK - || status == Status.STATUS_ROLLEDBACK; + return status == STATUS_MARKED_ROLLBACK + || status == STATUS_ROLLING_BACK + || status == STATUS_ROLLEDBACK; } /** @@ -142,7 +148,7 @@ public static boolean isRollback(TransactionManager transactionManager) { * @return True if the code indicates a roll back; false otherwise. */ public static boolean isCommitted(int status) { - return status == Status.STATUS_COMMITTED; + return status == STATUS_COMMITTED; } /** @@ -176,6 +182,6 @@ public static boolean isCommitted(TransactionManager transactionManager) { */ @SuppressWarnings("unused") public static boolean isMarkedForRollback(int status) { - return status == Status.STATUS_MARKED_ROLLBACK; + return status == STATUS_MARKED_ROLLBACK; } } diff --git a/hibernate-core/src/main/java/org/hibernate/generator/internal/CurrentTimestampGeneration.java b/hibernate-core/src/main/java/org/hibernate/generator/internal/CurrentTimestampGeneration.java index 12f6fea67e67..a3018f966b85 100644 --- a/hibernate-core/src/main/java/org/hibernate/generator/internal/CurrentTimestampGeneration.java +++ b/hibernate-core/src/main/java/org/hibernate/generator/internal/CurrentTimestampGeneration.java @@ -47,7 +47,7 @@ import org.hibernate.type.descriptor.java.JavaType; import static java.sql.Types.TIMESTAMP; -import static org.hibernate.engine.jdbc.JdbcLogging.JDBC_MESSAGE_LOGGER; +import static org.hibernate.engine.jdbc.JdbcLogging.JDBC_LOGGER; import static org.hibernate.generator.EventTypeSets.INSERT_AND_UPDATE; import static org.hibernate.generator.EventTypeSets.INSERT_ONLY; import static org.hibernate.generator.EventTypeSets.fromArray; @@ -221,8 +221,8 @@ static Timestamp getCurrentTimestampFromDatabase( final Timestamp ts = callable ? extractCalledResult( statement, coordinator, timestampSelectString ) : extractResult( statement, coordinator, timestampSelectString ); - if ( JDBC_MESSAGE_LOGGER.isTraceEnabled() ) { - JDBC_MESSAGE_LOGGER.currentTimestampRetrievedFromDatabase( ts, ts.getNanos(), ts.getTime() ); + if ( JDBC_LOGGER.isTraceEnabled() ) { + JDBC_LOGGER.currentTimestampRetrievedFromDatabase( ts, ts.getNanos(), ts.getTime() ); } return ts; } diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStructure.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStructure.java index f5adf7ed49ba..330d57e6eabf 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStructure.java +++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStructure.java @@ -18,7 +18,7 @@ import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.id.IntegralDataTypeHolder; -import static org.hibernate.engine.jdbc.JdbcLogging.JDBC_MESSAGE_LOGGER; +import static org.hibernate.engine.jdbc.JdbcLogging.JDBC_LOGGER; import static org.hibernate.id.IdentifierGeneratorHelper.getIntegralDataTypeHolder; /** @@ -115,8 +115,8 @@ public IntegralDataTypeHolder getNextValue() { rs.next(); final IntegralDataTypeHolder value = getIntegralDataTypeHolder( numberType ); value.initialize( rs, 1 ); - if ( JDBC_MESSAGE_LOGGER.isTraceEnabled() ) { - JDBC_MESSAGE_LOGGER.sequenceValueRetrievedFromDatabase( value.makeValue() ); + if ( JDBC_LOGGER.isTraceEnabled() ) { + JDBC_LOGGER.sequenceValueRetrievedFromDatabase( value.makeValue() ); } return value; } diff --git a/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java b/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java index 4c93c572d693..54a85e91d749 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java @@ -7,6 +7,7 @@ import java.io.IOException; import java.io.Serializable; import java.lang.invoke.MethodHandles; +import java.net.URL; import java.sql.SQLException; import java.sql.SQLWarning; import java.util.Properties; @@ -582,4 +583,76 @@ void unableToLocateStaticMetamodelField( @LogMessage(level = TRACE) @Message( id = 6574, value = "Initializing lazy properties of: %s, field access: %s" ) void initializingLazyPropertiesOf(String info, String fieldName); + + // TransactionImpl + + @LogMessage(level = DEBUG) + @Message(id = 6581, value = "TransactionImpl created on closed Session/EntityManager") + void transactionCreatedOnClosedSession(); + + @LogMessage(level = DEBUG) + @Message(id = 6582, value = "TransactionImpl created in JPA compliant mode") + void transactionCreatedInJpaCompliantMode(); + + @LogMessage(level = DEBUG) + @Message(id = 6583, value = "Beginning transaction") + void beginningTransaction(); + + @LogMessage(level = DEBUG) + @Message(id = 6584, value = "Committing transaction") + void committingTransaction(); + + @LogMessage(level = DEBUG) + @Message(id = 6585, value = "Rolling back transaction") + void rollingBackTransaction(); + + @LogMessage(level = DEBUG) + @Message(id = 6586, value = "rollback() called with inactive transaction") + void rollbackCalledOnInactiveTransaction(); + + @LogMessage(level = DEBUG) + @Message(id = 6587, value = "setRollbackOnly() called with inactive transaction") + void setRollbackOnlyCalledOnInactiveTransaction(); + + // session builders + + @LogMessage(level = DEBUG) + @Message(id = 6588, value = "Opening session [tenant=%s]") + void openingSession(Object tenantIdentifier); + + @LogMessage(level = DEBUG) + @Message(id = 6589, value = "Opening stateless session [tenant=%s]") + void openingStatelessSession(Object tenantIdentifier); + + @LogMessage(level = TRACE) + @Message(id = 6591, value = "Identifier unsaved-value strategy %s") + void idUnsavedValueStrategy(String strategy); + + @LogMessage(level = TRACE) + @Message(id = 6592, value = "Identifier unsaved-value [%s]") + void idUnsavedValue(@Nullable Object value); + + @LogMessage(level = TRACE) + @Message(id = 6593, value = "Version unsaved-value strategy %s") + void versionUnsavedValueStrategy(String strategy); + + @LogMessage(level = TRACE) + @Message(id = 6594, value = "Version unsaved-value [%s]") + void versionUnsavedValue(@Nullable Object value); + + @LogMessage(level = TRACE) + @Message(id = 601, value = "Attempting to resolve script source setting: %s") + void attemptingToResolveScriptSourceSetting(String scriptSourceSettingString); + + @LogMessage(level = DEBUG) + @Message(id = 602, value = "Attempting to create non-existent script target file: %s") + void attemptingToCreateScriptTarget(String absolutePath); + + @LogMessage(level = DEBUG) + @Message(id = 603, value = "Could not create non-existent script target file") + void couldNotCreateScriptTarget(@Cause Exception e); + + @LogMessage(level = DEBUG) + @Message(id = 604, value = "Attempting to resolve writer for URL: %s") + void attemptingToCreateWriter(URL url); } diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/GlobalTemporaryTableStrategy.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/GlobalTemporaryTableStrategy.java index 6218f2404a66..843c046c29df 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/GlobalTemporaryTableStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/GlobalTemporaryTableStrategy.java @@ -21,7 +21,7 @@ import org.hibernate.query.sqm.mutation.spi.AfterUseAction; import org.jboss.logging.Logger; -import static org.hibernate.engine.jdbc.JdbcLogging.JDBC_MESSAGE_LOGGER; +import static org.hibernate.engine.jdbc.JdbcLogging.JDBC_LOGGER; import static org.hibernate.internal.util.NullnessUtil.castNonNull; @@ -104,7 +104,7 @@ public void prepare(MappingModelCreationProcess mappingModelCreationProcess, Jdb connectionAccess.releaseConnection( connection ); } catch (SQLException exception) { - JDBC_MESSAGE_LOGGER.unableToReleaseConnection( exception ); + JDBC_LOGGER.unableToReleaseConnection( exception ); } } } @@ -146,7 +146,7 @@ public void release(SessionFactoryImplementor sessionFactory, JdbcConnectionAcce connectionAccess.releaseConnection( connection ); } catch (SQLException exception) { - JDBC_MESSAGE_LOGGER.unableToReleaseConnection( exception ); + JDBC_LOGGER.unableToReleaseConnection( exception ); } } } diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/PersistentTableStrategy.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/PersistentTableStrategy.java index 014585121c3b..edc343b0f0a5 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/PersistentTableStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/PersistentTableStrategy.java @@ -19,7 +19,7 @@ import org.hibernate.query.sqm.mutation.spi.AfterUseAction; import org.jboss.logging.Logger; -import static org.hibernate.engine.jdbc.JdbcLogging.JDBC_MESSAGE_LOGGER; +import static org.hibernate.engine.jdbc.JdbcLogging.JDBC_LOGGER; import static org.hibernate.internal.util.NullnessUtil.castNonNull; @@ -121,7 +121,7 @@ public void prepare( connectionAccess.releaseConnection( connection ); } catch (SQLException exception) { - JDBC_MESSAGE_LOGGER.unableToReleaseConnection( exception ); + JDBC_LOGGER.unableToReleaseConnection( exception ); } } } @@ -162,7 +162,7 @@ public void release( connectionAccess.releaseConnection( connection ); } catch (SQLException exception) { - JDBC_MESSAGE_LOGGER.unableToReleaseConnection( exception ); + JDBC_LOGGER.unableToReleaseConnection( exception ); } } } diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jdbc/internal/JdbcIsolationDelegate.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jdbc/internal/JdbcIsolationDelegate.java index ebec9f13afae..12023c341f1b 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jdbc/internal/JdbcIsolationDelegate.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jdbc/internal/JdbcIsolationDelegate.java @@ -17,7 +17,7 @@ import org.hibernate.jdbc.WorkExecutorVisitable; import org.hibernate.resource.transaction.spi.TransactionCoordinatorOwner; -import static org.hibernate.engine.jdbc.JdbcLogging.JDBC_MESSAGE_LOGGER; +import static org.hibernate.engine.jdbc.JdbcLogging.JDBC_LOGGER; /** * @author Andrea Boriero @@ -98,7 +98,7 @@ private void releaseConnection(Connection connection) { connectionAccess.releaseConnection( connection ); } catch ( Exception exception ) { - JDBC_MESSAGE_LOGGER.unableToReleaseIsolatedConnection( exception ); + JDBC_LOGGER.unableToReleaseIsolatedConnection( exception ); } } @@ -109,7 +109,7 @@ private static void rollBack(boolean transacted, Connection connection, Exceptio } } catch ( Exception exception ) { - JDBC_MESSAGE_LOGGER.unableToRollBackIsolatedConnection( exception ); + JDBC_LOGGER.unableToRollBackIsolatedConnection( exception ); original.addSuppressed( exception ); } } @@ -120,7 +120,7 @@ private static void resetAutoCommit(boolean transacted, boolean wasAutoCommit, C connection.setAutoCommit( true ); } catch ( Exception exception ) { - JDBC_MESSAGE_LOGGER.unableToResetAutoCommitEnabled( exception ); + JDBC_LOGGER.unableToResetAutoCommitEnabled( exception ); } } } diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jdbc/internal/JdbcResourceLocalTransactionCoordinatorImpl.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jdbc/internal/JdbcResourceLocalTransactionCoordinatorImpl.java index 679a71a0c480..5f1c4a4c094b 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jdbc/internal/JdbcResourceLocalTransactionCoordinatorImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jdbc/internal/JdbcResourceLocalTransactionCoordinatorImpl.java @@ -24,7 +24,7 @@ import org.hibernate.resource.transaction.spi.TransactionStatus; import static java.util.Collections.emptyList; -import static org.hibernate.engine.jdbc.JdbcLogging.JDBC_MESSAGE_LOGGER; +import static org.hibernate.engine.jdbc.JdbcLogging.JDBC_LOGGER; /** * An implementation of {@link TransactionCoordinator} based on managing a @@ -90,7 +90,7 @@ public TransactionDriver getTransactionDriverControl() { @Override public void explicitJoin() { // nothing to do here, but log a warning - JDBC_MESSAGE_LOGGER.callingJoinTransactionOnNonJtaEntityManager(); + JDBC_LOGGER.callingJoinTransactionOnNonJtaEntityManager(); } @Override @@ -149,7 +149,7 @@ private void afterBeginCallback() { // report entering into a "transactional context" transactionCoordinatorOwner.startTransactionBoundary(); - JDBC_MESSAGE_LOGGER.notifyingResourceLocalObserversAfterBegin(); + JDBC_LOGGER.notifyingResourceLocalObserversAfterBegin(); // trigger the Transaction-API-only after-begin callback transactionCoordinatorOwner.afterTransactionBegin(); @@ -161,7 +161,7 @@ private void afterBeginCallback() { } private void beforeCompletionCallback() { - JDBC_MESSAGE_LOGGER.notifyingResourceLocalObserversBeforeCompletion(); + JDBC_LOGGER.notifyingResourceLocalObserversBeforeCompletion(); try { transactionCoordinatorOwner.beforeTransactionCompletion(); synchronizationRegistry.notifySynchronizationsBeforeTransactionCompletion(); @@ -179,7 +179,7 @@ private void beforeCompletionCallback() { } private void afterCompletionCallback(boolean successful) { - JDBC_MESSAGE_LOGGER.notifyingResourceLocalObserversAfterCompletion(); + JDBC_LOGGER.notifyingResourceLocalObserversAfterCompletion(); final int statusToSend = successful ? Status.STATUS_COMMITTED : Status.STATUS_ROLLEDBACK; synchronizationRegistry.notifySynchronizationsAfterTransactionCompletion( statusToSend ); transactionCoordinatorOwner.afterTransactionCompletion( successful, false ); @@ -261,14 +261,14 @@ private void commitNoRollbackOnly() { } catch (RuntimeException e2) { e.addSuppressed( e2 ); - JDBC_MESSAGE_LOGGER.encounteredFailureRollingBackFailedCommit( e2 ); + JDBC_LOGGER.encounteredFailureRollingBackFailedCommit( e2 ); } throw e; } } private void commitRollbackOnly() { - JDBC_MESSAGE_LOGGER.onCommitMarkedRollbackOnlyRollingBack(); + JDBC_LOGGER.onCommitMarkedRollbackOnlyRollingBack(); rollback(); if ( jpaCompliance.isJpaTransactionComplianceEnabled() ) { throw new RollbackException( "Transaction was marked for rollback only" ); @@ -299,8 +299,8 @@ public TransactionStatus getStatus() { @Override public void markRollbackOnly() { if ( getStatus() != TransactionStatus.ROLLED_BACK ) { - if ( JDBC_MESSAGE_LOGGER.isTraceEnabled() ) { - JDBC_MESSAGE_LOGGER.jdbcTransactionMarkedForRollbackOnly( + if ( JDBC_LOGGER.isTraceEnabled() ) { + JDBC_LOGGER.jdbcTransactionMarkedForRollbackOnly( new Exception( "exception just for purpose of providing stack trace" ) ); } rollbackOnly = true; diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/internal/TransactionCoordinatorBuilderInitiator.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/internal/TransactionCoordinatorBuilderInitiator.java index af8b5b53b9ce..164933d86c31 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/internal/TransactionCoordinatorBuilderInitiator.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/internal/TransactionCoordinatorBuilderInitiator.java @@ -8,12 +8,12 @@ import org.hibernate.boot.registry.StandardServiceInitiator; import org.hibernate.boot.registry.selector.spi.StrategySelector; -import org.hibernate.internal.log.DeprecationLogger; import org.hibernate.resource.transaction.backend.jdbc.internal.JdbcResourceLocalTransactionCoordinatorBuilderImpl; import org.hibernate.resource.transaction.spi.TransactionCoordinatorBuilder; import org.hibernate.service.spi.ServiceRegistryImplementor; import static org.hibernate.cfg.TransactionSettings.TRANSACTION_COORDINATOR_STRATEGY; +import static org.hibernate.internal.log.DeprecationLogger.DEPRECATION_LOGGER; /** * StandardServiceInitiator for initiating the TransactionCoordinatorBuilder service. @@ -45,7 +45,7 @@ private static Object determineStrategySelection(Map configurati final Object legacySetting = configurationValues.get( LEGACY_SETTING_NAME ); if ( legacySetting != null ) { - DeprecationLogger.DEPRECATION_LOGGER.logDeprecatedTransactionFactorySetting( + DEPRECATION_LOGGER.logDeprecatedTransactionFactorySetting( LEGACY_SETTING_NAME, TRANSACTION_COORDINATOR_STRATEGY ); diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/DeferredResultSetAccess.java b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/DeferredResultSetAccess.java index 24ea600d0878..7a7ad7feaef6 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/DeferredResultSetAccess.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/DeferredResultSetAccess.java @@ -34,7 +34,7 @@ import org.hibernate.sql.exec.spi.JdbcSelectExecutor; import static java.util.Collections.emptyMap; -import static org.hibernate.engine.jdbc.JdbcLogging.JDBC_MESSAGE_LOGGER; +import static org.hibernate.engine.jdbc.JdbcLogging.JDBC_LOGGER; import static org.hibernate.internal.CoreMessageLogger.CORE_LOGGER; /** @@ -245,12 +245,12 @@ private void setQueryOptions(PreparedStatement preparedStatement) throws SQLExce if ( queryOptions != null ) { final Integer fetchSize = queryOptions.getFetchSize(); if ( fetchSize != null ) { - JDBC_MESSAGE_LOGGER.settingFetchSize( fetchSize ); + JDBC_LOGGER.settingFetchSize( fetchSize ); preparedStatement.setFetchSize( fetchSize ); } final Integer timeout = queryOptions.getTimeout(); if ( timeout != null ) { - JDBC_MESSAGE_LOGGER.settingQueryTimeout( timeout ); + JDBC_LOGGER.settingQueryTimeout( timeout ); preparedStatement.setQueryTimeout( timeout ); } } diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/ExtractionContextImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/ExtractionContextImpl.java index f4935b606902..08f96d1570c8 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/ExtractionContextImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/ExtractionContextImpl.java @@ -15,7 +15,7 @@ import org.hibernate.service.ServiceRegistry; import org.hibernate.tool.schema.extract.spi.ExtractionContext; -import static org.hibernate.engine.jdbc.JdbcLogging.JDBC_MESSAGE_LOGGER; +import static org.hibernate.engine.jdbc.JdbcLogging.JDBC_LOGGER; /** * @author Steve Ebersole @@ -112,7 +112,7 @@ public void cleanup() { jdbcConnectionAccess.releaseConnection( jdbcConnection ); } catch (SQLException exception) { - JDBC_MESSAGE_LOGGER.unableToReleaseConnection( exception ); + JDBC_LOGGER.unableToReleaseConnection( exception ); } } } diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/DdlTransactionIsolatorProvidedConnectionImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/DdlTransactionIsolatorProvidedConnectionImpl.java index f04f16593c27..9fd56724a08a 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/DdlTransactionIsolatorProvidedConnectionImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/DdlTransactionIsolatorProvidedConnectionImpl.java @@ -13,7 +13,7 @@ import org.hibernate.tool.schema.internal.exec.JdbcContext; import org.hibernate.tool.schema.spi.SchemaManagementException; -import static org.hibernate.engine.jdbc.JdbcLogging.JDBC_MESSAGE_LOGGER; +import static org.hibernate.engine.jdbc.JdbcLogging.JDBC_LOGGER; /** * Specialized DdlTransactionIsolator for cases where we have a user provided Connection @@ -69,7 +69,7 @@ public void release() { connectionAccess.releaseConnection( null ); } catch (SQLException exception) { - JDBC_MESSAGE_LOGGER.unableToReleaseIsolatedConnection( exception ); + JDBC_LOGGER.unableToReleaseIsolatedConnection( exception ); } } } diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/Helper.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/Helper.java index 387be3b06563..98e7182f0671 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/Helper.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/Helper.java @@ -13,11 +13,11 @@ import java.util.Map; import org.hibernate.boot.Metadata; -import org.hibernate.boot.model.relational.Database; import org.hibernate.boot.model.relational.SqlStringGenerationContext; import org.hibernate.boot.model.relational.internal.SqlStringGenerationContextImpl; import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import org.hibernate.cfg.AvailableSettings; +import org.hibernate.cfg.SchemaToolingSettings; import org.hibernate.dialect.Dialect; import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; import org.hibernate.engine.jdbc.internal.Formatter; @@ -62,17 +62,15 @@ public static ScriptSourceInput interpretScriptSourceSetting( } else { final String scriptSourceSettingString = scriptSourceSetting.toString(); - CORE_LOGGER.tracef( "Attempting to resolve script source setting: %s", scriptSourceSettingString ); - + CORE_LOGGER.attemptingToResolveScriptSourceSetting( scriptSourceSettingString ); final String[] paths = splitAtCommas( scriptSourceSettingString ); if ( paths.length == 1 ) { return interpretScriptSourceSetting( scriptSourceSettingString, classLoaderService, charsetName ); } - final AbstractScriptSourceInput[] inputs = new AbstractScriptSourceInput[paths.length]; + final var inputs = new AbstractScriptSourceInput[paths.length]; for ( int i = 0; i < paths.length; i++ ) { inputs[i] = interpretScriptSourceSetting( paths[i], classLoaderService, charsetName ) ; } - return new ScriptSourceInputAggregate( inputs ); } } @@ -108,15 +106,14 @@ else if ( scriptTargetSetting instanceof Writer writer ) { } else { final String scriptTargetSettingString = scriptTargetSetting.toString(); - CORE_LOGGER.tracef( "Attempting to resolve script source setting: %s", scriptTargetSettingString ); + CORE_LOGGER.attemptingToResolveScriptSourceSetting( scriptTargetSettingString ); // setting could be either: // 1) string URL representation (i.e., "file://...") // 2) relative file path (resource lookup) // 3) absolute file path - CORE_LOGGER.trace( "Trying as URL..." ); - // ClassLoaderService.locateResource() first tries the given resource name as url form... + // ClassLoaderService.locateResource() first tries the given resource name as URL form... final URL url = classLoaderService.locateResource( scriptTargetSettingString ); return url != null ? new ScriptTargetOutputToUrl( url, charsetName ) @@ -129,15 +126,15 @@ public static boolean interpretNamespaceHandling(Map configuratio warnIfConflictingPropertiesSet( configurationValues ); // prefer the JPA setting... return ConfigurationHelper.getBoolean( - AvailableSettings.HBM2DDL_CREATE_SCHEMAS, + SchemaToolingSettings.HBM2DDL_CREATE_SCHEMAS, configurationValues, //Then try the Jakarta JPA setting: ConfigurationHelper.getBoolean( - AvailableSettings.JAKARTA_HBM2DDL_CREATE_SCHEMAS, + SchemaToolingSettings.JAKARTA_HBM2DDL_CREATE_SCHEMAS, configurationValues, //Then try the Hibernate ORM setting: ConfigurationHelper.getBoolean( - AvailableSettings.HBM2DDL_CREATE_NAMESPACES, + SchemaToolingSettings.HBM2DDL_CREATE_NAMESPACES, configurationValues ) ) @@ -147,13 +144,13 @@ public static boolean interpretNamespaceHandling(Map configuratio private static void warnIfConflictingPropertiesSet(Map configurationValues) { //Print a warning if multiple conflicting properties are being set: int count = 0; - if ( configurationValues.containsKey( AvailableSettings.HBM2DDL_CREATE_SCHEMAS ) ) { + if ( configurationValues.containsKey( SchemaToolingSettings.HBM2DDL_CREATE_SCHEMAS ) ) { count++; } - if ( configurationValues.containsKey( AvailableSettings.JAKARTA_HBM2DDL_CREATE_SCHEMAS ) ) { + if ( configurationValues.containsKey( SchemaToolingSettings.JAKARTA_HBM2DDL_CREATE_SCHEMAS ) ) { count++; } - if ( configurationValues.containsKey( AvailableSettings.HBM2DDL_CREATE_NAMESPACES ) ) { + if ( configurationValues.containsKey( SchemaToolingSettings.HBM2DDL_CREATE_NAMESPACES ) ) { count++; } if ( count > 1 ) { @@ -187,7 +184,7 @@ public static DatabaseInformation buildDatabaseInformation( } public static SqlStringGenerationContext createSqlStringGenerationContext(ExecutionOptions options, Metadata metadata) { - final Database database = metadata.getDatabase(); + final var database = metadata.getDatabase(); return SqlStringGenerationContextImpl.fromConfigurationMap( database.getJdbcEnvironment(), database, @@ -235,7 +232,7 @@ public static void applyScript( final List commands = scriptInput.extract( reader -> commandExtractor.extractCommands( reader, dialect ) ); - for ( GenerationTarget target : targets ) { + for ( var target : targets ) { target.beforeScript( scriptInput ); } for ( String command : commands ) { 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 6ca6221f1f81..d50c9e864785 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 @@ -13,7 +13,7 @@ import org.jboss.logging.Logger; -import static org.hibernate.engine.jdbc.JdbcLogging.JDBC_MESSAGE_LOGGER; +import static org.hibernate.engine.jdbc.JdbcLogging.JDBC_LOGGER; /** * Implementation of JdbcConnectionAccess for use in cases where we @@ -91,7 +91,7 @@ public void releaseConnection(Connection connection) throws SQLException { } } catch (SQLException exception) { - JDBC_MESSAGE_LOGGER.unableToResetAutoCommitDisabled( exception ); + JDBC_LOGGER.unableToResetAutoCommitDisabled( exception ); } } 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 34e581cba025..72317dc272ac 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 @@ -12,7 +12,7 @@ import org.jboss.logging.Logger; -import static org.hibernate.engine.jdbc.JdbcLogging.JDBC_MESSAGE_LOGGER; +import static org.hibernate.engine.jdbc.JdbcLogging.JDBC_LOGGER; /** * Implementation of JdbcConnectionAccess for cases where we are provided @@ -73,7 +73,7 @@ public void releaseConnection(Connection connection) throws SQLException { } } catch (SQLException exception) { - JDBC_MESSAGE_LOGGER.unableToResetAutoCommitDisabled( exception ); + JDBC_LOGGER.unableToResetAutoCommitDisabled( exception ); } } } diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptTargetOutputToFile.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptTargetOutputToFile.java index b9349f24e40b..00d50d55faa0 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptTargetOutputToFile.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptTargetOutputToFile.java @@ -13,7 +13,7 @@ import org.hibernate.tool.schema.spi.SchemaManagementException; import org.hibernate.tool.schema.spi.ScriptTargetOutput; -import static org.hibernate.internal.CoreMessageLogger.LOGGER; +import static org.hibernate.internal.CoreMessageLogger.CORE_LOGGER; /** * ScriptTargetOutput implementation for writing to supplied File references @@ -87,7 +87,7 @@ static Writer toFileWriter(File file, String charsetName, boolean append) { try { if ( ! file.exists() ) { // best effort, since this is very likely not allowed in EE environments - LOGGER.debug( "Attempting to create non-existent script target file: " + file.getAbsolutePath() ); + CORE_LOGGER.attemptingToCreateScriptTarget( file.getAbsolutePath() ); if ( file.getParentFile() != null ) { file.getParentFile().mkdirs(); } @@ -95,7 +95,7 @@ static Writer toFileWriter(File file, String charsetName, boolean append) { } } catch (Exception e) { - LOGGER.debug( "Exception calling File#createNewFile: " + e ); + CORE_LOGGER.couldNotCreateScriptTarget( e ); } try { return charsetName != null ? diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptTargetOutputToUrl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptTargetOutputToUrl.java index 1257e88952e5..782e0c5aaace 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptTargetOutputToUrl.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptTargetOutputToUrl.java @@ -13,7 +13,7 @@ import org.hibernate.tool.schema.spi.SchemaManagementException; import org.hibernate.tool.schema.spi.ScriptTargetOutput; -import static org.hibernate.internal.CoreMessageLogger.LOGGER; +import static org.hibernate.internal.CoreMessageLogger.CORE_LOGGER; /** * ScriptTargetOutput implementation for writing to supplied URL references @@ -78,9 +78,9 @@ public void release() { private static Writer toWriter( URL url, String charsetName, boolean append ) { - LOGGER.debug( "Attempting to resolve writer for URL: " + url ); - // technically only "strings corresponding to file URLs" are supported, which I take to mean URLs whose - // protocol is "file" + CORE_LOGGER.attemptingToCreateWriter( url ); + // Spec says only "strings corresponding to file URLs" are supported, + // which I take to mean URLs whose protocol is "file" try { return ScriptTargetOutputToFile.toFileWriter( new File( url.toURI() ), charsetName, append ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchRowCountWarningTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchRowCountWarningTest.java index 45e007582a36..2d365412ad5c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchRowCountWarningTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchRowCountWarningTest.java @@ -51,7 +51,7 @@ public class BatchRowCountWarningTest { @BeforeAll public void setUp(SessionFactoryScope scope) { trigger = new TriggerOnPrefixLogListener( "HHH100001" ); - LogInspectionHelper.registerListener( trigger, JdbcLogging.JDBC_MESSAGE_LOGGER ); + LogInspectionHelper.registerListener( trigger, JdbcLogging.JDBC_LOGGER ); scope.inTransaction( session -> { session.persist( new MyEntity( 1L, "Nicola", null ) ); session.persist( new MyEntity( 2L, "Stefano", "Ste" ) ); @@ -66,7 +66,7 @@ public void reset() { @AfterAll public void tearDown(SessionFactoryScope scope) { - LogInspectionHelper.clearAllListeners( JdbcLogging.JDBC_MESSAGE_LOGGER ); + LogInspectionHelper.clearAllListeners( JdbcLogging.JDBC_LOGGER ); scope.inTransaction( session -> { session.createMutationQuery( "delete from BaseEntity" ).executeUpdate(); session.createQuery( "from JoinTableEntity", JoinTableEntity.class ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/delegate/MutationDelegateStatementReleaseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/delegate/MutationDelegateStatementReleaseTest.java index 59a940b2a39e..941d3ff252a3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/delegate/MutationDelegateStatementReleaseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/delegate/MutationDelegateStatementReleaseTest.java @@ -78,7 +78,7 @@ public void reset() { @AfterAll public void tearDown(SessionFactoryScope scope) { - LogInspectionHelper.clearAllListeners( JdbcLogging.JDBC_MESSAGE_LOGGER ); + LogInspectionHelper.clearAllListeners( JdbcLogging.JDBC_LOGGER ); } @Test