diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HSQLLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HSQLLegacyDialect.java index 5a7b8db11ae3..ed3b996417d1 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HSQLLegacyDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HSQLLegacyDialect.java @@ -50,7 +50,6 @@ import org.hibernate.exception.spi.SQLExceptionConversionDelegate; import org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor; import org.hibernate.exception.spi.ViolatedConstraintNameExtractor; -import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.util.JdbcExceptionHelper; import org.hibernate.internal.util.ReflectHelper; import org.hibernate.metamodel.mapping.EntityMappingType; @@ -79,7 +78,6 @@ import org.hibernate.type.spi.TypeConfiguration; import org.jboss.logging.Logger; -import java.lang.invoke.MethodHandles; import java.sql.DatabaseMetaData; import java.sql.SQLException; import java.sql.Types; @@ -100,11 +98,7 @@ */ public class HSQLLegacyDialect extends Dialect { - private static final CoreMessageLogger LOG = Logger.getMessageLogger( - MethodHandles.lookup(), - CoreMessageLogger.class, - org.hibernate.community.dialect.HSQLLegacyDialect.class.getName() - ); + private static final Logger LOG = Logger.getLogger( HSQLLegacyDialect.class ); private final UniqueDelegate uniqueDelegate = new CreateTableUniqueDelegate( this ); private final HSQLIdentityColumnSupport identityColumnSupport; @@ -762,7 +756,7 @@ private ReadUncommittedLockingStrategy(EntityPersister lockable, LockMode lockMo public void lock(Object id, Object version, Object object, int timeout, SharedSessionContractImplementor session) throws StaleObjectStateException, JDBCException { if ( getLockMode().greaterThan( LockMode.READ ) ) { - LOG.hsqldbSupportsOnlyReadCommittedIsolation(); + LOG.warn( "HSQLDB supports only READ_UNCOMMITTED isolation" ); } super.lock( id, version, object, timeout, session ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/SchemaAutoTooling.java b/hibernate-core/src/main/java/org/hibernate/boot/SchemaAutoTooling.java index f81c133f6cb0..9ece1fa7413e 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/SchemaAutoTooling.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/SchemaAutoTooling.java @@ -9,6 +9,8 @@ import java.util.Locale; +import static org.hibernate.cfg.SchemaToolingSettings.HBM2DDL_AUTO; + /** * Defines the possible values for {@value AvailableSettings#HBM2DDL_AUTO}. * @@ -65,15 +67,13 @@ public static SchemaAutoTooling interpret(String configurationValue) { return null; } else { - for ( SchemaAutoTooling value : values() ) { + for ( var value : values() ) { if ( value.externalForm().equals( configurationValue ) ) { return value; } } - throw new HibernateException( - "Unrecognized " + AvailableSettings.HBM2DDL_AUTO + " value: '" + configurationValue - + "'. Supported values include 'create', 'create-drop', 'create-only', 'drop', 'update', 'none' and 'validate'." - ); + throw new HibernateException( "Unrecognized " + HBM2DDL_AUTO + " value: '" + configurationValue + + "' (supported values include 'create', 'create-drop', 'create-only', 'drop', 'update', 'none', and 'validate')" ); } } } diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/BatchFetchQueue.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/BatchFetchQueue.java index 2bb945ddaedc..1b8c66b03151 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/BatchFetchQueue.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/BatchFetchQueue.java @@ -18,9 +18,10 @@ import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; +import org.hibernate.result.internal.OutputsImpl; +import org.jboss.logging.Logger; import static org.hibernate.engine.internal.CacheHelper.fromSharedCache; -import static org.hibernate.internal.CoreMessageLogger.LOGGER; import static org.hibernate.internal.util.collections.CollectionHelper.linkedMapOfSize; import static org.hibernate.internal.util.collections.CollectionHelper.linkedSetOfSize; import static org.hibernate.internal.util.collections.CollectionHelper.mapOfSize; @@ -37,6 +38,8 @@ */ public class BatchFetchQueue { + private static final Logger LOG = Logger.getLogger( OutputsImpl.class ); + private final PersistenceContext context; /** @@ -106,8 +109,8 @@ public void addSubselect(EntityKey key, SubselectFetch subquery) { } final var previous = subselectsByEntityKey.put( key, subquery ); - if ( previous != null && LOGGER.isDebugEnabled() ) { - LOGGER.tracef( + if ( previous != null && LOG.isDebugEnabled() ) { + LOG.tracef( "SubselectFetch previously registered with BatchFetchQueue for '%s.s'", key.getEntityName(), key.getIdentifier() @@ -129,6 +132,10 @@ public void removeSubselect(EntityKey key) { // entity batch support ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + private LoadQueryInfluencers getLoadQueryInfluencers() { + return context.getSession().getLoadQueryInfluencers(); + } + /** * If an EntityKey represents a batch loadable entity, add * it to the queue. @@ -140,7 +147,7 @@ public void removeSubselect(EntityKey key) { * already associated with the {@link PersistenceContext}. */ public void addBatchLoadableEntityKey(EntityKey key) { - if ( key.isBatchLoadable( context.getSession().getLoadQueryInfluencers() ) ) { + if ( key.isBatchLoadable( getLoadQueryInfluencers() ) ) { if ( batchLoadableEntityKeys == null ) { batchLoadableEntityKeys = mapOfSize( 12 ); } @@ -156,7 +163,7 @@ public void addBatchLoadableEntityKey(EntityKey key) { * if necessary */ public void removeBatchLoadableEntityKey(EntityKey key) { - if ( key.isBatchLoadable( context.getSession().getLoadQueryInfluencers() ) + if ( key.isBatchLoadable( getLoadQueryInfluencers() ) && batchLoadableEntityKeys != null ) { final var entityKeys = batchLoadableEntityKeys.get( key.getEntityName() ); if ( entityKeys != null ) { @@ -169,7 +176,7 @@ public void removeBatchLoadableEntityKey(EntityKey key) { * Intended for test usage. Really has no use-case in Hibernate proper. */ public boolean containsEntityKey(EntityKey key) { - if ( key.isBatchLoadable( context.getSession().getLoadQueryInfluencers() ) + if ( key.isBatchLoadable( getLoadQueryInfluencers() ) && batchLoadableEntityKeys != null ) { final var entityKeys = batchLoadableEntityKeys.get( key.getEntityName() ); if ( entityKeys != null ) { @@ -196,6 +203,7 @@ public void collectBatchLoadableEntityIds( if ( batchLoadableEntityKeys != null ) { final var entityKeys = batchLoadableEntityKeys.get( entityDescriptor.getEntityName() ); if ( entityKeys != null ) { + final var session = context.getSession(); final var identifierMapping = entityDescriptor.getIdentifierMapping(); int batchPosition = 1; int end = -1; @@ -203,15 +211,17 @@ public void collectBatchLoadableEntityIds( for ( var entityKey : entityKeys ) { if ( checkForEnd && batchPosition == end ) { // the first id found after the given id - return; - } - else if ( identifierMapping.areEqual( loadingId, entityKey.getIdentifier(), - context.getSession() ) ) { - end = batchPosition; + return; // end the loop } - else if ( !isCached( entityKey, entityDescriptor.getEntityPersister() ) ) { - //noinspection unchecked - collector.accept( batchPosition++, (T) entityKey.getIdentifier() ); + else { + final Object identifier = entityKey.getIdentifier(); + if ( identifierMapping.areEqual( loadingId, identifier, session ) ) { + end = batchPosition; + } + else if ( !isCached( entityKey, entityDescriptor.getEntityPersister() ) ) { + //noinspection unchecked + collector.accept( batchPosition++, (T) identifier ); + } } if ( batchPosition == domainBatchSize ) { @@ -296,13 +306,13 @@ public void addBatchLoadableCollection(PersistentCollection collection, Colle * need to batch fetch it anymore, remove it from the queue * if necessary */ - public void removeBatchLoadableCollection(CollectionEntry ce) { - final var persister = ce.getLoadedPersister(); + public void removeBatchLoadableCollection(CollectionEntry collectionEntry) { + final var persister = collectionEntry.getLoadedPersister(); assert persister != null : "@AssumeAssertion(nullness)"; if ( batchLoadableCollections != null ) { final var map = batchLoadableCollections.get( persister.getRole() ); if ( map != null ) { - map.remove( ce ); + map.remove( collectionEntry ); } } } @@ -328,9 +338,9 @@ public void collectBatchLoadableCollectionKeys( int end = -1; boolean checkForEnd = false; for ( var me : map.entrySet() ) { - final CollectionEntry ce = me.getKey(); + final var ce = me.getKey(); final Object loadedKey = ce.getLoadedKey(); - final PersistentCollection collection = me.getValue(); + final var collection = me.getValue(); // the loadedKey of the collectionEntry might be null as it might have been reset to null // (see for example Collections.processDereferencedCollection() @@ -397,9 +407,9 @@ else if ( !isCached( loadedKey, pluralAttributeMapping.getCollectionDescriptor() final var map = batchLoadableCollections.get( collectionPersister.getRole() ); if ( map != null ) { for ( var me : map.entrySet() ) { - final CollectionEntry ce = me.getKey(); - final Object loadedKey = ce.getLoadedKey(); - final PersistentCollection collection = me.getValue(); + final var collectionEntry = me.getKey(); + final Object loadedKey = collectionEntry.getLoadedKey(); + final var collection = me.getValue(); // the loadedKey of the collectionEntry might be null as it might have been reset to null // (see for example Collections.processDereferencedCollection() diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceGeneratorLogger.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceGeneratorLogger.java index 013054508e34..594374d762a2 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceGeneratorLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceGeneratorLogger.java @@ -34,7 +34,7 @@ public interface SequenceGeneratorLogger extends BasicLogger { String NAME = SubSystemLogging.BASE + ".id.table"; - SequenceGeneratorLogger SEQUENCE_GENERATOR_MESSAGE_LOGGER = Logger.getMessageLogger( + SequenceGeneratorLogger SEQUENCE_GENERATOR_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), SequenceGeneratorLogger.class, NAME diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java index 700d9be51400..b86e9f456bd9 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java @@ -37,7 +37,7 @@ import static org.hibernate.cfg.MappingSettings.SEQUENCE_INCREMENT_SIZE_MISMATCH_STRATEGY; import static org.hibernate.id.IdentifierGeneratorHelper.getNamingStrategy; import static org.hibernate.id.enhanced.OptimizerFactory.determineImplicitOptimizerName; -import static org.hibernate.id.enhanced.SequenceGeneratorLogger.SEQUENCE_GENERATOR_MESSAGE_LOGGER; +import static org.hibernate.id.enhanced.SequenceGeneratorLogger.SEQUENCE_GENERATOR_LOGGER; import static org.hibernate.internal.util.StringHelper.isNotEmpty; import static org.hibernate.internal.util.config.ConfigurationHelper.getBoolean; import static org.hibernate.internal.util.config.ConfigurationHelper.getInt; @@ -214,7 +214,7 @@ public void configure(GeneratorCreationContext creationContext, Properties param && optimizationStrategy.isPooled() && !dialect.getSequenceSupport().supportsPooledSequences() ) { forceTableUse = true; - SEQUENCE_GENERATOR_MESSAGE_LOGGER.forcingTableUse(); + SEQUENCE_GENERATOR_LOGGER.forcingTableUse(); } this.databaseStructure = buildDatabaseStructure( @@ -292,13 +292,13 @@ private int validatedIncrementSize( case NONE -> incrementSize; case FIX -> { // log at TRACE level - SEQUENCE_GENERATOR_MESSAGE_LOGGER.sequenceIncrementSizeMismatchFixed( + SEQUENCE_GENERATOR_LOGGER.sequenceIncrementSizeMismatchFixed( databaseSequenceName, incrementSize, dbIncrementValue ); yield dbIncrementValue; } case LOG -> { // log at WARN level - SEQUENCE_GENERATOR_MESSAGE_LOGGER.sequenceIncrementSizeMismatch( + SEQUENCE_GENERATOR_LOGGER.sequenceIncrementSizeMismatch( databaseSequenceName, incrementSize, dbIncrementValue ); yield incrementSize; } @@ -448,7 +448,7 @@ protected OptimizerDescriptor determineOptimizationStrategy(Properties params, i protected int determineAdjustedIncrementSize(OptimizerDescriptor optimizationStrategy, int incrementSize) { if ( optimizationStrategy == StandardOptimizerDescriptor.NONE ) { if ( incrementSize < -1 ) { - SEQUENCE_GENERATOR_MESSAGE_LOGGER.honoringOptimizerSetting( + SEQUENCE_GENERATOR_LOGGER.honoringOptimizerSetting( StandardOptimizerDescriptor.NONE.getExternalName(), INCREMENT_PARAM, incrementSize, @@ -458,7 +458,7 @@ protected int determineAdjustedIncrementSize(OptimizerDescriptor optimizationStr return -1; } else if ( incrementSize > 1 ) { - SEQUENCE_GENERATOR_MESSAGE_LOGGER.honoringOptimizerSetting( + SEQUENCE_GENERATOR_LOGGER.honoringOptimizerSetting( StandardOptimizerDescriptor.NONE.getExternalName(), INCREMENT_PARAM, incrementSize, diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java index 84394424f2d3..3d68360beeb5 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java @@ -46,7 +46,7 @@ import static org.hibernate.boot.model.internal.GeneratorBinder.applyIfNotEmpty; import static org.hibernate.cfg.MappingSettings.TABLE_GENERATOR_STORE_LAST_USED; import static org.hibernate.engine.config.spi.StandardConverters.BOOLEAN; -import static org.hibernate.id.enhanced.TableGeneratorLogger.TABLE_GENERATOR_MESSAGE_LOGGER; +import static org.hibernate.id.enhanced.TableGeneratorLogger.TABLE_GENERATOR_LOGGER; import static org.hibernate.id.IdentifierGeneratorHelper.getNamingStrategy; import static org.hibernate.id.enhanced.OptimizerFactory.determineImplicitOptimizerName; import static org.hibernate.internal.util.StringHelper.isEmpty; @@ -454,7 +454,7 @@ protected String determineSegmentValue(Properties params) { protected String determineDefaultSegmentValue(Properties params) { final boolean preferSegmentPerEntity = getBoolean( CONFIG_PREFER_SEGMENT_PER_ENTITY, params ); final String defaultToUse = preferSegmentPerEntity ? params.getProperty( TABLE ) : DEF_SEGMENT_VALUE; - TABLE_GENERATOR_MESSAGE_LOGGER.usingDefaultIdGeneratorSegmentValue( + TABLE_GENERATOR_LOGGER.usingDefaultIdGeneratorSegmentValue( qualifiedTableName.render(), segmentColumnName, defaultToUse ); return defaultToUse; } @@ -549,7 +549,7 @@ private IntegralDataTypeHolder nextValue( final IntegralDataTypeHolder value = makeValue(); int rows; do { - TABLE_GENERATOR_MESSAGE_LOGGER.retrievingCurrentValueForSegment( segmentValue ); + TABLE_GENERATOR_LOGGER.retrievingCurrentValueForSegment( segmentValue ); try ( var prepareStatement = prepareStatement( connection, selectQuery, logger, listener, session ) ) { prepareStatement.setString( 1, segmentValue ); final var resultSet = executeQuery( prepareStatement, listener, selectQuery, session ); @@ -557,7 +557,7 @@ private IntegralDataTypeHolder nextValue( final long initializationValue = storeLastUsedValue ? initialValue - 1 : initialValue; value.initialize( initializationValue ); - TABLE_GENERATOR_MESSAGE_LOGGER.insertingInitialValueForSegment( value, segmentValue ); + TABLE_GENERATOR_LOGGER.insertingInitialValueForSegment( value, segmentValue ); try ( PreparedStatement statement = prepareStatement( connection, insertQuery, logger, listener, session ) ) { statement.setString( 1, segmentValue ); value.bind( statement, 2 ); @@ -577,7 +577,7 @@ private IntegralDataTypeHolder nextValue( resultSet.close(); } catch (SQLException e) { - TABLE_GENERATOR_MESSAGE_LOGGER.unableToReadOrInitializeHiValue( physicalTableName.render(), e ); + TABLE_GENERATOR_LOGGER.unableToReadOrInitializeHiValue( physicalTableName.render(), e ); throw e; } @@ -588,7 +588,7 @@ private IntegralDataTypeHolder nextValue( else { updateValue.increment(); } - TABLE_GENERATOR_MESSAGE_LOGGER.updatingCurrentValueForSegment( updateValue, segmentValue ); + TABLE_GENERATOR_LOGGER.updatingCurrentValueForSegment( updateValue, segmentValue ); try ( var statement = prepareStatement( connection, updateQuery, logger, listener, session ) ) { updateValue.bind( statement, 1 ); value.bind( statement, 2 ); @@ -596,7 +596,7 @@ private IntegralDataTypeHolder nextValue( rows = executeUpdate( statement, listener, updateQuery, session ); } catch (SQLException e) { - TABLE_GENERATOR_MESSAGE_LOGGER.unableToUpdateHiValue( physicalTableName.render(), e ); + TABLE_GENERATOR_LOGGER.unableToUpdateHiValue( physicalTableName.render(), e ); throw e; } } diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGeneratorLogger.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGeneratorLogger.java index f6dd94ffdcda..ec836d4599f9 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGeneratorLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGeneratorLogger.java @@ -38,7 +38,7 @@ public interface TableGeneratorLogger extends BasicLogger { String NAME = SubSystemLogging.BASE + ".id.table"; - TableGeneratorLogger TABLE_GENERATOR_MESSAGE_LOGGER = Logger.getMessageLogger( + TableGeneratorLogger TABLE_GENERATOR_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), TableGeneratorLogger.class, NAME diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableStructure.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableStructure.java index a99ed62e830c..b05160f9410b 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableStructure.java +++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableStructure.java @@ -37,7 +37,7 @@ import static org.hibernate.LockMode.PESSIMISTIC_WRITE; import static org.hibernate.id.IdentifierGeneratorHelper.getIntegralDataTypeHolder; -import static org.hibernate.id.enhanced.TableGeneratorLogger.TABLE_GENERATOR_MESSAGE_LOGGER; +import static org.hibernate.id.enhanced.TableGeneratorLogger.TABLE_GENERATOR_LOGGER; /** * Describes a table used to mimic sequence behavior @@ -185,7 +185,7 @@ public IntegralDataTypeHolder execute(Connection connection) throws SQLException selectRS.close(); } catch (SQLException sqle) { - TABLE_GENERATOR_MESSAGE_LOGGER.unableToReadHiValue( physicalTableName.render(), sqle ); + TABLE_GENERATOR_LOGGER.unableToReadHiValue( physicalTableName.render(), sqle ); throw sqle; } @@ -204,7 +204,7 @@ public IntegralDataTypeHolder execute(Connection connection) throws SQLException rows = executeUpdate( updatePS, statsCollector, updateQuery, session ); } catch (SQLException e) { - TABLE_GENERATOR_MESSAGE_LOGGER.unableToUpdateHiValue( physicalTableName.render(), e ); + TABLE_GENERATOR_LOGGER.unableToUpdateHiValue( physicalTableName.render(), e ); throw e; } } while ( rows == 0 ); 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 54a85e91d749..59b559f2b4d9 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java @@ -52,7 +52,6 @@ public interface CoreMessageLogger extends BasicLogger { String NAME = SubSystemLogging.BASE + ".core"; - Logger LOGGER = Logger.getLogger( NAME ); CoreMessageLogger CORE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, NAME ); @LogMessage(level = INFO) @@ -90,10 +89,6 @@ void expectedType(String name, + " to unsafe use of the session): %s", id = 99) void failed(Throwable throwable); - @LogMessage(level = WARN) - @Message(value = "HSQLDB supports only READ_UNCOMMITTED isolation", id = 118) - void hsqldbSupportsOnlyReadCommittedIsolation(); - @LogMessage(level = ERROR) @Message(value = "IllegalArgumentException in class: %s, getter method of property: %s", id = 122) void illegalPropertyGetterArgument(String name, String propertyName); diff --git a/hibernate-core/src/main/java/org/hibernate/result/internal/OutputsImpl.java b/hibernate-core/src/main/java/org/hibernate/result/internal/OutputsImpl.java index 171365a55b48..520b0a26575e 100644 --- a/hibernate-core/src/main/java/org/hibernate/result/internal/OutputsImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/result/internal/OutputsImpl.java @@ -28,8 +28,8 @@ import org.hibernate.sql.results.jdbc.internal.JdbcValuesSourceProcessingStateStandardImpl; import org.hibernate.sql.results.jdbc.spi.JdbcValues; import org.hibernate.sql.results.spi.RowReader; +import org.jboss.logging.Logger; -import static org.hibernate.internal.CoreMessageLogger.LOGGER; import static org.hibernate.sql.results.jdbc.spi.JdbcValuesSourceProcessingOptions.NO_OPTIONS; @@ -38,6 +38,8 @@ */ public class OutputsImpl implements Outputs { + private static final Logger LOG = Logger.getLogger( OutputsImpl.class ); + private final ResultContext context; private final PreparedStatement jdbcStatement; private final SqlStatementLogger sqlStatementLogger; @@ -248,8 +250,8 @@ public Output getOutput() { } protected Output buildOutput() { - if ( LOGGER.isTraceEnabled() ) { - LOGGER.tracef( "Building Return [isResultSet=%s, updateCount=%s, extendedReturn=%s]", + if ( LOG.isTraceEnabled() ) { + LOG.tracef( "Building Return [isResultSet=%s, updateCount=%s, extendedReturn=%s]", isResultSet(), getUpdateCount(), hasExtendedReturns() ); } 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 cb2c7403bf94..bafc4d195088 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 @@ -17,7 +17,7 @@ import org.hibernate.tool.schema.spi.GenerationTarget; import org.hibernate.tool.schema.spi.ScriptSourceInput; -import static org.hibernate.internal.CoreMessageLogger.*; +import static org.hibernate.internal.CoreMessageLogger.CORE_LOGGER; /** * A {@link GenerationTarget} which exports DDL directly to the database. diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/ManyToManyNotIgnoreLazyFetchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/ManyToManyNotIgnoreLazyFetchingTest.java index 381a576216b3..d7b5de3c5900 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/ManyToManyNotIgnoreLazyFetchingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/ManyToManyNotIgnoreLazyFetchingTest.java @@ -4,36 +4,26 @@ */ package org.hibernate.orm.test.annotations.formula; -import java.io.Serializable; -import java.lang.invoke.MethodHandles; -import java.util.ArrayList; -import java.util.List; - +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; import org.hibernate.Hibernate; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; -import org.hibernate.boot.model.internal.AnnotationBinder; import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.internal.CoreMessageLogger; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; - import org.hibernate.testing.orm.junit.JiraKey; -import org.hibernate.testing.logger.LoggerInspectionRule; -import org.hibernate.testing.logger.Triggerable; import org.hibernate.testing.orm.junit.JiraKeyGroup; -import org.junit.Rule; import org.junit.Test; -import org.jboss.logging.Logger; - -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.EnumType; -import jakarta.persistence.Enumerated; -import jakarta.persistence.Id; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.JoinTable; -import jakarta.persistence.ManyToMany; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; import static org.assertj.core.api.Assertions.assertThat; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; @@ -47,14 +37,6 @@ } ) public class ManyToManyNotIgnoreLazyFetchingTest extends BaseEntityManagerFunctionalTestCase { - @Rule - public LoggerInspectionRule logInspection = new LoggerInspectionRule( - Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, AnnotationBinder.class.getName() ) - ); - - private Triggerable triggerable = logInspection.watchForLogMessages( "HHH000491" ); - - @Override protected Class[] getAnnotatedClasses() { return new Class[] { @@ -89,9 +71,6 @@ protected void afterEntityManagerFactoryBuilt() { @Test public void testLazyLoading() { - - assertFalse( triggerable.wasTriggered() ); - List stocks = fromTransaction( entityManagerFactory().unwrap( SessionFactoryImplementor.class ), session -> { List list = session.createQuery("select s from Stock s order by id", Stock.class).getResultList(); for (Stock s: list) { @@ -112,9 +91,6 @@ public void testLazyLoading() { @Test public void testEagerLoading() { - - assertFalse( triggerable.wasTriggered() ); - List stocks = fromTransaction( entityManagerFactory().unwrap( SessionFactoryImplementor.class ), session -> session.createQuery("select s from Stock s left join fetch s.codes order by s.id", Stock.class) .getResultList() diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/inheritance/EntityInheritanceAttributeOverrideTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/inheritance/EntityInheritanceAttributeOverrideTest.java index 309e49f79185..18d35c90ac37 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/inheritance/EntityInheritanceAttributeOverrideTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/inheritance/EntityInheritanceAttributeOverrideTest.java @@ -13,18 +13,12 @@ import jakarta.persistence.Table; import jakarta.persistence.UniqueConstraint; import org.hibernate.AnnotationException; -import org.hibernate.boot.model.internal.EntityBinder; -import org.hibernate.internal.CoreMessageLogger; import org.hibernate.testing.orm.junit.JiraKey; -import org.hibernate.testing.logger.LoggerInspectionRule; import org.hibernate.testing.orm.junit.EntityManagerFactoryBasedFunctionalTest; import org.hibernate.testing.orm.junit.JiraKeyGroup; -import org.jboss.logging.Logger; -import org.junit.Rule; import org.junit.jupiter.api.Test; -import java.lang.invoke.MethodHandles; import static org.junit.jupiter.api.Assertions.fail; @@ -40,10 +34,6 @@ @JiraKey(value = "HHH-12609, HHH-12654, HHH-13172") public class EntityInheritanceAttributeOverrideTest extends EntityManagerFactoryBasedFunctionalTest { - @Rule - public LoggerInspectionRule logInspection = new LoggerInspectionRule( - Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, EntityBinder.class.getName() ) ); - @Override public Class[] getAnnotatedClasses() { return new Class[] { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/OrmVersion1SupportedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/OrmVersion1SupportedTest.java index 283d63c5571e..a1f633282596 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/OrmVersion1SupportedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/OrmVersion1SupportedTest.java @@ -7,22 +7,12 @@ import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder; -import org.hibernate.internal.CoreMessageLogger; - -import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; -import org.hibernate.testing.logger.LoggerInspectionRule; -import org.hibernate.testing.logger.Triggerable; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.JiraKeyGroup; -import org.junit.Rule; import org.junit.Test; -import org.jboss.logging.Logger; - -import java.lang.invoke.MethodHandles; - import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; @JiraKeyGroup( value = { @JiraKey( value = "HHH-6271" ), @@ -35,19 +25,8 @@ protected void prepareBootstrapRegistryBuilder(BootstrapServiceRegistryBuilder b super.prepareBootstrapRegistryBuilder( builder ); } - @Rule - public LoggerInspectionRule logInspection = new LoggerInspectionRule( - Logger.getMessageLogger( - MethodHandles.lookup(), - CoreMessageLogger.class, - "org.hibernate.internal.util.xml.ErrorLogger" - ) - ); - @Test public void testOrm1Support() { - Triggerable triggerable = logInspection.watchForLogMessages( "HHH00196" ); - Session s = openSession(); Transaction tx = s.beginTransaction(); Light light = new Light(); @@ -59,8 +38,6 @@ public void testOrm1Support() { assertEquals( 1, s.getNamedQuery( "find.the.light" ).list().size() ); tx.rollback(); s.close(); - - assertFalse( triggerable.wasTriggered() ); } @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/metadata/MetadataAccessTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/metadata/MetadataAccessTests.java index 3343f90903f3..f03c7a24d520 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/metadata/MetadataAccessTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/metadata/MetadataAccessTests.java @@ -6,9 +6,9 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.hibernate.dialect.SimpleDatabaseVersion.ZERO_VERSION; +import static org.hibernate.internal.CoreMessageLogger.CORE_LOGGER; import static org.junit.jupiter.api.Assertions.fail; -import java.lang.invoke.MethodHandles; import java.lang.reflect.Field; import java.util.Map; import java.util.stream.Stream; @@ -38,7 +38,6 @@ import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo; import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfoSource; import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; -import org.hibernate.internal.CoreMessageLogger; import org.hibernate.service.spi.ServiceException; import org.hibernate.service.spi.ServiceRegistryImplementor; @@ -54,7 +53,6 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.jboss.logging.Logger; /** * @author Steve Ebersole @@ -65,10 +63,8 @@ public class MetadataAccessTests { private Triggerable triggerable; @RegisterExtension - public LoggerInspectionExtension logger = LoggerInspectionExtension - .builder().setLogger( - Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, Dialect.class.getName() ) - ).build(); + public LoggerInspectionExtension logger = + LoggerInspectionExtension.builder().setLogger( CORE_LOGGER ).build(); @BeforeEach public void setUp() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/NoProxyFactoryTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/NoProxyFactoryTests.java index b9898c48d138..48abb33e925c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/NoProxyFactoryTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/NoProxyFactoryTests.java @@ -6,8 +6,6 @@ import org.hibernate.Hibernate; import org.hibernate.boot.MetadataSources; -import org.hibernate.internal.CoreMessageLogger; -import org.hibernate.metamodel.internal.EntityRepresentationStrategyPojoStandard; import org.hibernate.metamodel.spi.MappingMetamodelImplementor; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.proxy.HibernateProxy; @@ -21,15 +19,13 @@ import org.junit.Test; import org.junit.runner.RunWith; -import org.jboss.logging.Logger; import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.Table; -import java.lang.invoke.MethodHandles; - import static org.assertj.core.api.Assertions.assertThat; +import static org.hibernate.internal.CoreMessageLogger.CORE_LOGGER; /** * Tests for cases where we do not want a {@linkplain org.hibernate.proxy.ProxyFactory} @@ -40,9 +36,7 @@ @EnhancementOptions(lazyLoading = true) public class NoProxyFactoryTests extends BaseNonConfigCoreFunctionalTestCase { @Rule - public LoggerInspectionRule logInspection = new LoggerInspectionRule( - Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, EntityRepresentationStrategyPojoStandard.class.getName() ) - ); + public LoggerInspectionRule logInspection = new LoggerInspectionRule( CORE_LOGGER ); /** * See org.hibernate.internal.CoreMessageLogger#unableToCreateProxyFactory diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonRootEntityWithCacheAnnotationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonRootEntityWithCacheAnnotationTest.java index 6877f8a5f191..6161503ecb20 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonRootEntityWithCacheAnnotationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonRootEntityWithCacheAnnotationTest.java @@ -4,7 +4,6 @@ */ package org.hibernate.orm.test.cache; -import java.lang.invoke.MethodHandles; import java.util.HashMap; import java.util.Map; @@ -12,10 +11,8 @@ import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; import org.hibernate.boot.MetadataSources; -import org.hibernate.boot.model.internal.EntityBinder; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Environment; -import org.hibernate.internal.CoreMessageLogger; import org.hibernate.service.spi.ServiceRegistryImplementor; import org.hibernate.testing.orm.junit.JiraKey; @@ -25,13 +22,13 @@ import org.junit.Rule; import org.junit.Test; -import org.jboss.logging.Logger; import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.Inheritance; import jakarta.persistence.SharedCacheMode; +import static org.hibernate.internal.CoreMessageLogger.CORE_LOGGER; import static org.junit.Assert.fail; /** @@ -41,9 +38,7 @@ public class NonRootEntityWithCacheAnnotationTest { @Rule - public LoggerInspectionRule logInspection = new LoggerInspectionRule( - Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, EntityBinder.class.getName() ) - ); + public LoggerInspectionRule logInspection = new LoggerInspectionRule( CORE_LOGGER ); @Test public void testCacheOnNonRootEntity() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonRootEntityWithCacheableAnnotationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonRootEntityWithCacheableAnnotationTest.java index 7a8d51db81b2..2ab1f449d0f8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonRootEntityWithCacheableAnnotationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonRootEntityWithCacheableAnnotationTest.java @@ -4,16 +4,13 @@ */ package org.hibernate.orm.test.cache; -import java.lang.invoke.MethodHandles; import java.util.HashMap; import java.util.Map; import org.hibernate.boot.Metadata; import org.hibernate.boot.MetadataSources; -import org.hibernate.boot.model.internal.EntityBinder; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Environment; -import org.hibernate.internal.CoreMessageLogger; import org.hibernate.service.spi.ServiceRegistryImplementor; import org.hibernate.testing.orm.junit.JiraKey; @@ -24,14 +21,13 @@ import org.junit.Rule; import org.junit.Test; -import org.jboss.logging.Logger; - import jakarta.persistence.Cacheable; import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.Inheritance; import jakarta.persistence.SharedCacheMode; +import static org.hibernate.internal.CoreMessageLogger.CORE_LOGGER; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -42,9 +38,7 @@ public class NonRootEntityWithCacheableAnnotationTest { @Rule - public LoggerInspectionRule logInspection = new LoggerInspectionRule( - Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, EntityBinder.class.getName() ) - ); + public LoggerInspectionRule logInspection = new LoggerInspectionRule( CORE_LOGGER ); @Test public void testCacheableOnNonRootEntity() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/CockroachDialectVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/CockroachDialectVersionTest.java index f56eb1f67091..8996ff6ab2a0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/CockroachDialectVersionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/CockroachDialectVersionTest.java @@ -7,19 +7,9 @@ import org.hibernate.dialect.CockroachDialect; import org.hibernate.dialect.DatabaseVersion; import org.hibernate.dialect.Dialect; -import org.hibernate.internal.CoreMessageLogger; - import org.hibernate.testing.orm.junit.JiraKey; -import org.hibernate.testing.logger.Triggerable; import org.hibernate.testing.orm.junit.RequiresDialect; -import org.hibernate.testing.orm.logger.LoggerInspectionExtension; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; - -import org.jboss.logging.Logger; - -import java.lang.invoke.MethodHandles; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -30,20 +20,6 @@ @RequiresDialect(CockroachDialect.class) public class CockroachDialectVersionTest { - private Triggerable triggerable; - - @RegisterExtension - public LoggerInspectionExtension logger = LoggerInspectionExtension - .builder().setLogger( - Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, CockroachDialect.class.getName() ) - ).build(); - - @BeforeEach - public void setUp() { - triggerable = logger.watchForLogMessages("HHH000512" ); - triggerable.reset(); - } - @Test @JiraKey(value = "HHH-15511") public void testCockroachDialectVersionParsing() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/PostgreSQLSequenceGeneratorWithSerialTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/PostgreSQLSequenceGeneratorWithSerialTest.java index 00dc8d094c6a..844a3bc3f4d3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/PostgreSQLSequenceGeneratorWithSerialTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/PostgreSQLSequenceGeneratorWithSerialTest.java @@ -33,7 +33,7 @@ import org.junit.jupiter.api.Test; -import static org.hibernate.id.enhanced.SequenceGeneratorLogger.SEQUENCE_GENERATOR_MESSAGE_LOGGER; +import static org.hibernate.id.enhanced.SequenceGeneratorLogger.SEQUENCE_GENERATOR_LOGGER; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -45,7 +45,7 @@ public class PostgreSQLSequenceGeneratorWithSerialTest extends EntityManagerFactoryBasedFunctionalTest { @Rule - public LoggerInspectionRule logInspection = new LoggerInspectionRule( SEQUENCE_GENERATOR_MESSAGE_LOGGER ); + public LoggerInspectionRule logInspection = new LoggerInspectionRule( SEQUENCE_GENERATOR_LOGGER ); private final Triggerable triggerable = logInspection.watchForLogMessages( "HHH090203:" ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyFixWithSequenceGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyFixWithSequenceGeneratorTest.java index 2bb0ef008b4a..8e95dc1a14db 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyFixWithSequenceGeneratorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyFixWithSequenceGeneratorTest.java @@ -33,7 +33,7 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; -import static org.hibernate.id.enhanced.SequenceGeneratorLogger.SEQUENCE_GENERATOR_MESSAGE_LOGGER; +import static org.hibernate.id.enhanced.SequenceGeneratorLogger.SEQUENCE_GENERATOR_LOGGER; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -46,7 +46,7 @@ public class SequenceMismatchStrategyFixWithSequenceGeneratorTest extends EntityManagerFactoryBasedFunctionalTest { @Rule - public LoggerInspectionRule logInspection = new LoggerInspectionRule( SEQUENCE_GENERATOR_MESSAGE_LOGGER ); + public LoggerInspectionRule logInspection = new LoggerInspectionRule( SEQUENCE_GENERATOR_LOGGER ); private final Triggerable triggerable = logInspection.watchForLogMessages( "HHH090203:" ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyLogTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyLogTest.java index 02fba6a97d9b..43fa7ed0bfad 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyLogTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyLogTest.java @@ -32,7 +32,7 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; -import static org.hibernate.id.enhanced.SequenceGeneratorLogger.SEQUENCE_GENERATOR_MESSAGE_LOGGER; +import static org.hibernate.id.enhanced.SequenceGeneratorLogger.SEQUENCE_GENERATOR_LOGGER; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -44,7 +44,7 @@ public class SequenceMismatchStrategyLogTest extends EntityManagerFactoryBasedFunctionalTest { @Rule - public LoggerInspectionRule logInspection = new LoggerInspectionRule( SEQUENCE_GENERATOR_MESSAGE_LOGGER ); + public LoggerInspectionRule logInspection = new LoggerInspectionRule( SEQUENCE_GENERATOR_LOGGER ); private final Triggerable triggerable = logInspection.watchForLogMessages( "HHH090202:" ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyWithoutSequenceGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyWithoutSequenceGeneratorTest.java index e01d1a2b4f61..00ca5b748a99 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyWithoutSequenceGeneratorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyWithoutSequenceGeneratorTest.java @@ -4,40 +4,35 @@ */ package org.hibernate.orm.test.id.hhh12973; -import java.lang.invoke.MethodHandles; -import java.util.EnumSet; -import java.util.Map; -import java.util.concurrent.atomic.AtomicLong; import jakarta.persistence.Entity; import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.Table; - import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.boot.spi.MetadataImplementor; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.id.enhanced.SequenceStyleGenerator; -import org.hibernate.internal.CoreMessageLogger; import org.hibernate.service.ServiceRegistry; -import org.hibernate.tool.hbm2ddl.SchemaExport; -import org.hibernate.tool.schema.TargetType; - -import org.hibernate.testing.orm.junit.JiraKey; -import org.hibernate.testing.orm.junit.EntityManagerFactoryBasedFunctionalTest; import org.hibernate.testing.logger.LoggerInspectionRule; import org.hibernate.testing.logger.Triggerable; import org.hibernate.testing.orm.junit.DialectFeatureChecks; +import org.hibernate.testing.orm.junit.EntityManagerFactoryBasedFunctionalTest; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.RequiresDialectFeature; import org.hibernate.testing.util.ServiceRegistryUtil; +import org.hibernate.tool.hbm2ddl.SchemaExport; +import org.hibernate.tool.schema.TargetType; import org.junit.Rule; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; -import org.jboss.logging.Logger; +import java.util.EnumSet; +import java.util.Map; +import java.util.concurrent.atomic.AtomicLong; +import static org.hibernate.id.enhanced.SequenceGeneratorLogger.SEQUENCE_GENERATOR_LOGGER; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -49,15 +44,9 @@ public class SequenceMismatchStrategyWithoutSequenceGeneratorTest extends EntityManagerFactoryBasedFunctionalTest { @Rule - public LoggerInspectionRule logInspection = new LoggerInspectionRule( - Logger.getMessageLogger( - MethodHandles.lookup(), - CoreMessageLogger.class, - SequenceStyleGenerator.class.getName() - ) - ); - - private Triggerable triggerable = logInspection.watchForLogMessages( "HHH000497:" ); + public LoggerInspectionRule logInspection = new LoggerInspectionRule( SEQUENCE_GENERATOR_LOGGER ); + + private Triggerable triggerable = logInspection.watchForLogMessages( "HHH090203:" ); protected ServiceRegistry serviceRegistry; protected MetadataImplementor metadata; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/NegativeValueSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/NegativeValueSequenceTest.java index 07043fd65e5d..8c251c2a35b9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/NegativeValueSequenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/NegativeValueSequenceTest.java @@ -31,7 +31,7 @@ -import static org.hibernate.id.enhanced.SequenceGeneratorLogger.SEQUENCE_GENERATOR_MESSAGE_LOGGER; +import static org.hibernate.id.enhanced.SequenceGeneratorLogger.SEQUENCE_GENERATOR_LOGGER; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -43,7 +43,7 @@ public class NegativeValueSequenceTest { @Rule - public LoggerInspectionRule logInspection = new LoggerInspectionRule( SEQUENCE_GENERATOR_MESSAGE_LOGGER ); + public LoggerInspectionRule logInspection = new LoggerInspectionRule( SEQUENCE_GENERATOR_LOGGER ); @Test @JiraKey( value = "HHH-5933") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PrivateConstructorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PrivateConstructorTest.java index 9f4e79cde5c1..6ddf0318253b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PrivateConstructorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PrivateConstructorTest.java @@ -12,27 +12,18 @@ import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.ManyToOne; - import org.hibernate.bytecode.internal.BytecodeProviderInitiator; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Environment; -import org.hibernate.internal.CoreMessageLogger; import org.hibernate.proxy.ProxyFactory; import org.hibernate.proxy.pojo.bytebuddy.ByteBuddyProxyFactory; -import org.hibernate.testing.orm.junit.JiraKey; -import org.hibernate.testing.logger.LoggerInspectionRule; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.util.ExceptionUtil; - -import org.junit.Rule; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; -import org.jboss.logging.Logger; - -import java.lang.invoke.MethodHandles; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -43,13 +34,6 @@ }) public class PrivateConstructorTest { - @Rule - public LoggerInspectionRule logInspection = new LoggerInspectionRule( Logger.getMessageLogger( - MethodHandles.lookup(), - CoreMessageLogger.class, - proxyFactoryClass().getName() - ) ); - @AfterEach public void tearDown(EntityManagerFactoryScope scope) { scope.getEntityManagerFactory().getSchemaManager().truncate(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/PersistenceXmlParserTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/PersistenceXmlParserTest.java index 90e20a9fb416..2a628e759d7c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/PersistenceXmlParserTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/PersistenceXmlParserTest.java @@ -4,42 +4,29 @@ */ package org.hibernate.orm.test.jpa.persistenceunit; -import static org.assertj.core.api.Assertions.assertThat; -import static org.hibernate.internal.util.ConfigHelper.findAsResource; - -import java.io.IOException; -import java.lang.invoke.MethodHandles; -import java.net.URL; -import java.util.Arrays; -import java.util.Collections; -import java.util.Enumeration; -import java.util.List; -import java.util.Map; - +import jakarta.persistence.PersistenceUnitTransactionType; import org.hibernate.boot.registry.classloading.internal.ClassLoaderServiceImpl; import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.internal.CoreMessageLogger; import org.hibernate.jpa.boot.spi.PersistenceUnitDescriptor; import org.hibernate.jpa.boot.spi.PersistenceXmlParser; - -import org.hibernate.testing.logger.LoggerInspectionRule; import org.hibernate.testing.orm.junit.JiraKey; -import org.junit.Rule; import org.junit.jupiter.api.Test; -import org.jboss.logging.Logger; +import java.io.IOException; +import java.net.URL; +import java.util.Arrays; +import java.util.Collections; +import java.util.Enumeration; +import java.util.List; +import java.util.Map; -import jakarta.persistence.PersistenceUnitTransactionType; +import static org.assertj.core.api.Assertions.assertThat; +import static org.hibernate.internal.util.ConfigHelper.findAsResource; @JiraKey("HHH-18231") public class PersistenceXmlParserTest { - @Rule - public LoggerInspectionRule logInspection = new LoggerInspectionRule( - Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, PersistenceXmlParser.class.getName() ) - ); - @Test public void create_classLoaders() { var parser = PersistenceXmlParser.create( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/AbstractJtaBatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/AbstractJtaBatchTest.java index bdbe13a76c78..d16335e2fd25 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/AbstractJtaBatchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/AbstractJtaBatchTest.java @@ -6,7 +6,6 @@ import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Parameter; -import org.hibernate.internal.CoreMessageLogger; import org.hibernate.testing.jta.JtaAwareConnectionProviderImpl; import org.hibernate.testing.logger.Triggerable; @@ -21,6 +20,8 @@ import jakarta.persistence.Id; import jakarta.persistence.Table; +import static org.hibernate.internal.CoreMessageLogger.CORE_LOGGER; + /** * @author Andrea Boriero */ @@ -30,9 +31,7 @@ public abstract class AbstractJtaBatchTest extends AbstractBatchingTest { @RegisterExtension - public LoggerInspectionExtension logger = LoggerInspectionExtension.builder() - .setLogger( CoreMessageLogger.CORE_LOGGER ) - .build(); + public LoggerInspectionExtension logger = LoggerInspectionExtension.builder().setLogger( CORE_LOGGER ).build(); @BeforeEach public void setUp() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/warning/LockNoneWarmingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/warning/LockNoneWarningTest.java similarity index 89% rename from hibernate-core/src/test/java/org/hibernate/orm/test/locking/warning/LockNoneWarmingTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/locking/warning/LockNoneWarningTest.java index a22d2fcd5442..b3563603369d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/warning/LockNoneWarmingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/warning/LockNoneWarningTest.java @@ -5,7 +5,6 @@ package org.hibernate.orm.test.locking.warning; import java.io.Serializable; -import java.lang.invoke.MethodHandles; import java.util.HashSet; import java.util.Set; import jakarta.persistence.Column; @@ -17,7 +16,6 @@ import jakarta.persistence.Table; import org.hibernate.Session; -import org.hibernate.internal.CoreMessageLogger; import org.hibernate.query.Query; import org.hibernate.testing.orm.junit.JiraKey; @@ -30,23 +28,20 @@ import org.junit.Rule; import org.junit.Test; -import org.jboss.logging.Logger; - import static jakarta.persistence.LockModeType.NONE; +import static org.hibernate.internal.CoreMessageLogger.CORE_LOGGER; import static org.junit.Assert.assertFalse; /** * @author Andrea Boriero */ @JiraKey(value = "HHH-10513") -public class LockNoneWarmingTest extends BaseCoreFunctionalTestCase { +public class LockNoneWarningTest extends BaseCoreFunctionalTestCase { private Triggerable triggerable; @Rule - public LoggerInspectionRule logInspection = new LoggerInspectionRule( - Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, LockNoneWarmingTest.class.getName() ) - ); + public LoggerInspectionRule logInspection = new LoggerInspectionRule( CORE_LOGGER ); @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/EnumTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/EnumTypeTest.java index 0ce9e7ef562b..cce9dc18ca54 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/EnumTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/EnumTypeTest.java @@ -11,7 +11,6 @@ import org.hibernate.Session; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; -import org.hibernate.internal.CoreMessageLogger; import org.hibernate.type.descriptor.JdbcBindingLogging; import org.hibernate.type.descriptor.JdbcExtractingLogging; @@ -24,7 +23,6 @@ import org.jboss.logging.Logger; -import java.lang.invoke.MethodHandles; import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; import static org.junit.Assert.assertEquals; @@ -36,18 +34,12 @@ public class EnumTypeTest extends BaseCoreFunctionalTestCase { @Rule - public LoggerInspectionRule binderLogInspection = new LoggerInspectionRule( Logger.getMessageLogger( - MethodHandles.lookup(), - CoreMessageLogger.class, - JdbcBindingLogging.NAME - ) ); + public LoggerInspectionRule binderLogInspection = + new LoggerInspectionRule( Logger.getLogger( JdbcBindingLogging.NAME ) ); @Rule - public LoggerInspectionRule extractorLogInspection = new LoggerInspectionRule( Logger.getMessageLogger( - MethodHandles.lookup(), - CoreMessageLogger.class, - JdbcExtractingLogging.NAME - ) ); + public LoggerInspectionRule extractorLogInspection = + new LoggerInspectionRule( Logger.getLogger( JdbcExtractingLogging.NAME ) ); private Person person; @@ -95,10 +87,10 @@ public void hbmEnumTypeTest() { doInHibernate( this::sessionFactory, s -> { - assertEquals( getNumberOfPersonByGender( s, Gender.MALE ), 2 ); - assertEquals( getNumberOfPersonByGenderAndHairColor( s, Gender.MALE, HairColor.BROWN ), 1 ); - assertEquals( getNumberOfPersonByGender( s, Gender.FEMALE ), 2 ); - assertEquals( getNumberOfPersonByGenderAndHairColor( s, Gender.FEMALE, HairColor.BROWN ), 1 ); + assertEquals( 2, getNumberOfPersonByGender( s, Gender.MALE ) ); + assertEquals( 1, getNumberOfPersonByGenderAndHairColor( s, Gender.MALE, HairColor.BROWN ) ); + assertEquals( 2, getNumberOfPersonByGender( s, Gender.FEMALE ) ); + assertEquals( 1, getNumberOfPersonByGenderAndHairColor( s, Gender.FEMALE, HairColor.BROWN ) ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/delegate/MutationDelegateIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/delegate/MutationDelegateIdentityTest.java index 5bbe812c15c5..cac7dd58f6d8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/delegate/MutationDelegateIdentityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/delegate/MutationDelegateIdentityTest.java @@ -4,7 +4,6 @@ */ package org.hibernate.orm.test.mapping.generated.delegate; -import java.lang.invoke.MethodHandles; import java.util.Date; import org.hibernate.annotations.ColumnDefault; @@ -14,7 +13,6 @@ import org.hibernate.annotations.SourceType; import org.hibernate.annotations.UpdateTimestamp; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.engine.jdbc.spi.SqlExceptionHelper; import org.hibernate.engine.spi.EntityEntry; import org.hibernate.engine.spi.PersistenceContext; import org.hibernate.generator.EventType; @@ -22,7 +20,6 @@ import org.hibernate.id.insert.AbstractReturningDelegate; import org.hibernate.id.insert.AbstractSelectingDelegate; import org.hibernate.id.insert.UniqueKeySelectingDelegate; -import org.hibernate.internal.CoreMessageLogger; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.sql.model.MutationType; @@ -40,7 +37,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import org.jboss.logging.Logger; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -49,6 +45,7 @@ import jakarta.persistence.Id; import static org.assertj.core.api.Assertions.assertThat; +import static org.hibernate.engine.jdbc.spi.SQLExceptionLogging.ERROR_LOG; /** * Tests {@link GeneratedValuesMutationDelegate efficient generated values retrieval} @@ -251,9 +248,7 @@ private static GeneratedValuesMutationDelegate getDelegate( private Triggerable triggerable; @RegisterExtension - public LoggerInspectionExtension logger = LoggerInspectionExtension.builder().setLogger( - Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, SqlExceptionHelper.class.getName() ) - ).build(); + public LoggerInspectionExtension logger = LoggerInspectionExtension.builder().setLogger( ERROR_LOG ).build(); @BeforeAll public void setUp(SessionFactoryScope scope) { 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 941d3ff252a3..3f31e5108316 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 @@ -4,7 +4,6 @@ */ package org.hibernate.orm.test.mapping.generated.delegate; -import java.lang.invoke.MethodHandles; import java.util.Date; import java.util.Set; @@ -15,9 +14,7 @@ import org.hibernate.engine.jdbc.JdbcLogging; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.generator.EventType; -import org.hibernate.internal.CoreMessageLogger; import org.hibernate.resource.jdbc.ResourceRegistry; -import org.hibernate.resource.jdbc.internal.ResourceRegistryStandardImpl; import org.hibernate.testing.logger.LogInspectionHelper; import org.hibernate.testing.logger.TriggerOnPrefixLogListener; @@ -32,7 +29,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.jboss.logging.Logger; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; @@ -42,6 +38,7 @@ import jakarta.persistence.InheritanceType; import static org.assertj.core.api.Assertions.assertThat; +import static org.hibernate.resource.jdbc.internal.ResourceRegistryLogger.RESOURCE_REGISTRY_LOGGER; /** * @author Marco Belladelli @@ -61,14 +58,7 @@ public class MutationDelegateStatementReleaseTest { @BeforeAll public void setUp(SessionFactoryScope scope) { trigger = new TriggerOnPrefixLogListener( Set.of( "Exception clearing", "Unable to release" ) ); - LogInspectionHelper.registerListener( - trigger, - Logger.getMessageLogger( - MethodHandles.lookup(), - CoreMessageLogger.class, - ResourceRegistryStandardImpl.class.getName() - ) - ); + LogInspectionHelper.registerListener( trigger, RESOURCE_REGISTRY_LOGGER ); } @BeforeEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/TemporaryTableStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/TemporaryTableStrategyTest.java index da54f816c789..ec6ee23e871c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/TemporaryTableStrategyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/TemporaryTableStrategyTest.java @@ -4,32 +4,27 @@ */ package org.hibernate.orm.test.persister.entity; -import java.lang.invoke.MethodHandles; -import java.util.Set; - +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.SecondaryTable; +import jakarta.persistence.Table; import org.hibernate.dialect.OracleDialect; -import org.hibernate.internal.CoreMessageLogger; import org.hibernate.query.sqm.mutation.internal.temptable.GlobalTemporaryTableStrategy; - -import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.logger.LoggerInspectionRule; import org.hibernate.testing.logger.Triggerable; import org.hibernate.testing.orm.junit.DomainModel; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.RequiresDialect; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; import org.hibernate.testing.orm.junit.Setting; +import org.jboss.logging.Logger; import org.junit.Rule; import org.junit.jupiter.api.Test; -import org.jboss.logging.Logger; - -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.Id; -import jakarta.persistence.SecondaryTable; -import jakarta.persistence.Table; +import java.util.Set; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -47,9 +42,8 @@ public class TemporaryTableStrategyTest { @Rule - public LoggerInspectionRule logInspection = new LoggerInspectionRule( - Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, GlobalTemporaryTableStrategy.class.getName() ) - ); + public LoggerInspectionRule logInspection = + new LoggerInspectionRule( Logger.getLogger( GlobalTemporaryTableStrategy.class ) ); private final Triggerable triggerable = logInspection.watchForLogMessages( Set.of( "Creating global-temp ID table", diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DynamicMapInstantiationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DynamicMapInstantiationTest.java index 042a04f15335..7174d4407394 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DynamicMapInstantiationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DynamicMapInstantiationTest.java @@ -4,31 +4,25 @@ */ package org.hibernate.orm.test.query.hql; -import org.hibernate.internal.CoreMessageLogger; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Query; +import jakarta.persistence.Table; import org.hibernate.query.sqm.tree.select.SqmDynamicInstantiation; - -import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.logger.Triggerable; import org.hibernate.testing.orm.junit.DomainModel; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; import org.hibernate.testing.orm.logger.LoggerInspectionExtension; +import org.jboss.logging.Logger; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import org.jboss.logging.Logger; - -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Query; -import jakarta.persistence.Table; - -import java.lang.invoke.MethodHandles; - @DomainModel( annotatedClasses = { DynamicMapInstantiationTest.Parent.class @@ -41,10 +35,8 @@ public class DynamicMapInstantiationTest { private Triggerable triggerable; @RegisterExtension - public LoggerInspectionExtension logger = LoggerInspectionExtension - .builder().setLogger( - Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, SqmDynamicInstantiation.class.getName() ) - ).build(); + public LoggerInspectionExtension logger = + LoggerInspectionExtension.builder().setLogger( Logger.getLogger( SqmDynamicInstantiation.class ) ).build(); @BeforeEach public void setUp() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/ResultSetReleaseWithStatementDelegationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/ResultSetReleaseWithStatementDelegationTest.java index cb2b7e41fe8d..51af5ce4c6f7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/ResultSetReleaseWithStatementDelegationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/ResultSetReleaseWithStatementDelegationTest.java @@ -9,8 +9,6 @@ import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.internal.CoreMessageLogger; -import org.hibernate.resource.jdbc.internal.ResourceRegistryStandardImpl; import org.hibernate.testing.logger.Triggerable; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.DomainModel; @@ -21,13 +19,13 @@ import org.hibernate.testing.orm.junit.SessionFactoryScope; import org.hibernate.testing.orm.junit.SettingProvider; import org.hibernate.testing.orm.logger.LoggerInspectionExtension; -import org.jboss.logging.Logger; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import java.lang.invoke.MethodHandles; + +import static org.hibernate.resource.jdbc.internal.ResourceRegistryLogger.RESOURCE_REGISTRY_LOGGER; @DomainModel( annotatedClasses = { @@ -53,12 +51,8 @@ public String getSetting() { private Triggerable triggerable; @RegisterExtension - public LoggerInspectionExtension logger = LoggerInspectionExtension.builder().setLogger( - Logger.getMessageLogger( - MethodHandles.lookup(), - CoreMessageLogger.class, - ResourceRegistryStandardImpl.class.getName() ) - ).build(); + public LoggerInspectionExtension logger = + LoggerInspectionExtension.builder().setLogger( RESOURCE_REGISTRY_LOGGER ).build(); @BeforeEach public void setUp() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/Hbm2ddlCreateOnlyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/Hbm2ddlCreateOnlyTest.java index 0f0eb3feaf9a..4632410f2c23 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/Hbm2ddlCreateOnlyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/Hbm2ddlCreateOnlyTest.java @@ -4,36 +4,19 @@ */ package org.hibernate.orm.test.schemaupdate; -import static org.junit.Assert.assertFalse; - -import java.lang.invoke.MethodHandles; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import jakarta.persistence.EntityManagerFactory; - -import org.hibernate.boot.internal.SessionFactoryOptionsBuilder; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.internal.CoreMessageLogger; import org.hibernate.jpa.boot.spi.Bootstrap; -import org.hibernate.testing.orm.jpa.PersistenceUnitDescriptorAdapter; import org.hibernate.orm.test.jpa.mapping.ColumnWithExplicitReferenceToPrimaryTableTest.AnEntity; +import org.hibernate.testing.orm.jpa.PersistenceUnitDescriptorAdapter; import org.hibernate.testing.orm.junit.JiraKey; -import org.hibernate.testing.logger.LoggerInspectionRule; -import org.hibernate.testing.logger.Triggerable; import org.hibernate.testing.util.ServiceRegistryUtil; - -import org.jboss.logging.Logger; -import org.junit.Rule; import org.junit.Test; -public class Hbm2ddlCreateOnlyTest { +import java.util.HashMap; +import java.util.List; +import java.util.Map; - @Rule - public LoggerInspectionRule logInspection = new LoggerInspectionRule( Logger.getMessageLogger( - MethodHandles.lookup(), CoreMessageLogger.class, SessionFactoryOptionsBuilder.class.getName() ) ); +public class Hbm2ddlCreateOnlyTest { @SuppressWarnings({ "rawtypes", "unchecked" }) @Test @@ -42,7 +25,7 @@ public void testColumnAnnotationWithExplicitReferenceToPrimaryTable() { final PersistenceUnitDescriptorAdapter pu = new PersistenceUnitDescriptorAdapter() { @Override public List getManagedClassNames() { - return Arrays.asList( AnEntity.class.getName() ); + return List.of( AnEntity.class.getName() ); } }; @@ -51,19 +34,8 @@ public List getManagedClassNames() { settings.put( AvailableSettings.HBM2DDL_AUTO, "create-only" ); ServiceRegistryUtil.applySettings( settings ); - EntityManagerFactory emf = null; - try { - Triggerable triggerable = logInspection.watchForLogMessages( "Unrecognized " + AvailableSettings.HBM2DDL_AUTO + " value" ); - - emf = Bootstrap.getEntityManagerFactoryBuilder( pu, settings ).build(); + try (var emf = Bootstrap.getEntityManagerFactoryBuilder( pu, settings ).build()) { emf.createEntityManager(); - - assertFalse( triggerable.wasTriggered() ); - } - finally { - if ( emf != null ) { - emf.close(); - } } } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionConnectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionConnectionTest.java deleted file mode 100644 index 5897c1aec5af..000000000000 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionConnectionTest.java +++ /dev/null @@ -1,135 +0,0 @@ -/* - * SPDX-License-Identifier: Apache-2.0 - * Copyright Red Hat Inc. and Hibernate Authors - */ -package org.hibernate.orm.test.stateless; - -import jakarta.persistence.Entity; -import jakarta.persistence.Id; - -import org.hibernate.HibernateException; -import org.hibernate.SessionFactory; -import org.hibernate.StatelessSession; -import org.hibernate.Transaction; -import org.hibernate.cfg.AvailableSettings; -import org.hibernate.id.enhanced.SequenceStyleGenerator; -import org.hibernate.internal.CoreMessageLogger; - -import org.hibernate.testing.orm.junit.JiraKey; -import org.hibernate.testing.logger.Triggerable; -import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; -import org.hibernate.testing.orm.junit.Jpa; -import org.hibernate.testing.orm.junit.Setting; -import org.hibernate.testing.orm.logger.LoggerInspectionExtension; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; - -import org.jboss.logging.Logger; - -import java.lang.invoke.MethodHandles; - -import static org.junit.jupiter.api.Assertions.assertFalse; - - -/** - * @author Vlad Mihalcea - */ -@Jpa( - annotatedClasses = StatelessSessionConnectionTest.Employee.class, - properties = @Setting(name = AvailableSettings.STATEMENT_BATCH_SIZE, value = "10") -) -public class StatelessSessionConnectionTest { - - final CoreMessageLogger messageLogger = Logger.getMessageLogger( - MethodHandles.lookup(), - CoreMessageLogger.class, - SequenceStyleGenerator.class.getName() - ); - - @RegisterExtension - public LoggerInspectionExtension logInspection = LoggerInspectionExtension - .builder().setLogger( messageLogger ).build(); - - - @Test - @JiraKey(value = "HHH-11732") - public void test(EntityManagerFactoryScope scope) { - Triggerable triggerable = logInspection.watchForLogMessages( "HHH000352" ); - triggerable.reset(); - - StatelessSession session = scope.getEntityManagerFactory() - .unwrap( SessionFactory.class ) - .openStatelessSession(); - Transaction tx = session.beginTransaction(); - - try { - Employee employee = new Employee( "1", "2", 1 ); - employee.setId( 1 ); - session.insert( employee ); - - tx.rollback(); - } - catch (HibernateException e) { - if ( tx != null ) { - tx.rollback(); - } - } - finally { - session.close(); - assertFalse( triggerable.wasTriggered() ); - } - } - - @Entity(name = "Employee") - public static class Employee { - @Id - private Integer id; - - private String firstName; - - private String lastName; - - private int salary; - - public Employee() { - } - - public Employee(String fname, String lname, int salary) { - this.firstName = fname; - this.lastName = lname; - this.salary = salary; - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getFirstName() { - return firstName; - } - - public void setFirstName(String first_name) { - this.firstName = first_name; - } - - public String getLastName() { - return lastName; - } - - public void setLastName(String last_name) { - this.lastName = last_name; - } - - public int getSalary() { - return salary; - } - - public void setSalary(int salary) { - this.salary = salary; - } - } -} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/IndividuallySchemaValidatorImplConnectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/IndividuallySchemaValidatorImplConnectionTest.java index 95f389cd3198..7fe43d59b80c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/IndividuallySchemaValidatorImplConnectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/IndividuallySchemaValidatorImplConnectionTest.java @@ -4,19 +4,9 @@ */ package org.hibernate.orm.test.tool.schema; -import java.io.FileInputStream; -import java.io.IOException; -import java.lang.invoke.MethodHandles; -import java.net.URL; -import java.sql.Connection; -import java.sql.SQLException; -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.Table; - import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; @@ -25,9 +15,14 @@ import org.hibernate.dialect.H2Dialect; import org.hibernate.engine.config.spi.ConfigurationService; import org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProvider; -import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.util.PropertiesHelper; +import org.hibernate.orm.test.util.DdlTransactionIsolatorTestingImpl; import org.hibernate.service.spi.ServiceRegistryImplementor; +import org.hibernate.testing.RequiresDialect; +import org.hibernate.testing.boot.JdbcConnectionAccessImpl; +import org.hibernate.testing.junit4.BaseUnitTestCase; +import org.hibernate.testing.orm.junit.JiraKey; +import org.hibernate.testing.util.ServiceRegistryUtil; import org.hibernate.tool.schema.internal.DefaultSchemaFilter; import org.hibernate.tool.schema.internal.ExceptionHandlerLoggedImpl; import org.hibernate.tool.schema.internal.HibernateSchemaManagementTool; @@ -40,21 +35,18 @@ import org.hibernate.tool.schema.spi.ExecutionOptions; import org.hibernate.tool.schema.spi.SchemaManagementTool; import org.hibernate.tool.schema.spi.SchemaValidator; - -import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.orm.junit.JiraKey; -import org.hibernate.testing.boot.JdbcConnectionAccessImpl; -import org.hibernate.testing.junit4.BaseUnitTestCase; -import org.hibernate.testing.logger.LoggerInspectionRule; -import org.hibernate.testing.util.ServiceRegistryUtil; - -import org.hibernate.orm.test.util.DdlTransactionIsolatorTestingImpl; import org.junit.After; import org.junit.Before; -import org.junit.Rule; import org.junit.Test; -import org.jboss.logging.Logger; +import java.io.FileInputStream; +import java.io.IOException; +import java.net.URL; +import java.sql.Connection; +import java.sql.SQLException; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; import static org.junit.Assert.assertFalse; @@ -65,10 +57,6 @@ @RequiresDialect(H2Dialect.class) public class IndividuallySchemaValidatorImplConnectionTest extends BaseUnitTestCase { - @Rule - public LoggerInspectionRule logInspection = new LoggerInspectionRule( - Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, IndividuallySchemaValidatorImplConnectionTest.class.getName() ) ); - private StandardServiceRegistry ssr; protected HibernateSchemaManagementTool tool; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/IndividuallySchemaValidatorImplTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/IndividuallySchemaValidatorImplTest.java index e1b09937cb7c..7b2100272592 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/IndividuallySchemaValidatorImplTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/IndividuallySchemaValidatorImplTest.java @@ -4,17 +4,9 @@ */ package org.hibernate.orm.test.tool.schema; -import java.io.FileInputStream; -import java.io.IOException; -import java.lang.invoke.MethodHandles; -import java.net.URL; -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.Table; - import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; @@ -22,37 +14,37 @@ import org.hibernate.dialect.H2Dialect; import org.hibernate.engine.config.spi.ConfigurationService; import org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProvider; -import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.util.PropertiesHelper; +import org.hibernate.orm.test.util.DdlTransactionIsolatorTestingImpl; import org.hibernate.service.spi.ServiceRegistryImplementor; +import org.hibernate.testing.RequiresDialect; +import org.hibernate.testing.boot.JdbcConnectionAccessImpl; +import org.hibernate.testing.junit4.BaseUnitTestCase; +import org.hibernate.testing.orm.junit.JiraKey; +import org.hibernate.testing.util.ServiceRegistryUtil; import org.hibernate.tool.schema.internal.DefaultSchemaFilter; import org.hibernate.tool.schema.internal.ExceptionHandlerLoggedImpl; import org.hibernate.tool.schema.internal.HibernateSchemaManagementTool; +import org.hibernate.tool.schema.internal.IndividuallySchemaValidatorImpl; import org.hibernate.tool.schema.internal.SchemaCreatorImpl; import org.hibernate.tool.schema.internal.SchemaDropperImpl; -import org.hibernate.tool.schema.internal.IndividuallySchemaValidatorImpl; import org.hibernate.tool.schema.internal.exec.GenerationTargetToDatabase; import org.hibernate.tool.schema.spi.ContributableMatcher; import org.hibernate.tool.schema.spi.ExceptionHandler; import org.hibernate.tool.schema.spi.ExecutionOptions; import org.hibernate.tool.schema.spi.SchemaManagementException; import org.hibernate.tool.schema.spi.SchemaManagementTool; - -import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.orm.junit.JiraKey; -import org.hibernate.testing.boot.JdbcConnectionAccessImpl; -import org.hibernate.testing.junit4.BaseUnitTestCase; -import org.hibernate.testing.logger.LoggerInspectionRule; -import org.hibernate.testing.util.ServiceRegistryUtil; - -import org.hibernate.orm.test.util.DdlTransactionIsolatorTestingImpl; import org.junit.After; import org.junit.Assert; import org.junit.Before; -import org.junit.Rule; import org.junit.Test; -import org.jboss.logging.Logger; +import java.io.FileInputStream; +import java.io.IOException; +import java.net.URL; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; import static org.junit.Assert.assertEquals; @@ -63,10 +55,6 @@ @RequiresDialect(H2Dialect.class) public class IndividuallySchemaValidatorImplTest extends BaseUnitTestCase { - @Rule - public LoggerInspectionRule logInspection = new LoggerInspectionRule( - Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, IndividuallySchemaValidatorImplTest.class.getName() ) ); - private StandardServiceRegistry ssr; protected HibernateSchemaManagementTool tool;