diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/H2LegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/H2LegacyDialect.java index ab0812eac6ce..f9a445015654 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/H2LegacyDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/H2LegacyDialect.java @@ -131,7 +131,7 @@ * @author Jürgen Kreitler */ public class H2LegacyDialect extends Dialect { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( H2LegacyDialect.class ); + private static final CoreMessageLogger log = CoreLogging.messageLogger( H2LegacyDialect.class ); private final LimitHandler limitHandler; @@ -161,7 +161,7 @@ public H2LegacyDialect(DatabaseVersion version) { : LimitOffsetLimitHandler.OFFSET_ONLY_INSTANCE; if ( version.isBefore( 1, 2, 139 ) ) { - LOG.unsupportedMultiTableBulkHqlJpaql( version.getMajor(), version.getMinor(), version.getMicro() ); + log.unsupportedMultiTableBulkHqlJpaql( version.getMajor(), version.getMinor(), version.getMicro() ); } // supportsTuplesInSubqueries = version.isSameOrAfter( 1, 4, 198 ); diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HANALegacyServerConfiguration.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HANALegacyServerConfiguration.java index f40ded623748..0085099ac2b7 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HANALegacyServerConfiguration.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HANALegacyServerConfiguration.java @@ -27,7 +27,8 @@ */ public class HANALegacyServerConfiguration { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( HANALegacyServerConfiguration.class ); + private static final CoreMessageLogger log = CoreLogging.messageLogger( HANALegacyServerConfiguration.class ); + private static final Pattern CLOUD_VERSION_PATTERN = Pattern.compile( "\\(fa/CE(\\d+)\\.(\\d+)\\)" ); public static final int MAX_LOB_PREFETCH_SIZE_DEFAULT_VALUE = 1024; @@ -62,7 +63,7 @@ public static HANALegacyServerConfiguration fromDialectResolutionInfo(DialectRes } catch (SQLException e) { // Ignore - LOG.debug( + log.debug( "An error occurred while trying to determine the database version.", e ); } @@ -79,7 +80,7 @@ public static HANALegacyServerConfiguration fromDialectResolutionInfo(DialectRes } catch (SQLException e) { // Ignore - LOG.debug( + log.debug( "An error occurred while trying to determine the value of the HANA parameter indexserver.ini / session / max_lob_prefetch_size.", e ); } @@ -117,7 +118,7 @@ public static DatabaseVersion determineDatabaseVersion(DialectResolutionInfo inf } catch (SQLException e) { // Ignore - LOG.debug( "An error occurred while trying to determine the HANA Cloud version.", e ); + log.debug( "An error occurred while trying to determine the HANA Cloud version.", e ); } } return databaseVersion == null 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 859c42ece687..c5d66feadce4 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 @@ -99,11 +99,13 @@ * @author Fred Toussi */ public class HSQLLegacyDialect extends Dialect { - private static final CoreMessageLogger LOG = Logger.getMessageLogger( + + private static final CoreMessageLogger log = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, org.hibernate.community.dialect.HSQLLegacyDialect.class.getName() ); + private final UniqueDelegate uniqueDelegate = new CreateTableUniqueDelegate( this ); private final HSQLIdentityColumnSupport identityColumnSupport; @@ -760,7 +762,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.hsqldbSupportsOnlyReadCommittedIsolation(); } super.lock( id, version, object, timeout, session ); } diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/RDMSOS2200Dialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/RDMSOS2200Dialect.java index 3f6d29eb1463..226812df19fa 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/RDMSOS2200Dialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/RDMSOS2200Dialect.java @@ -26,7 +26,6 @@ import org.hibernate.dialect.sequence.SequenceSupport; import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo; import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.internal.CoreMessageLogger; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.IntervalType; @@ -41,9 +40,7 @@ import org.hibernate.sql.exec.spi.JdbcOperation; import org.hibernate.type.descriptor.jdbc.JdbcType; import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry; -import org.jboss.logging.Logger; -import java.lang.invoke.MethodHandles; import java.sql.Types; import static org.hibernate.dialect.SimpleDatabaseVersion.ZERO_VERSION; @@ -79,11 +76,6 @@ * @author Ploski and Hanson */ public class RDMSOS2200Dialect extends Dialect { - private static final CoreMessageLogger LOG = Logger.getMessageLogger( - MethodHandles.lookup(), - CoreMessageLogger.class, - RDMSOS2200Dialect.class.getName() - ); /** * Constructs a RDMSOS2200Dialect diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/function/array/GaussDBArrayContainsOperatorFunction.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/function/array/GaussDBArrayContainsOperatorFunction.java index 02469114a03e..5a4a7dddabe7 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/function/array/GaussDBArrayContainsOperatorFunction.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/function/array/GaussDBArrayContainsOperatorFunction.java @@ -44,7 +44,7 @@ public void render( final JdbcMappingContainer needleTypeContainer = needleExpression.getExpressionType(); final JdbcMapping needleType = needleTypeContainer == null ? null : needleTypeContainer.getSingleJdbcMapping(); if ( needleType == null || needleType instanceof BasicPluralType ) { - LOG.deprecatedArrayContainsWithArray(); + log.deprecatedArrayContainsWithArray(); if ( nullable ) { super.render( sqlAppender, sqlAstArguments, returnType, walker ); } diff --git a/hibernate-core/src/main/java/org/hibernate/AssertionFailure.java b/hibernate-core/src/main/java/org/hibernate/AssertionFailure.java index fecf27dc1349..2ea406b47c75 100644 --- a/hibernate-core/src/main/java/org/hibernate/AssertionFailure.java +++ b/hibernate-core/src/main/java/org/hibernate/AssertionFailure.java @@ -14,7 +14,7 @@ */ public class AssertionFailure extends RuntimeException { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( AssertionFailure.class ); + private static final CoreMessageLogger log = CoreLogging.messageLogger( AssertionFailure.class ); /** * Creates an instance of AssertionFailure using the given message. @@ -23,7 +23,7 @@ public class AssertionFailure extends RuntimeException { */ public AssertionFailure(String message) { super( message ); - LOG.failed( this ); + log.failed( this ); } /** @@ -34,6 +34,6 @@ public AssertionFailure(String message) { */ public AssertionFailure(String message, Throwable cause) { super( message, cause ); - LOG.failed( cause ); + log.failed( cause ); } } diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/UnresolvedEntityInsertActions.java b/hibernate-core/src/main/java/org/hibernate/action/internal/UnresolvedEntityInsertActions.java index 5e9a125ab709..89fd89578454 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/UnresolvedEntityInsertActions.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/UnresolvedEntityInsertActions.java @@ -41,7 +41,8 @@ * @author Gail Badner */ public class UnresolvedEntityInsertActions { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( UnresolvedEntityInsertActions.class ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( UnresolvedEntityInsertActions.class ); private static final int INIT_SIZE = 5; @@ -63,8 +64,8 @@ public void addUnresolvedEntityInsertAction(AbstractEntityInsertAction insert, N "Attempt to add an unresolved insert action that has no non-nullable transient entities." ); } - if ( LOG.isTraceEnabled() ) { - LOG.tracev( + if ( log.isTraceEnabled() ) { + log.tracev( "Adding insert with non-nullable, transient entities; insert=[{0}], dependencies=[{1}]", insert, dependencies.toLoggableString( insert.getSession() ) @@ -96,7 +97,7 @@ public Iterable getDependentEntityInsertActions() { */ public void checkNoUnresolvedActionsAfterOperation() throws PropertyValueException { if ( isEmpty() ) { - LOG.trace( "No entity insert actions have non-nullable, transient entity dependencies." ); + log.trace( "No entity insert actions have non-nullable, transient entity dependencies." ); } else { final var firstDependentAction = dependenciesByAction.keySet().iterator().next(); @@ -142,7 +143,7 @@ private void logCannotResolveNonNullableTransientDependencies(SharedSessionContr } } - LOG.cannotResolveNonNullableTransientDependencies( + log.cannotResolveNonNullableTransientDependencies( transientEntityString, dependentEntityStrings, nonNullableTransientPropertyPaths @@ -186,13 +187,13 @@ public Set resolveDependentActions(Object managedEnt throw new IllegalArgumentException( "EntityEntry did not have status MANAGED or READ_ONLY: " + entityEntry ); } - final boolean traceEnabled = LOG.isTraceEnabled(); + final boolean traceEnabled = log.isTraceEnabled(); // Find out if there are any unresolved insertions that are waiting for the // specified entity to be resolved. final var dependentActions = dependentActionsByTransientEntity.remove( managedEntity ); if ( dependentActions == null ) { if ( traceEnabled ) { - LOG.tracev( + log.tracev( "No unresolved entity inserts that depended on [{0}]", infoString( entityEntry.getEntityName(), entityEntry.getId() ) ); @@ -202,7 +203,7 @@ public Set resolveDependentActions(Object managedEnt else { final Set resolvedActions = new IdentitySet<>(); if ( traceEnabled ) { - LOG.tracev( + log.tracev( "Unresolved inserts before resolving [{0}]: [{1}]", infoString( entityEntry.getEntityName(), entityEntry.getId() ), toString() @@ -210,7 +211,7 @@ public Set resolveDependentActions(Object managedEnt } for ( var dependentAction : dependentActions ) { if ( traceEnabled ) { - LOG.tracev( + log.tracev( "Resolving insert [{0}] dependency on [{1}]", infoString( dependentAction.getEntityName(), dependentAction.getId() ), infoString( entityEntry.getEntityName(), entityEntry.getId() ) @@ -220,7 +221,7 @@ public Set resolveDependentActions(Object managedEnt dependencies.resolveNonNullableTransientEntity( managedEntity ); if ( dependencies.isEmpty() ) { if ( traceEnabled ) { - LOG.tracev( + log.tracev( "Resolving insert [{0}] (only depended on [{1}])", dependentAction, infoString( entityEntry.getEntityName(), entityEntry.getId() ) @@ -232,7 +233,7 @@ public Set resolveDependentActions(Object managedEnt } } if ( traceEnabled ) { - LOG.tracev( + log.tracev( "Unresolved inserts after resolving [{0}]: [{1}]", infoString( entityEntry.getEntityName(), entityEntry.getId() ), toString() @@ -273,7 +274,7 @@ public String toString() { */ public void serialize(ObjectOutputStream oos) throws IOException { final int queueSize = dependenciesByAction.size(); - LOG.tracev( "Starting serialization of [{0}] unresolved insert entries", queueSize ); + log.tracev( "Starting serialization of [{0}] unresolved insert entries", queueSize ); oos.writeInt( queueSize ); for ( AbstractEntityInsertAction unresolvedAction : dependenciesByAction.keySet() ) { oos.writeObject( unresolvedAction ); @@ -297,7 +298,7 @@ public static UnresolvedEntityInsertActions deserialize( final var rtn = new UnresolvedEntityInsertActions(); final int queueSize = ois.readInt(); - LOG.tracev( "Starting deserialization of [{0}] unresolved insert entries", queueSize ); + log.tracev( "Starting deserialization of [{0}] unresolved insert entries", queueSize ); for ( int i = 0; i < queueSize; i++ ) { final var unresolvedAction = (AbstractEntityInsertAction) ois.readObject(); unresolvedAction.afterDeserialize( session ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/MetadataSources.java b/hibernate-core/src/main/java/org/hibernate/boot/MetadataSources.java index 4879626636a5..44b36c69e676 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/MetadataSources.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/MetadataSources.java @@ -66,7 +66,8 @@ * @since 5.0 */ public class MetadataSources implements Serializable { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( MetadataSources.class ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( MetadataSources.class ); private final ServiceRegistry serviceRegistry; private final ClassLoaderService classLoaderService; @@ -106,8 +107,8 @@ public MetadataSources(ServiceRegistry serviceRegistry) { public MetadataSources(ServiceRegistry serviceRegistry, XmlMappingBinderAccess xmlMappingBinderAccess) { // service registry really should be either BootstrapServiceRegistry or StandardServiceRegistry type... if ( !isExpectedServiceRegistryType( serviceRegistry ) ) { - if ( LOG.isDebugEnabled() ) { - LOG.debugf( + if ( log.isDebugEnabled() ) { + log.debugf( "Unexpected ServiceRegistry type [%s] encountered during building of MetadataSources; may cause " + "problems later attempting to construct MetadataBuilder", serviceRegistry.getClass().getName() diff --git a/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/BeanValidationEventListener.java b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/BeanValidationEventListener.java index 2cab523720b2..667959ee9cc7 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/BeanValidationEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/BeanValidationEventListener.java @@ -4,7 +4,6 @@ */ package org.hibernate.boot.beanvalidation; -import java.lang.invoke.MethodHandles; import java.util.HashSet; import java.util.Map; import java.util.Set; @@ -24,12 +23,11 @@ import org.hibernate.event.spi.PreUpdateEventListener; import org.hibernate.event.spi.PreUpsertEvent; import org.hibernate.event.spi.PreUpsertEventListener; +import org.hibernate.internal.CoreLogging; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.metamodel.RepresentationMode; import org.hibernate.persister.entity.EntityPersister; -import org.jboss.logging.Logger; - import jakarta.validation.ConstraintViolation; import jakarta.validation.ConstraintViolationException; import jakarta.validation.Validator; @@ -49,15 +47,11 @@ public class BeanValidationEventListener implements PreInsertEventListener, PreUpdateEventListener, PreDeleteEventListener, PreUpsertEventListener, PreCollectionUpdateEventListener, SessionFactoryObserver { - private static final CoreMessageLogger LOG = Logger.getMessageLogger( - MethodHandles.lookup(), - CoreMessageLogger.class, - BeanValidationEventListener.class.getName() - ); + private static final CoreMessageLogger log = CoreLogging.messageLogger( BeanValidationEventListener.class ); - private HibernateTraversableResolver traversableResolver; - private Validator validator; - private GroupsPerOperation groupsPerOperation; + private final HibernateTraversableResolver traversableResolver; + private final Validator validator; + private final GroupsPerOperation groupsPerOperation; public BeanValidationEventListener( ValidatorFactory factory, Map settings, ClassLoaderService classLoaderService) { @@ -143,7 +137,7 @@ private void validate( final Set> propagatedViolations = setOfSize( constraintViolations.size() ); final Set classNames = new HashSet<>(); for ( ConstraintViolation violation : constraintViolations ) { - LOG.trace( violation ); + log.trace( violation ); propagatedViolations.add( violation ); classNames.add( violation.getLeafBean().getClass().getName() ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/BeanValidationIntegrator.java b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/BeanValidationIntegrator.java index 8ba6642e9455..825df0522a43 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/BeanValidationIntegrator.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/BeanValidationIntegrator.java @@ -4,7 +4,6 @@ */ package org.hibernate.boot.beanvalidation; -import java.lang.invoke.MethodHandles; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.Set; @@ -16,23 +15,19 @@ import org.hibernate.engine.config.spi.ConfigurationService; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.integrator.spi.Integrator; +import org.hibernate.internal.CoreLogging; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.service.spi.ServiceRegistryImplementor; import org.hibernate.service.spi.SessionFactoryServiceRegistry; -import org.jboss.logging.Logger; - /** * In {@link Integrator} for Bean Validation. * * @author Steve Ebersole */ public class BeanValidationIntegrator implements Integrator { - private static final CoreMessageLogger LOG = Logger.getMessageLogger( - MethodHandles.lookup(), - CoreMessageLogger.class, - BeanValidationIntegrator.class.getName() - ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( BeanValidationIntegrator.class ); public static final String APPLY_CONSTRAINTS = "hibernate.validator.apply_to_ddl"; @@ -98,7 +93,7 @@ public void integrate( } final Set modes = ValidationMode.getModes( modeSetting ); if ( modes.size() > 1 ) { - LOG.multipleValidationModes( ValidationMode.loggable( modes ) ); + log.multipleValidationModes( ValidationMode.loggable( modes ) ); } if ( modes.size() == 1 && modes.contains( ValidationMode.NONE ) ) { // we have nothing to do; just return diff --git a/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/TypeSafeActivator.java b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/TypeSafeActivator.java index 602c66cfea76..1d2f450e3122 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/TypeSafeActivator.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/TypeSafeActivator.java @@ -7,7 +7,6 @@ import java.lang.annotation.Annotation; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.lang.invoke.MethodHandles; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; @@ -36,6 +35,7 @@ import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.event.service.spi.EventListenerRegistry; import org.hibernate.event.spi.EventType; +import org.hibernate.internal.CoreLogging; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.mapping.CheckConstraint; import org.hibernate.mapping.Column; @@ -46,7 +46,6 @@ import org.hibernate.mapping.SingleTableSubclass; import org.hibernate.service.spi.SessionFactoryServiceRegistry; -import org.jboss.logging.Logger; import jakarta.validation.Validation; import jakarta.validation.ValidatorFactory; @@ -73,7 +72,7 @@ */ class TypeSafeActivator { - private static final CoreMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, TypeSafeActivator.class.getName() ); + private static final CoreMessageLogger log = CoreLogging.messageLogger( TypeSafeActivator.class ); /** * Used to validate a supplied ValidatorFactory instance as being castable to ValidatorFactory. @@ -106,7 +105,7 @@ else if ( validationModes.contains( ValidationMode.DDL ) ) { if ( e.getCause() != null && e.getCause() instanceof NoProviderFoundException ) { // all good, we are looking at the ValidationMode.AUTO, and there are no providers available. // Hence, we just don't enable the Jakarta Validation integration: - LOG.debug( "Unable to acquire Jakarta Validation ValidatorFactory, skipping activation" ); + log.debug( "Unable to acquire Jakarta Validation ValidatorFactory, skipping activation" ); return; } else { @@ -174,7 +173,7 @@ private static boolean isConstraintBasedValidationEnabled(ActivationContext cont || modes.contains( ValidationMode.AUTO ); } else { - LOG.debug( "Skipping application of relational constraints from legacy Hibernate Validator" ); + log.debug( "Skipping application of relational constraints from legacy Hibernate Validator" ); return false; } } @@ -220,7 +219,7 @@ public static void applyRelationalConstraints( ); } catch (Exception e) { - LOG.unableToApplyConstraints( className, e ); + log.unableToApplyConstraints( className, e ); } } } @@ -369,7 +368,7 @@ private static boolean isConstraintCompositionOfTypeOr( return result != null && "OR".equals( result.toString() ); } catch ( NoSuchMethodException | IllegalAccessException | InvocationTargetException ex ) { - LOG.debug( "ConstraintComposition type could not be determined. Assuming AND", ex ); + log.debug( "ConstraintComposition type could not be determined. Assuming AND", ex ); return false; } } @@ -433,7 +432,7 @@ private static void markNotNull(Property property) { column.setNullable( false ); } else { - LOG.debugf( + log.debugf( "@NotNull was applied to attribute [%s] which is defined (at least partially) " + "by formula(s); formula portions will be skipped", property.getName() diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedColumn.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedColumn.java index dc4622e20c07..b97e1535ff8c 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedColumn.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedColumn.java @@ -65,7 +65,7 @@ */ public class AnnotatedColumn { - private static final CoreMessageLogger LOG = messageLogger( AnnotatedColumn.class ); + private static final CoreMessageLogger log = messageLogger( AnnotatedColumn.class ); private Column mappingColumn; private boolean insertable = true; @@ -238,8 +238,8 @@ public AnnotatedColumn() { public void bind() { if ( isNotEmpty( formulaString ) ) { - if ( LOG.isTraceEnabled() ) { - LOG.trace( "Binding formula: " + formulaString ); + if ( log.isTraceEnabled() ) { + log.trace( "Binding formula: " + formulaString ); } formula = new Formula(); formula.setFormula( formulaString ); @@ -272,8 +272,8 @@ public void bind() { if ( generatedAs != null ) { mappingColumn.setGeneratedAs( generatedAs ); } - if ( LOG.isDebugEnabled() && logicalColumnName != null ) { - LOG.trace( "Binding column: " + logicalColumnName ); + if ( log.isDebugEnabled() && logicalColumnName != null ) { + log.trace( "Binding column: " + logicalColumnName ); } } } @@ -772,8 +772,8 @@ private static jakarta.persistence.Column[] overrideColumns( + " '@AttributeOverride's but the overridden property has " + overriddenCols.length + " columns (every column must have exactly one '@AttributeOverride')" ); } - if ( LOG.isTraceEnabled() ) { - LOG.trace( "Column mapping overridden for property: " + inferredData.getPropertyName() ); + if ( log.isTraceEnabled() ) { + log.trace( "Column mapping overridden for property: " + inferredData.getPropertyName() ); } return isEmpty( overriddenCols ) ? null : overriddenCols; } @@ -933,7 +933,7 @@ void applyColumnDefault(PropertyData inferredData, int length) { } } else { - LOG.trace("Could not perform @ColumnDefault lookup as 'PropertyData' did not give access to XProperty"); + log.trace("Could not perform @ColumnDefault lookup as 'PropertyData' did not give access to XProperty"); } } @@ -954,7 +954,7 @@ void applyGeneratedAs(PropertyData inferredData, int length) { } } else { - LOG.trace("Could not perform @GeneratedColumn lookup as 'PropertyData' did not give access to XProperty"); + log.trace("Could not perform @GeneratedColumn lookup as 'PropertyData' did not give access to XProperty"); } } @@ -997,7 +997,7 @@ void applyCheckConstraint(PropertyData inferredData, int length) { } } else { - LOG.trace("Could not perform @Check lookup as 'PropertyData' did not give access to XProperty"); + log.trace("Could not perform @Check lookup as 'PropertyData' did not give access to XProperty"); } } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotationBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotationBinder.java index f1b2ccb51473..9be0e583c098 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotationBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotationBinder.java @@ -63,7 +63,8 @@ * @author Hardy Ferentschik */ public final class AnnotationBinder { - private static final CoreMessageLogger LOG = messageLogger( AnnotationBinder.class ); + + private static final CoreMessageLogger log = messageLogger( AnnotationBinder.class ); private AnnotationBinder() {} @@ -79,8 +80,8 @@ public static void bindDefaults(MetadataBuildingContext context) { final var definitionBuilder = new IdentifierGeneratorDefinition.Builder(); interpretSequenceGenerator( generatorRegistration.configuration(), definitionBuilder ); final IdentifierGeneratorDefinition idGenDef = definitionBuilder.build(); - if ( LOG.isTraceEnabled() ) { - LOG.trace( "Adding global sequence generator with name: " + name ); + if ( log.isTraceEnabled() ) { + log.trace( "Adding global sequence generator with name: " + name ); } metadataCollector.addDefaultIdentifierGenerator( idGenDef ); } ); @@ -89,8 +90,8 @@ public static void bindDefaults(MetadataBuildingContext context) { final var definitionBuilder = new IdentifierGeneratorDefinition.Builder(); interpretTableGenerator( generatorRegistration.configuration(), definitionBuilder ); final IdentifierGeneratorDefinition idGenDef = definitionBuilder.build(); - if ( LOG.isTraceEnabled() ) { - LOG.trace( "Adding global table generator with name: " + name ); + if ( log.isTraceEnabled() ) { + log.trace( "Adding global table generator with name: " + name ); } metadataCollector.addDefaultIdentifierGenerator( idGenDef ); } ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionBinder.java index 3009140d10ff..9b70137bc717 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionBinder.java @@ -130,7 +130,8 @@ * @author Emmanuel Bernard */ public abstract class CollectionBinder { - private static final CoreMessageLogger LOG = messageLogger( CollectionBinder.class ); + + private static final CoreMessageLogger log = messageLogger( CollectionBinder.class ); private static final List> INFERRED_CLASS_PRIORITY = List.of( List.class, @@ -1059,8 +1060,8 @@ private void setDeclaringClass(ClassDetails declaringClass) { private void bind() { collection = createCollection( propertyHolder.getPersistentClass() ); final String role = qualify( propertyHolder.getPath(), propertyName ); - if ( LOG.isTraceEnabled() ) { - LOG.trace( "Binding collection role: " + role ); + if ( log.isTraceEnabled() ) { + log.trace( "Binding collection role: " + role ); } collection.setRole( role ); collection.setMappedByProperty( mappedBy ); @@ -1142,16 +1143,16 @@ private void detectMappedByProblem(boolean isMappedBy) { } if ( oneToMany ) { if ( property.hasDirectAnnotationUsage( MapKeyColumn.class ) ) { - LOG.warn( "Association '" - + qualify( propertyHolder.getPath(), propertyName ) - + "' is 'mappedBy' another entity and should not specify a '@MapKeyColumn'" - + " (use '@MapKey' instead)" ); + log.warn( "Association '" + + qualify( propertyHolder.getPath(), propertyName ) + + "' is 'mappedBy' another entity and should not specify a '@MapKeyColumn'" + + " (use '@MapKey' instead)" ); } if ( property.hasDirectAnnotationUsage( OrderColumn.class ) ) { - LOG.warn( "Association '" - + qualify( propertyHolder.getPath(), propertyName ) - + "' is 'mappedBy' another entity and should not specify an '@OrderColumn'" - + " (use '@OrderBy' instead)" ); + log.warn( "Association '" + + qualify( propertyHolder.getPath(), propertyName ) + + "' is 'mappedBy' another entity and should not specify an '@OrderColumn'" + + " (use '@OrderBy' instead)" ); } } else { @@ -2771,8 +2772,8 @@ private void setLocalGenerators(Map local } private void logOneToManySecondPass() { - if ( LOG.isTraceEnabled() ) { - LOG.trace( "Binding one-to-many association through foreign key: " + safeCollectionRole() ); + if ( log.isTraceEnabled() ) { + log.trace( "Binding one-to-many association through foreign key: " + safeCollectionRole() ); } } @@ -2780,18 +2781,18 @@ private void logManyToManySecondPass( boolean isOneToMany, boolean isCollectionOfEntities, boolean isManyToAny) { - if ( LOG.isTraceEnabled() ) { + if ( log.isTraceEnabled() ) { if ( isCollectionOfEntities && isOneToMany ) { - LOG.trace( "Binding one-to-many association through association table: " + safeCollectionRole() ); + log.trace( "Binding one-to-many association through association table: " + safeCollectionRole() ); } else if ( isCollectionOfEntities ) { - LOG.trace( "Binding many-to-many association through association table: " + safeCollectionRole() ); + log.trace( "Binding many-to-many association through association table: " + safeCollectionRole() ); } else if ( isManyToAny ) { - LOG.trace( "Binding many-to-any: " + safeCollectionRole() ); + log.trace( "Binding many-to-any: " + safeCollectionRole() ); } else { - LOG.trace( "Binding element collection to collection table: " + safeCollectionRole() ); + log.trace( "Binding element collection to collection table: " + safeCollectionRole() ); } } } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionPropertyHolder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionPropertyHolder.java index b117e37d53ce..6a42d26335bf 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionPropertyHolder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionPropertyHolder.java @@ -46,7 +46,8 @@ * @author Steve Ebersole */ public class CollectionPropertyHolder extends AbstractPropertyHolder { - private static final CoreMessageLogger LOG = messageLogger( CollectionPropertyHolder.class ); + + private static final CoreMessageLogger log = messageLogger( CollectionPropertyHolder.class ); private final Collection collection; @@ -183,7 +184,7 @@ private static void logSpecNoncompliance(String attributeName, String role) { final boolean specCompliant = isNotEmpty( attributeName ) && (attributeName.startsWith( "key" ) || attributeName.startsWith( "value" ) ); if ( !specCompliant ) { - LOG.nonCompliantMapConversion( role ); + log.nonCompliantMapConversion( role ); } } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionSecondPass.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionSecondPass.java index cfd64f88bbe4..c74f20a6204c 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionSecondPass.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionSecondPass.java @@ -24,7 +24,7 @@ */ public abstract class CollectionSecondPass implements SecondPass { - private static final CoreMessageLogger LOG = messageLogger( CollectionSecondPass.class); + private static final CoreMessageLogger log = messageLogger( CollectionSecondPass.class); private final Collection collection; @@ -35,14 +35,14 @@ public CollectionSecondPass(Collection collection) { @Override public void doSecondPass(Map persistentClasses) throws MappingException { - if ( LOG.isTraceEnabled() ) { - LOG.trace( "Second pass for collection: " + collection.getRole() ); + if ( log.isTraceEnabled() ) { + log.trace( "Second pass for collection: " + collection.getRole() ); } secondPass( persistentClasses ); collection.createAllKeys(); - if ( LOG.isTraceEnabled() ) { + if ( log.isTraceEnabled() ) { String msg = "Mapped collection key: " + columns( collection.getKey() ); if ( collection.isIndexed() ) { msg += ", index: " + columns( ( (IndexedCollection) collection ).getIndex() ); @@ -54,7 +54,7 @@ public void doSecondPass(Map persistentClasses) else { msg += ", element: " + columns( collection.getElement() ); } - LOG.trace( msg ); + log.trace( msg ); } } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EmbeddableBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EmbeddableBinder.java index 7950e384375b..cb2c6e2fdb00 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EmbeddableBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EmbeddableBinder.java @@ -81,7 +81,8 @@ * instances of the mapping model object {@link Component}. */ public class EmbeddableBinder { - private static final CoreMessageLogger LOG = messageLogger( EmbeddableBinder.class ); + + private static final CoreMessageLogger log = messageLogger( EmbeddableBinder.class ); static PropertyBinder createCompositeBinder( PropertyHolder propertyHolder, @@ -440,8 +441,8 @@ static Component fillEmbeddable( ); final String subpath = getPath( propertyHolder, inferredData ); - if ( LOG.isTraceEnabled() ) { - LOG.trace( "Binding embeddable with path: " + subpath ); + if ( log.isTraceEnabled() ) { + log.trace( "Binding embeddable with path: " + subpath ); } final var subholder = buildPropertyHolder( embeddable, diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EntityBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EntityBinder.java index 557a6e8e6bd0..f1be1a139366 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EntityBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EntityBinder.java @@ -133,7 +133,8 @@ */ public class EntityBinder { - private static final CoreMessageLogger LOG = messageLogger( EntityBinder.class ); + private static final CoreMessageLogger log = messageLogger( EntityBinder.class ); + private static final String NATURAL_ID_CACHE_SUFFIX = "##NaturalId"; private final MetadataBuildingContext context; @@ -185,8 +186,8 @@ public static void bindEntityClass( ClassDetails clazzToProcess, Map inheritanceStates, MetadataBuildingContext context) { - if ( LOG.isTraceEnabled() ) { - LOG.trace( "Binding entity with annotated class: " + clazzToProcess.getName() ); + if ( log.isTraceEnabled() ) { + log.trace( "Binding entity with annotated class: " + clazzToProcess.getName() ); } final var collector = context.getMetadataCollector(); @@ -520,9 +521,9 @@ private boolean mapAsIdClass( } private ClassDetails idClassDetails(InheritanceState inheritanceState, ClassDetails classWithIdClass) { - final var idClassAnn = classWithIdClass.getDirectAnnotationUsage( IdClass.class ); + final var idClass = classWithIdClass.getDirectAnnotationUsage( IdClass.class ); final var classDetailsRegistry = modelsContext().getClassDetailsRegistry(); - if ( idClassAnn == null ) { + if ( idClass == null ) { try { // look for an Id class generated by Hibernate Processor as an inner class of static metamodel final var javaClass = inheritanceState.getClassDetails().toJavaClass(); @@ -534,7 +535,7 @@ private ClassDetails idClassDetails(InheritanceState inheritanceState, ClassDeta } } else { - return classDetailsRegistry.resolveClassDetails( idClassAnn.value().getName() ); + return classDetailsRegistry.resolveClassDetails( idClass.value().getName() ); } } @@ -1027,8 +1028,8 @@ private boolean useDiscriminatorColumnForJoined(DiscriminatorColumn discriminato if ( discriminatorColumn != null ) { final boolean ignore = buildingOptions.ignoreExplicitDiscriminatorsForJoinedInheritance(); if ( ignore ) { - if ( LOG.isTraceEnabled() ) { - LOG.trace( "Ignoring explicit @DiscriminatorColumn annotation on: " + if ( log.isTraceEnabled() ) { + log.trace( "Ignoring explicit @DiscriminatorColumn annotation on: " + annotatedClass.getName() ); } } @@ -1037,8 +1038,8 @@ private boolean useDiscriminatorColumnForJoined(DiscriminatorColumn discriminato else { final boolean createImplicit = buildingOptions.createImplicitDiscriminatorsForJoinedInheritance(); if ( createImplicit ) { - if ( LOG.isTraceEnabled() ) { - LOG.trace( "Inferring implicit @DiscriminatorColumn using defaults for: " + if ( log.isTraceEnabled() ) { + log.trace( "Inferring implicit @DiscriminatorColumn using defaults for: " + annotatedClass.getName() ); } } @@ -1056,7 +1057,7 @@ private void processIdPropertiesIfNotAlready( Map inheritanceStates) { final Set missingIdProperties = new HashSet<>( idPropertiesIfIdClass ); final Set missingEntityProperties = new HashSet<>(); - for ( PropertyData propertyAnnotatedElement : elementsToProcess.getElements() ) { + for ( var propertyAnnotatedElement : elementsToProcess.getElements() ) { final String propertyName = propertyAnnotatedElement.getPropertyName(); if ( !idPropertiesIfIdClass.contains( propertyName ) ) { final var memberDetails = propertyAnnotatedElement.getAttributeMember(); @@ -1223,28 +1224,25 @@ public boolean isPropertyDefinedInSuperHierarchy(String name) { } private void bindRowManagement() { - final var ontext = modelsContext(); - final var dynamicInsertAnn = annotatedClass.getAnnotationUsage( DynamicInsert.class, ontext ); - persistentClass.setDynamicInsert( dynamicInsertAnn != null ); - - final var dynamicUpdateAnn = annotatedClass.getAnnotationUsage( DynamicUpdate.class, ontext ); - persistentClass.setDynamicUpdate( dynamicUpdateAnn != null ); + final var modelsContext = modelsContext(); + final var dynamicInsert = annotatedClass.hasAnnotationUsage( DynamicInsert.class, modelsContext ); + final var dynamicUpdate = annotatedClass.hasAnnotationUsage( DynamicUpdate.class, modelsContext ); + persistentClass.setDynamicInsert( dynamicInsert ); + persistentClass.setDynamicUpdate( dynamicUpdate ); - if ( persistentClass.useDynamicInsert() - && annotatedClass.hasAnnotationUsage( SQLInsert.class, ontext ) ) { + if ( dynamicInsert && annotatedClass.hasAnnotationUsage( SQLInsert.class, modelsContext ) ) { throw new AnnotationException( "Entity '" + name + "' is annotated both '@DynamicInsert' and '@SQLInsert'" ); } - if ( persistentClass.useDynamicUpdate() - && annotatedClass.hasAnnotationUsage( SQLUpdate.class, ontext ) ) { + if ( dynamicUpdate && annotatedClass.hasAnnotationUsage( SQLUpdate.class, modelsContext ) ) { throw new AnnotationException( "Entity '" + name + "' is annotated both '@DynamicUpdate' and '@SQLUpdate'" ); } } private void bindOptimisticLocking() { - final var optimisticLockingAnn = annotatedClass.getAnnotationUsage( OptimisticLocking.class, modelsContext() ); - persistentClass.setOptimisticLockStyle( fromLockType( optimisticLockingAnn == null + final var optimisticLocking = annotatedClass.getAnnotationUsage( OptimisticLocking.class, modelsContext() ); + persistentClass.setOptimisticLockStyle( fromLockType( optimisticLocking == null ? OptimisticLockType.VERSION - : optimisticLockingAnn.type() ) ); + : optimisticLocking.type() ) ); } private void bindEntityAnnotation() { @@ -1559,27 +1557,26 @@ private NamedEntityGraphDefinition namedEntityGraphDefinition(org.hibernate.anno private void bindDiscriminatorValue() { final var discriminatorValue = annotatedClass.getAnnotationUsage( DiscriminatorValue.class, modelsContext() ); + persistentClass.setDiscriminatorValue( discriminatorValueString( discriminatorValue ) ); + } + + private String discriminatorValueString(DiscriminatorValue discriminatorValue) { if ( discriminatorValue == null ) { - final Value discriminator = persistentClass.getDiscriminator(); + final var discriminator = persistentClass.getDiscriminator(); if ( discriminator == null ) { - persistentClass.setDiscriminatorValue( name ); + return name; } else { - switch ( discriminator.getType().getName() ) { - case "character": - throw new AnnotationException( "Entity '" + name - + "' has a discriminator of character type and must specify its '@DiscriminatorValue'" ); - case "integer": - // TODO: pretty nasty, should we just deprecate/disallow this? - persistentClass.setDiscriminatorValue( String.valueOf( name.hashCode() ) ); - break; - default: - persistentClass.setDiscriminatorValue( name ); //Spec compliant - } + final String discriminatorTypeName = discriminator.getType().getName(); + return switch ( discriminatorTypeName ) { + case "string" -> name; //Spec compliant + case "integer"-> String.valueOf( name.hashCode() ); // TODO: pretty nasty, should we just deprecate/disallow this? + default -> throw new MappingException( "Entity '" + name + "' must explicitly specify its '@DiscriminatorValue'" ); + }; } } else { - persistentClass.setDiscriminatorValue( discriminatorValue.value() ); + return discriminatorValue.value(); } } @@ -1664,7 +1661,7 @@ private void bindSubclassCache() { +" (only root classes may define second-level caching semantics)"); } - final Cacheable cacheable = annotatedClass.getAnnotationUsage( Cacheable.class, modelsContext() ); + final var cacheable = annotatedClass.getAnnotationUsage( Cacheable.class, modelsContext() ); isCached = cacheable == null && persistentClass.getSuperclass() != null // we should inherit the root class caching config ? persistentClass.getSuperclass().isCached() diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/FilterDefBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/FilterDefBinder.java index 5700563a8364..062861102daf 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/FilterDefBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/FilterDefBinder.java @@ -35,7 +35,8 @@ * @author Gavin King */ public class FilterDefBinder { - private static final CoreMessageLogger LOG = messageLogger( FilterDefBinder.class ); + + private static final CoreMessageLogger log = messageLogger( FilterDefBinder.class ); public static void bindFilterDefs(AnnotationTarget annotatedElement, MetadataBuildingContext context) { final var modelsContext = context.getBootstrapContext().getModelsContext(); @@ -93,8 +94,8 @@ public static void bindFilterDef(FilterDef filterDef, MetadataBuildingContext co parameterResolvers ); - if ( LOG.isTraceEnabled() ) { - LOG.trace( "Binding filter definition: " + filterDefinition.getFilterName() ); + if ( log.isTraceEnabled() ) { + log.trace( "Binding filter definition: " + filterDefinition.getFilterName() ); } context.getMetadataCollector().addFilterDefinition( filterDefinition ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/GeneratorBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/GeneratorBinder.java index 7819dfc17884..e52cd857ab2b 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/GeneratorBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/GeneratorBinder.java @@ -78,7 +78,7 @@ */ public class GeneratorBinder { - private static final CoreMessageLogger LOG = messageLogger( GeneratorBinder.class ); + private static final CoreMessageLogger log = messageLogger( GeneratorBinder.class ); public static final String ASSIGNED_GENERATOR_NAME = "assigned"; public static final GeneratorCreator ASSIGNED_IDENTIFIER_GENERATOR_CREATOR = @@ -299,8 +299,8 @@ private static IdentifierGeneratorDefinition buildIdGenerator(GenericGenerator g definitionBuilder.setStrategy( strategy ); definitionBuilder.addParams( extractParameterMap( generatorAnnotation.parameters() ) ); - if ( LOG.isTraceEnabled() ) { - LOG.tracev( "Added generator with name: {0}, strategy: {0}", + if ( log.isTraceEnabled() ) { + log.tracev( "Added generator with name: {0}, strategy: {0}", definitionBuilder.getName(), definitionBuilder.getStrategy() ); } return definitionBuilder.build(); @@ -309,8 +309,8 @@ private static IdentifierGeneratorDefinition buildIdGenerator(GenericGenerator g private static IdentifierGeneratorDefinition buildSequenceIdGenerator(SequenceGenerator generatorAnnotation) { final var definitionBuilder = new IdentifierGeneratorDefinition.Builder(); interpretSequenceGenerator( generatorAnnotation, definitionBuilder ); - if ( LOG.isTraceEnabled() ) { - LOG.tracev( "Added sequence generator with name: {0}", definitionBuilder.getName() ); + if ( log.isTraceEnabled() ) { + log.tracev( "Added sequence generator with name: {0}", definitionBuilder.getName() ); } return definitionBuilder.build(); } @@ -318,8 +318,8 @@ private static IdentifierGeneratorDefinition buildSequenceIdGenerator(SequenceGe private static IdentifierGeneratorDefinition buildTableIdGenerator(TableGenerator generatorAnnotation) { final var definitionBuilder = new IdentifierGeneratorDefinition.Builder(); interpretTableGenerator( generatorAnnotation, definitionBuilder ); - if ( LOG.isTraceEnabled() ) { - LOG.tracev( "Added sequence generator with name: {0}", definitionBuilder.getName() ); + if ( log.isTraceEnabled() ) { + log.tracev( "Added sequence generator with name: {0}", definitionBuilder.getName() ); } return definitionBuilder.build(); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/GeneratorParameters.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/GeneratorParameters.java index 8a9990b2104d..3b96464400ae 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/GeneratorParameters.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/GeneratorParameters.java @@ -59,7 +59,7 @@ */ public class GeneratorParameters { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( GeneratorBinder.class ); + private static final CoreMessageLogger log = CoreLogging.messageLogger( GeneratorBinder.class ); /** * Collect the parameters which should be passed to @@ -253,7 +253,7 @@ public static void interpretTableGenerator( // TODO : implement unique-constraint support if ( isNotEmpty( tableGeneratorAnnotation.uniqueConstraints() ) ) { - LOG.ignoringTableGeneratorConstraints( tableGeneratorAnnotation.name() ); + log.ignoringTableGeneratorConstraints( tableGeneratorAnnotation.name() ); } } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/QueryBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/QueryBinder.java index 112bbca4c707..88774cdb0390 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/QueryBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/QueryBinder.java @@ -61,7 +61,7 @@ * @author Emmanuel Bernard */ public abstract class QueryBinder { - private static final CoreMessageLogger LOG = messageLogger( QueryBinder.class ); + private static final CoreMessageLogger log = messageLogger( QueryBinder.class ); public static void bindQuery( NamedQuery namedQuery, @@ -78,8 +78,8 @@ public static void bindQuery( "Class or package level '@NamedQuery' annotation must specify a 'name'" ); } - if ( LOG.isTraceEnabled() ) { - LOG.tracef( "Binding named query '%s' to [%s]", queryName, + if ( log.isTraceEnabled() ) { + log.tracef( "Binding named query '%s' to [%s]", queryName, queryString.replace( '\n', ' ' ) ); } @@ -139,8 +139,8 @@ public static void bindNativeQuery( createNamedQueryDefinition( registrationName, queryString, resultClass, resultSetMappingName, hints, location ); - if ( LOG.isTraceEnabled() ) { - LOG.tracef( "Binding named native query '%s' to [%s]", + if ( log.isTraceEnabled() ) { + log.tracef( "Binding named native query '%s' to [%s]", queryDefinition.getRegistrationName(), queryDefinition.getSqlQueryString().replace( '\n', ' ' ) ); } @@ -231,8 +231,8 @@ public static void bindNativeQuery( createQueryDefinition( namedNativeQuery, registrationName, resultSetMappingName, resultClass, namedNativeQuery.timeout(), namedNativeQuery.fetchSize(), querySpaces, location ); final var queryDefinition = builder.build(); - if ( LOG.isTraceEnabled() ) { - LOG.tracef( + if ( log.isTraceEnabled() ) { + log.tracef( "Binding named native query '%' to [%s]", queryDefinition.getRegistrationName(), queryDefinition.getSqlQueryString().replace( '\n', ' ' ) @@ -384,8 +384,8 @@ public static void bindQuery( final var hqlQueryDefinition = builder.build(); - if ( LOG.isTraceEnabled() ) { - LOG.tracef( "Binding named query '%s' to [%s]", + if ( log.isTraceEnabled() ) { + log.tracef( "Binding named query '%s' to [%s]", hqlQueryDefinition.getRegistrationName(), hqlQueryDefinition.getHqlString().replace( '\n', ' ' ) ); } @@ -448,7 +448,7 @@ public static void bindNamedStoredProcedureQuery( else { collector.addNamedProcedureCallDefinition( definition ); } - LOG.tracef( "Bound named stored procedure query: %s => %s", + log.tracef( "Bound named stored procedure query: %s => %s", definition.getRegistrationName(), definition.getProcedureName() ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ToOneBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ToOneBinder.java index ebd759d4c3bc..db2f390fec04 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ToOneBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ToOneBinder.java @@ -64,7 +64,8 @@ * @author Emmanuel Bernard */ public class ToOneBinder { - private static final CoreMessageLogger LOG = messageLogger( ToOneBinder.class ); + + private static final CoreMessageLogger log = messageLogger( ToOneBinder.class ); static void bindManyToOne( PropertyHolder propertyHolder, @@ -233,7 +234,7 @@ private static NotFoundAction notFoundAction(PropertyHolder propertyHolder, Memb final var notFound = property.getDirectAnnotationUsage( NotFound.class ); final NotFoundAction notFoundAction = notFound == null ? null : notFound.action(); if ( notFoundAction != null && fetchType == LAZY ) { - LOG.ignoreNotFoundWithFetchTypeLazy( propertyHolder.getEntityName(), property.getName() ); + log.ignoreNotFoundWithFetchTypeLazy( propertyHolder.getEntityName(), property.getName() ); } return notFoundAction; } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/registry/internal/BootstrapServiceRegistryImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/internal/BootstrapServiceRegistryImpl.java index 29243db73073..79ed37a95f0c 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/registry/internal/BootstrapServiceRegistryImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/registry/internal/BootstrapServiceRegistryImpl.java @@ -41,7 +41,7 @@ public class BootstrapServiceRegistryImpl implements ServiceRegistryImplementor, BootstrapServiceRegistry, ServiceBinding.ServiceLifecycleOwner { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( BootstrapServiceRegistryImpl.class ); + private static final CoreMessageLogger log = CoreLogging.messageLogger( BootstrapServiceRegistryImpl.class ); private final boolean autoCloseRegistry; private boolean active = true; @@ -266,7 +266,7 @@ public synchronized void stopService(ServiceBinding bindi stoppable.stop(); } catch ( Exception e ) { - LOG.unableToStopService( binding.getServiceRole().getName(), e ); + log.unableToStopService( binding.getServiceRole().getName(), e ); } } } @@ -277,7 +277,7 @@ public synchronized void registerChild(ServiceRegistryImplementor child) { childRegistries = new HashSet<>(); } if ( !childRegistries.add( child ) ) { - LOG.warnf( + log.warnf( "Child ServiceRegistry [%s] was already registered; this will end badly later...", child ); @@ -292,11 +292,11 @@ public synchronized void deRegisterChild(ServiceRegistryImplementor child) { childRegistries.remove( child ); if ( childRegistries.isEmpty() ) { if ( autoCloseRegistry ) { - LOG.trace( "Automatically destroying bootstrap registry after deregistration of every child ServiceRegistry" ); + log.trace( "Automatically destroying bootstrap registry after deregistration of every child ServiceRegistry" ); destroy(); } else { - LOG.trace( "Skipping destroying bootstrap registry after deregistration of every child ServiceRegistry" ); + log.trace( "Skipping destroying bootstrap registry after deregistration of every child ServiceRegistry" ); } } } diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/ByteBuddyState.java b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/ByteBuddyState.java index e266e393053b..54d984c2e9a1 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/ByteBuddyState.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/ByteBuddyState.java @@ -56,7 +56,7 @@ */ public final class ByteBuddyState { - private static final CoreMessageLogger LOG = messageLogger( ByteBuddyState.class ); + private static final CoreMessageLogger log = messageLogger( ByteBuddyState.class ); private static final MethodHandles.Lookup LOOKUP = MethodHandles.lookup(); @@ -278,7 +278,7 @@ private Unloaded make(TypePool typePool, DynamicType.Builder builder) { unloadedClass.saveIn( new File( System.getProperty( "java.io.tmpdir" ) + "/bytebuddy/" ) ); } catch (IOException e) { - LOG.warn( "Unable to save generated class %1$s", unloadedClass.getTypeDescription().getName(), e ); + log.warn( "Unable to save generated class %1$s", unloadedClass.getTypeDescription().getName(), e ); } } return unloadedClass; diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/BytecodeProviderImpl.java b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/BytecodeProviderImpl.java index b3e6cc0a2915..26b454d809c8 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/BytecodeProviderImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/BytecodeProviderImpl.java @@ -55,7 +55,8 @@ import org.checkerframework.checker.nullness.qual.Nullable; public class BytecodeProviderImpl implements BytecodeProvider { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( BytecodeProviderImpl.class ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( BytecodeProviderImpl.class ); private static final String INSTANTIATOR_PROXY_NAMING_SUFFIX = "$HibernateInstantiator"; private static final String OPTIMIZER_PROXY_NAMING_SUFFIX = "HibernateAccessOptimizer"; @@ -147,7 +148,7 @@ public ReflectionOptimizer getReflectionOptimizer( findAccessors( clazz, getterNames, setterNames, types, getters, setters ); } catch (InvalidPropertyAccessorException ex) { - LOG.unableToGenerateReflectionOptimizer( clazz.getName(), ex.getMessage() ); + log.unableToGenerateReflectionOptimizer( clazz.getName(), ex.getMessage() ); return null; } @@ -209,7 +210,7 @@ public ReflectionOptimizer getReflectionOptimizer( findAccessors( clazz, propertyAccessMap, getters, setters ); } catch (InvalidPropertyAccessorException ex) { - LOG.unableToGenerateReflectionOptimizer( clazz.getName(), ex.getMessage() ); + log.unableToGenerateReflectionOptimizer( clazz.getName(), ex.getMessage() ); return null; } diff --git a/hibernate-core/src/main/java/org/hibernate/cache/internal/CollectionCacheInvalidator.java b/hibernate-core/src/main/java/org/hibernate/cache/internal/CollectionCacheInvalidator.java index b08dba5fc91f..e62c230e377c 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/internal/CollectionCacheInvalidator.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/internal/CollectionCacheInvalidator.java @@ -42,7 +42,8 @@ */ public class CollectionCacheInvalidator implements Integrator, PostInsertEventListener, PostDeleteEventListener, PostUpdateEventListener { - private static final Logger LOG = Logger.getLogger( CollectionCacheInvalidator.class.getName() ); + + private static final Logger log = Logger.getLogger( CollectionCacheInvalidator.class.getName() ); /** * Exposed for use in testing @@ -103,7 +104,7 @@ private void evictCache(Object entity, EntityPersister persister, EventSource se throw new IllegalStateException( e ); } // don't let decaching influence other logic - LOG.error( "", e ); + log.error( "", e ); } } diff --git a/hibernate-core/src/main/java/org/hibernate/cache/internal/EnabledCaching.java b/hibernate-core/src/main/java/org/hibernate/cache/internal/EnabledCaching.java index 219882499943..60aae5380454 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/internal/EnabledCaching.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/internal/EnabledCaching.java @@ -49,7 +49,8 @@ * @author Gail Badner */ public class EnabledCaching implements CacheImplementor, DomainDataRegionBuildingContext { - private static final SecondLevelCacheLogger LOG = SecondLevelCacheLogger.L2CACHE_LOGGER; + + private static final SecondLevelCacheLogger log = SecondLevelCacheLogger.L2CACHE_LOGGER; private final SessionFactoryImplementor sessionFactory; private final RegionFactory regionFactory; @@ -252,7 +253,7 @@ public void evictEntityData(String entityName, Object identifier) { final var persister = getEntityDescriptor( entityName ); final var cacheAccess = persister.getCacheAccessStrategy(); if ( cacheAccess != null ) { - LOG.evictingEntityCache( infoString( persister, identifier, sessionFactory ) ); + log.evictingEntityCache( infoString( persister, identifier, sessionFactory ) ); final Object cacheKey = cacheAccess.generateCacheKey( identifier, persister, sessionFactory, null ); cacheAccess.evict( cacheKey ); @@ -299,7 +300,7 @@ private static EntityPersister rootEntityPersister(EntityPersister entityDescrip private void evictEntityData(NavigableRole navigableRole, EntityDataAccess cacheAccess) { if ( cacheAccess != null ) { - LOG.evictingEntityCacheByRole( navigableRole.getFullPath() ); + log.evictingEntityCacheByRole( navigableRole.getFullPath() ); cacheAccess.evictAll(); } } @@ -336,7 +337,7 @@ public void evictNaturalIdData() { private void evictNaturalIdData(NavigableRole rootEntityRole, NaturalIdDataAccess cacheAccess) { if ( cacheAccess != null ) { - LOG.evictingNaturalIdCache( rootEntityRole.getFullPath() ); + log.evictingNaturalIdCache( rootEntityRole.getFullPath() ); cacheAccess.evictAll(); } } @@ -365,7 +366,7 @@ public void evictCollectionData(String role, Object ownerIdentifier) { final var persister = getCollectionDescriptor( role ); final var cacheAccess = persister.getCacheAccessStrategy(); if ( cacheAccess != null ) { - LOG.evictingCollectionCache( collectionInfoString( persister, ownerIdentifier, sessionFactory ) ); + log.evictingCollectionCache( collectionInfoString( persister, ownerIdentifier, sessionFactory ) ); final Object cacheKey = cacheAccess.generateCacheKey( ownerIdentifier, persister, sessionFactory, null ); cacheAccess.evict( cacheKey ); @@ -384,7 +385,7 @@ private void evictCollectionData(CollectionPersister collectionDescriptor) { private void evictCollectionData(NavigableRole navigableRole, CollectionDataAccess cacheAccess) { if ( cacheAccess != null ) { - LOG.evictingCollectionCacheByRole( navigableRole.getFullPath() ); + log.evictingCollectionCacheByRole( navigableRole.getFullPath() ); cacheAccess.evictAll(); } } @@ -419,14 +420,14 @@ public void evictQueryRegion(String regionName) { private void evictQueryResultRegion(QueryResultsCache cache) { if ( cache != null ) { - LOG.evictingQueryCacheRegion( cache.getRegion().getName() ); + log.evictingQueryCacheRegion( cache.getRegion().getName() ); cache.clear(); } } @Override public void evictQueryRegions() { - LOG.evictingAllQueryRegions(); + log.evictingAllQueryRegions(); evictQueryResultRegion( defaultQueryResultsCache ); for ( QueryResultsCache cache : namedQueryResultsCacheMap.values() ) { evictQueryResultRegion( cache ); diff --git a/hibernate-core/src/main/java/org/hibernate/cache/internal/RegionFactoryInitiator.java b/hibernate-core/src/main/java/org/hibernate/cache/internal/RegionFactoryInitiator.java index 669db9a32630..89bfaaa2e422 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/internal/RegionFactoryInitiator.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/internal/RegionFactoryInitiator.java @@ -29,7 +29,8 @@ * @author Brett Meyer */ public class RegionFactoryInitiator implements StandardServiceInitiator { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( RegionFactoryInitiator.class ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( RegionFactoryInitiator.class ); /** * Singleton access @@ -45,10 +46,10 @@ public Class getServiceInitiated() { public RegionFactory initiateService(Map configurationValues, ServiceRegistryImplementor registry) { final var regionFactory = resolveRegionFactory( configurationValues, registry ); if ( regionFactory instanceof NoCachingRegionFactory ) { - LOG.noRegionFactory(); + log.noRegionFactory(); } else { - LOG.regionFactory( regionFactory.getClass().getTypeName() ); + log.regionFactory( regionFactory.getClass().getTypeName() ); } return regionFactory; } @@ -114,7 +115,7 @@ protected RegionFactory resolveRegionFactory(Map configurationVal return registeredFactory; } else { - LOG.debugf( + log.debugf( "Cannot default RegionFactory based on registered strategies as `%s` RegionFactory strategies were registered", implementors ); diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/Environment.java b/hibernate-core/src/main/java/org/hibernate/cfg/Environment.java index 7af51fc2874c..24c07276c898 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/Environment.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/Environment.java @@ -131,7 +131,8 @@ */ @Internal public final class Environment implements AvailableSettings { - private static final CoreMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, Environment.class.getName()); + + private static final CoreMessageLogger log = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, Environment.class.getName()); private static final Properties GLOBAL_PROPERTIES; @@ -144,19 +145,19 @@ public final class Environment implements AvailableSettings { try (var stream = getResourceAsStream("/hibernate.properties")) { try { GLOBAL_PROPERTIES.load(stream); - LOG.propertiesLoaded( maskOut( GLOBAL_PROPERTIES, + log.propertiesLoaded( maskOut( GLOBAL_PROPERTIES, PASS, JAKARTA_JDBC_PASSWORD, JPA_JDBC_PASSWORD ) ); } catch (Exception e) { - LOG.unableToLoadProperties(); + log.unableToLoadProperties(); } } catch (IOException ioe) { - LOG.unableToCloseStreamError( ioe ); + log.unableToCloseStreamError( ioe ); } } catch (HibernateException he) { - LOG.propertiesNotFound(); + log.propertiesNotFound(); } try { @@ -169,7 +170,7 @@ public final class Environment implements AvailableSettings { } } catch (SecurityException se) { - LOG.unableToCopySystemProperties(); + log.unableToCopySystemProperties(); } } diff --git a/hibernate-core/src/main/java/org/hibernate/collection/spi/AbstractPersistentCollection.java b/hibernate-core/src/main/java/org/hibernate/collection/spi/AbstractPersistentCollection.java index 55298d44334b..8a3dbe33fef6 100644 --- a/hibernate-core/src/main/java/org/hibernate/collection/spi/AbstractPersistentCollection.java +++ b/hibernate-core/src/main/java/org/hibernate/collection/spi/AbstractPersistentCollection.java @@ -56,7 +56,8 @@ * @author Gavin King */ public abstract class AbstractPersistentCollection implements Serializable, PersistentCollection { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( AbstractPersistentCollection.class ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( AbstractPersistentCollection.class ); private transient SharedSessionContractImplementor session; private boolean isTempSession = false; @@ -297,7 +298,7 @@ else if ( !session.isConnected() ) { tempSession.close(); } catch (Exception e) { - LOG.unableToCloseTemporarySession(); + log.unableToCloseTemporarySession(); } } else { @@ -705,7 +706,7 @@ public final boolean unsetSession(SharedSessionContractImplementor currentSessio if ( allowLoadOutsideTransaction && !initialized && session.getLoadQueryInfluencers().hasEnabledFilters() ) { - LOG.enabledFiltersWhenDetachFromSession( collectionInfoString( getRole(), getKey() ) ); + log.enabledFiltersWhenDetachFromSession( collectionInfoString( getRole(), getKey() ) ); } session = null; } @@ -713,7 +714,7 @@ public final boolean unsetSession(SharedSessionContractImplementor currentSessio } else { if ( session != null ) { - LOG.logCannotUnsetUnexpectedSessionInCollection( unexpectedSessionStateMessage( currentSession ) ); + log.logCannotUnsetUnexpectedSessionInCollection( unexpectedSessionStateMessage( currentSession ) ); } return false; } @@ -723,20 +724,20 @@ private void logDiscardedQueuedOperations() { try { if ( wasTransactionRolledBack() ) { // It was due to a rollback. - if ( LOG.isDebugEnabled()) { - LOG.queuedOperationWhenDetachFromSessionOnRollback( collectionInfoString( getRole(), getKey() ) ); + if ( log.isDebugEnabled()) { + log.queuedOperationWhenDetachFromSessionOnRollback( collectionInfoString( getRole(), getKey() ) ); } } else { // We don't know why the collection is being detached. // Just log the info. - LOG.queuedOperationWhenDetachFromSession( collectionInfoString( getRole(), getKey() ) ); + log.queuedOperationWhenDetachFromSession( collectionInfoString( getRole(), getKey() ) ); } } catch (Exception e) { // We don't know why the collection is being detached. // Just log the info. - LOG.queuedOperationWhenDetachFromSession( collectionInfoString( getRole(), getKey() ) ); + log.queuedOperationWhenDetachFromSession( collectionInfoString( getRole(), getKey() ) ); } } @@ -771,11 +772,11 @@ else if ( this.session != null ) { ); } else { - LOG.logUnexpectedSessionInCollectionNotConnected( message ); + log.logUnexpectedSessionInCollectionNotConnected( message ); } } if ( hasQueuedOperations() ) { - LOG.queuedOperationWhenAttachToSession( collectionInfoString( getRole(), getKey() ) ); + log.queuedOperationWhenAttachToSession( collectionInfoString( getRole(), getKey() ) ); } this.session = session; return true; @@ -807,7 +808,7 @@ private String unexpectedSessionStateMessage(SharedSessionContractImplementor se } } // only include the collection contents if debug logging - if ( LOG.isDebugEnabled() ) { + if ( log.isDebugEnabled() ) { final String collectionContents = wasInitialized() ? toString() : ""; message.append( "\nCollection contents: [" ).append( collectionContents ).append( "]" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentArrayHolder.java b/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentArrayHolder.java index c4f26c1e2edc..d46a51899a51 100644 --- a/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentArrayHolder.java +++ b/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentArrayHolder.java @@ -37,7 +37,8 @@ @Incubating @AllowReflection // We need the ability to create arrays of the same type as in the model. public class PersistentArrayHolder extends AbstractPersistentCollection { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( PersistentArrayHolder.class ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( PersistentArrayHolder.class ); protected Object array; @@ -79,7 +80,7 @@ public Serializable getSnapshot(CollectionPersister persister) throws HibernateE Array.set( result, i, persister.getElementType().deepCopy( elt, persister.getFactory() ) ); } catch (IllegalArgumentException iae) { - LOG.invalidArrayElementType( iae.getMessage() ); + log.invalidArrayElementType( iae.getMessage() ); throw new HibernateException( "Array element type error", iae ); } } diff --git a/hibernate-core/src/main/java/org/hibernate/context/internal/JTASessionContext.java b/hibernate-core/src/main/java/org/hibernate/context/internal/JTASessionContext.java index 46bb66f32432..c17c0c44f85a 100644 --- a/hibernate-core/src/main/java/org/hibernate/context/internal/JTASessionContext.java +++ b/hibernate-core/src/main/java/org/hibernate/context/internal/JTASessionContext.java @@ -4,7 +4,6 @@ */ package org.hibernate.context.internal; -import java.lang.invoke.MethodHandles; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import jakarta.transaction.Synchronization; @@ -18,10 +17,10 @@ import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.transaction.internal.jta.JtaStatusHelper; import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform; +import org.hibernate.internal.CoreLogging; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode; -import org.jboss.logging.Logger; /** * An implementation of {@link org.hibernate.context.spi.CurrentSessionContext} which scopes the notion @@ -44,11 +43,8 @@ * @author Steve Ebersole */ public class JTASessionContext extends AbstractCurrentSessionContext { - private static final CoreMessageLogger LOG = Logger.getMessageLogger( - MethodHandles.lookup(), - CoreMessageLogger.class, - JTASessionContext.class.getName() - ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( JTASessionContext.class ); private transient final Map currentSessionMap = new ConcurrentHashMap<>(); @@ -104,7 +100,7 @@ public Session currentSession() throws HibernateException { currentSession.close(); } catch ( Throwable e ) { - LOG.debug( "Unable to release generated current-session on failed synchronization registration", e ); + log.debug( "Unable to release generated current-session on failed synchronization registration", e ); } throw new HibernateException( "Unable to register cleanup Synchronization with TransactionManager" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/context/internal/ThreadLocalSessionContext.java b/hibernate-core/src/main/java/org/hibernate/context/internal/ThreadLocalSessionContext.java index 2392b76d6d24..a9f82349a299 100644 --- a/hibernate-core/src/main/java/org/hibernate/context/internal/ThreadLocalSessionContext.java +++ b/hibernate-core/src/main/java/org/hibernate/context/internal/ThreadLocalSessionContext.java @@ -9,7 +9,6 @@ import java.io.ObjectOutputStream; import java.io.Serial; import java.io.Serializable; -import java.lang.invoke.MethodHandles; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -29,12 +28,11 @@ import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.event.spi.EventSource; +import org.hibernate.internal.CoreLogging; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode; import org.hibernate.resource.transaction.spi.TransactionStatus; -import org.jboss.logging.Logger; - /** * A {@link org.hibernate.context.spi.CurrentSessionContext} impl which scopes the notion of current * session by the current thread of execution. Unlike the JTA counterpart, threads do not give us a nice @@ -59,11 +57,8 @@ * @author Sanne Grinovero */ public class ThreadLocalSessionContext extends AbstractCurrentSessionContext { - private static final CoreMessageLogger LOG = Logger.getMessageLogger( - MethodHandles.lookup(), - CoreMessageLogger.class, - ThreadLocalSessionContext.class.getName() - ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( ThreadLocalSessionContext.class ); private static final Class[] SESSION_PROXY_INTERFACES = new Class[] { Session.class, @@ -194,7 +189,7 @@ public static void bind(Session session) { private static void terminateOrphanedSession(Session orphan) { if ( orphan != null ) { - LOG.alreadySessionBound(); + log.alreadySessionBound(); try { final Transaction orphanTransaction = orphan.getTransaction(); if ( orphanTransaction != null && orphanTransaction.getStatus() == TransactionStatus.ACTIVE ) { @@ -202,7 +197,7 @@ private static void terminateOrphanedSession(Session orphan) { orphanTransaction.rollback(); } catch( Throwable t ) { - LOG.debug( "Unable to rollback transaction for orphaned session", t ); + log.debug( "Unable to rollback transaction for orphaned session", t ); } } } @@ -211,7 +206,7 @@ private static void terminateOrphanedSession(Session orphan) { orphan.close(); } catch( Throwable t ) { - LOG.debug( "Unable to close orphaned session", t ); + log.debug( "Unable to close orphaned session", t ); } } @@ -310,7 +305,7 @@ else if ( "getStatistics".equals( methodName ) || "isOpen".equals( methodName ) || "getListeners".equals( methodName ) ) { // allow these to go through the real session no matter what - LOG.tracef( "Allowing invocation [%s] to proceed to real session", methodName ); + log.tracef( "Allowing invocation [%s] to proceed to real session", methodName ); } else if ( !realSession.isOpen() ) { // essentially, if the real session is closed allow any @@ -318,7 +313,7 @@ else if ( !realSession.isOpen() ) { // will complain by throwing an appropriate exception; // NOTE that allowing close() above has the same basic effect, // but we capture that there simply to doAfterTransactionCompletion the unbind... - LOG.tracef( "Allowing invocation [%s] to proceed to real (closed) session", methodName ); + log.tracef( "Allowing invocation [%s] to proceed to real (closed) session", methodName ); } else if ( realSession.getTransaction().getStatus() != TransactionStatus.ACTIVE ) { // limit the methods available if no transaction is active @@ -331,14 +326,14 @@ else if ( realSession.getTransaction().getStatus() != TransactionStatus.ACTIVE ) || "getSessionFactory".equals( methodName ) || "getJdbcCoordinator".equals( methodName ) || "getTenantIdentifier".equals( methodName ) ) { - LOG.tracef( "Allowing invocation [%s] to proceed to real (non-transacted) session", methodName ); + log.tracef( "Allowing invocation [%s] to proceed to real (non-transacted) session", methodName ); } else { throw new HibernateException( "Calling method '" + methodName + "' is not valid without an active transaction (Current status: " + realSession.getTransaction().getStatus() + ")" ); } } - LOG.tracef( "Allowing proxy invocation [%s] to proceed to real session", methodName ); + log.tracef( "Allowing proxy invocation [%s] to proceed to real session", methodName ); return method.invoke( realSession, args ); } catch ( InvocationTargetException e ) { diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java index 56fd7770477d..981059ae8019 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java @@ -80,6 +80,7 @@ import org.hibernate.exception.spi.SQLExceptionConversionDelegate; import org.hibernate.exception.spi.SQLExceptionConverter; import org.hibernate.exception.spi.ViolatedConstraintNameExtractor; +import org.hibernate.internal.CoreLogging; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.util.collections.ArrayHelper; import org.hibernate.loader.ast.spi.MultiKeyLoadSizingStrategy; @@ -173,13 +174,11 @@ import org.hibernate.type.descriptor.sql.internal.DdlTypeImpl; import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry; import org.hibernate.type.spi.TypeConfiguration; -import org.jboss.logging.Logger; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.io.Reader; -import java.lang.invoke.MethodHandles; import java.sql.Blob; import java.sql.CallableStatement; import java.sql.Clob; @@ -339,7 +338,7 @@ public abstract class Dialect implements ConversionContext, TypeContributor, Fun "^\\s*(select\\b.+?\\bfrom\\b.+?)(\\b(?:natural )?(?:left |right |full )?(?:inner |outer |cross )?join.+?\\b)?(\\bwhere\\b.+?)$", Pattern.CASE_INSENSITIVE); - private static final CoreMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, Dialect.class.getName() ); + private static final CoreMessageLogger log = CoreLogging.messageLogger( Dialect.class ); //needed for converting precision from decimal to binary digits protected static final double LOG_BASE2OF10 = log(10)/log(2); @@ -381,7 +380,7 @@ protected void checkVersion() { final DatabaseVersion version = getVersion(); final DatabaseVersion minimumVersion = getMinimumSupportedVersion(); if ( version != null && version.isBefore( minimumVersion.getMajor(), minimumVersion.getMinor(), minimumVersion.getMicro() ) ) { - LOG.unsupportedDatabaseVersion( + log.unsupportedDatabaseVersion( getClass().getName(), version.getMajor() + "." + version.getMinor() + "." + version.getMicro(), minimumVersion.getMajor() + "." + minimumVersion.getMinor() + "." + minimumVersion.getMicro() diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/HANAServerConfiguration.java b/hibernate-core/src/main/java/org/hibernate/dialect/HANAServerConfiguration.java index 16afa965c17d..723387725530 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/HANAServerConfiguration.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/HANAServerConfiguration.java @@ -25,7 +25,8 @@ */ public class HANAServerConfiguration { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( HANAServerConfiguration.class ); + private static final CoreMessageLogger log = CoreLogging.messageLogger( HANAServerConfiguration.class ); + private static final Pattern CLOUD_VERSION_PATTERN = Pattern.compile( "\\(fa/CE(\\d+)\\.(\\d+)\\)" ); public static final int MAX_LOB_PREFETCH_SIZE_DEFAULT_VALUE = 1024; @@ -60,7 +61,7 @@ public static HANAServerConfiguration fromDialectResolutionInfo(DialectResolutio } catch (SQLException e) { // Ignore - LOG.debug( + log.debug( "An error occurred while trying to determine the database version.", e ); } @@ -77,7 +78,7 @@ public static HANAServerConfiguration fromDialectResolutionInfo(DialectResolutio } catch (SQLException e) { // Ignore - LOG.debug( + log.debug( "An error occurred while trying to determine the value of the HANA parameter indexserver.ini / session / max_lob_prefetch_size.", e ); } @@ -115,7 +116,7 @@ public static DatabaseVersion determineDatabaseVersion(DialectResolutionInfo inf } catch (SQLException e) { // Ignore - LOG.debug( "An error occurred while trying to determine the HANA Cloud version.", e ); + log.debug( "An error occurred while trying to determine the HANA Cloud version.", e ); } } return databaseVersion == null diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/OracleOsonArrayJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/OracleOsonArrayJdbcType.java index a30e1ae7f7ff..8f0a88bc6d53 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/OracleOsonArrayJdbcType.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/OracleOsonArrayJdbcType.java @@ -48,7 +48,7 @@ */ public class OracleOsonArrayJdbcType extends OracleJsonArrayJdbcType { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( OracleOsonArrayJdbcType.class ); + private static final CoreMessageLogger log = CoreLogging.messageLogger( OracleOsonArrayJdbcType.class ); public OracleOsonArrayJdbcType(JdbcType elementJdbcType) { super(elementJdbcType); @@ -200,7 +200,7 @@ protected X doExtract(ResultSet rs, int paramIndex, WrapperOptions options) thro // This may happen if we are fetching data from an existing schema // that uses BLOB for JSON column In that case we assume bytes are // UTF-8 bytes (i.e not OSON) and we fall back to previous String-based implementation - LOG.invalidJSONColumnType( OracleType.CLOB.getName(), OracleType.JSON.getName() ); + log.invalidJSONColumnType( OracleType.CLOB.getName(), OracleType.JSON.getName() ); return fromString( rs.getBytes( paramIndex ), options ); } else { @@ -225,7 +225,7 @@ protected X doExtract(CallableStatement statement, int index, WrapperOptions opt // This may happen if we are fetching data from an existing schema // that uses BLOB for JSON column In that case we assume bytes are // UTF-8 bytes (i.e not OSON) and we fall back to previous String-based implementation - LOG.invalidJSONColumnType( OracleType.CLOB.getName(), OracleType.JSON.getName() ); + log.invalidJSONColumnType( OracleType.CLOB.getName(), OracleType.JSON.getName() ); return fromString( statement.getBytes( index ), options ); } else { @@ -251,7 +251,7 @@ protected X doExtract(CallableStatement statement, String name, WrapperOptions o // This may happen if we are fetching data from an existing schema // that uses BLOB for JSON column In that case we assume bytes are // UTF-8 bytes (i.e not OSON) and we fall back to previous String-based implementation - LOG.invalidJSONColumnType( OracleType.CLOB.getName(), OracleType.JSON.getName() ); + log.invalidJSONColumnType( OracleType.CLOB.getName(), OracleType.JSON.getName() ); return fromString( statement.getBytes( name ), options ); } else { diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/OracleOsonJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/OracleOsonJdbcType.java index 01b37382297f..39ca5771bbc4 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/OracleOsonJdbcType.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/OracleOsonJdbcType.java @@ -45,7 +45,7 @@ public class OracleOsonJdbcType extends OracleJsonJdbcType { public static final OracleOsonJdbcType INSTANCE = new OracleOsonJdbcType( null ); - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( OracleOsonJdbcType.class ); + private static final CoreMessageLogger log = CoreLogging.messageLogger( OracleOsonJdbcType.class ); static final OracleJsonFactory OSON_JSON_FACTORY = new OracleJsonFactory(); @@ -248,7 +248,7 @@ protected X doExtract(ResultSet rs, int paramIndex, WrapperOptions options) thro // This may happen if we are fetching data from an existing schema // that uses BLOB for JSON column. In that case we assume bytes are // UTF-8 bytes (i.e not OSON) and we fall back to previous String-based implementation - LOG.invalidJSONColumnType( OracleType.BLOB.getName(), OracleType.JSON.getName() ); + log.invalidJSONColumnType( OracleType.BLOB.getName(), OracleType.JSON.getName() ); return fromString( getBytesFromResultSetByIndex( rs, paramIndex ), options ); } else { @@ -273,7 +273,7 @@ protected X doExtract(CallableStatement statement, int index, WrapperOptions opt // This may happen if we are fetching data from an existing schema // that uses BLOB for JSON column In that case we assume bytes are // UTF-8 bytes (i.e not OSON) and we fall back to previous String-based implementation - LOG.invalidJSONColumnType( OracleType.CLOB.getName(), OracleType.JSON.getName() ); + log.invalidJSONColumnType( OracleType.CLOB.getName(), OracleType.JSON.getName() ); return fromString( getBytesFromStatementByIndex( statement, index ), options ); } else { @@ -299,7 +299,7 @@ protected X doExtract(CallableStatement statement, String name, WrapperOptions o // This may happen if we are fetching data from an existing schema // that uses BLOB for JSON column In that case we assume bytes are // UTF-8 bytes (i.e not OSON) and we fall back to previous String-based implementation - LOG.invalidJSONColumnType( OracleType.CLOB.getName(), OracleType.JSON.getName() ); + log.invalidJSONColumnType( OracleType.CLOB.getName(), OracleType.JSON.getName() ); return fromString( getBytesFromStatementByName( statement, name ), options ); } else { diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayContainsFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayContainsFunction.java index 5b2964e0ead8..071909a09684 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayContainsFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayContainsFunction.java @@ -20,7 +20,7 @@ */ public abstract class AbstractArrayContainsFunction extends AbstractSqmSelfRenderingFunctionDescriptor { - protected static final DeprecationLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), DeprecationLogger.class, AbstractArrayContainsFunction.class.getName() ); + protected static final DeprecationLogger log = Logger.getMessageLogger( MethodHandles.lookup(), DeprecationLogger.class, AbstractArrayContainsFunction.class.getName() ); protected final boolean nullable; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayContainsOperatorFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayContainsOperatorFunction.java index f94138de3b64..c002aa66d20b 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayContainsOperatorFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayContainsOperatorFunction.java @@ -37,7 +37,7 @@ public void render( final JdbcMappingContainer needleTypeContainer = needleExpression.getExpressionType(); final JdbcMapping needleType = needleTypeContainer == null ? null : needleTypeContainer.getSingleJdbcMapping(); if ( needleType == null || needleType instanceof BasicPluralType ) { - LOG.deprecatedArrayContainsWithArray(); + log.deprecatedArrayContainsWithArray(); if ( nullable ) { super.render( sqlAppender, sqlAstArguments, returnType, walker ); } diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayContainsUnnestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayContainsUnnestFunction.java index 7b741ada8be5..d28ba96550b5 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayContainsUnnestFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayContainsUnnestFunction.java @@ -37,7 +37,7 @@ public void render( final JdbcMappingContainer needleTypeContainer = needleExpression.getExpressionType(); final JdbcMapping needleType = needleTypeContainer == null ? null : needleTypeContainer.getSingleJdbcMapping(); if ( needleType == null || needleType instanceof BasicPluralType ) { - LOG.deprecatedArrayContainsWithArray(); + log.deprecatedArrayContainsWithArray(); sqlAppender.append( '(' ); if ( ArrayHelper.isNullable( haystackExpression ) ) { walker.render( haystackExpression, SqlAstNodeRenderingMode.NO_PLAIN_PARAMETER ); diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayContainsFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayContainsFunction.java index 123778d0c316..aafd743d003e 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayContainsFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayContainsFunction.java @@ -42,7 +42,7 @@ public void render( final JdbcMappingContainer needleTypeContainer = needleExpression.getExpressionType(); final JdbcMapping needleType = needleTypeContainer == null ? null : needleTypeContainer.getSingleJdbcMapping(); if ( needleType == null || needleType instanceof BasicPluralType ) { - LOG.deprecatedArrayContainsWithArray(); + log.deprecatedArrayContainsWithArray(); sqlAppender.append( '(' ); if ( ArrayHelper.isNullable( haystackExpression ) ) { haystackExpression.accept( walker ); diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayContainsFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayContainsFunction.java index 1be81cd99e95..e6ffa6a13e2e 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayContainsFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayContainsFunction.java @@ -33,7 +33,7 @@ public void render( final JdbcMappingContainer needleTypeContainer = needleExpression.getExpressionType(); final JdbcMapping needleType = needleTypeContainer == null ? null : needleTypeContainer.getSingleJdbcMapping(); if ( needleType == null || needleType instanceof BasicPluralType ) { - LOG.deprecatedArrayContainsWithArray(); + log.deprecatedArrayContainsWithArray(); if ( nullable ) { final String arrayTypeName = DdlTypeHelper.getTypeName( haystackExpression.getExpressionType(), diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticReadUpdateLockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticReadUpdateLockingStrategy.java index 10b2fc4d9df8..54295ca5f197 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticReadUpdateLockingStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticReadUpdateLockingStrategy.java @@ -4,7 +4,6 @@ */ package org.hibernate.dialect.lock; -import java.lang.invoke.MethodHandles; import java.sql.PreparedStatement; import java.sql.SQLException; @@ -15,13 +14,13 @@ import org.hibernate.engine.jdbc.spi.JdbcCoordinator; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.internal.CoreLogging; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.pretty.MessageHelper; import org.hibernate.sql.Update; import org.hibernate.stat.spi.StatisticsImplementor; -import org.jboss.logging.Logger; /** * A pessimistic locking strategy where a lock is obtained via @@ -36,11 +35,8 @@ * @since 3.5 */ public class PessimisticReadUpdateLockingStrategy implements LockingStrategy { - private static final CoreMessageLogger LOG = Logger.getMessageLogger( - MethodHandles.lookup(), - CoreMessageLogger.class, - PessimisticReadUpdateLockingStrategy.class.getName() - ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( PessimisticReadUpdateLockingStrategy.class ); private final EntityPersister lockable; private final LockMode lockMode; @@ -60,7 +56,7 @@ public PessimisticReadUpdateLockingStrategy(EntityPersister lockable, LockMode l throw new HibernateException( "[" + lockMode + "] not valid for update statement" ); } if ( !lockable.isVersioned() ) { - LOG.writeLocksNotSupported( lockable.getEntityName() ); + log.writeLocksNotSupported( lockable.getEntityName() ); this.sql = null; } else { diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticWriteUpdateLockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticWriteUpdateLockingStrategy.java index 67e96c0b62bb..91c03008603b 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticWriteUpdateLockingStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticWriteUpdateLockingStrategy.java @@ -4,7 +4,6 @@ */ package org.hibernate.dialect.lock; -import java.lang.invoke.MethodHandles; import java.sql.PreparedStatement; import java.sql.SQLException; @@ -15,13 +14,13 @@ import org.hibernate.engine.jdbc.spi.JdbcCoordinator; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.internal.CoreLogging; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.pretty.MessageHelper; import org.hibernate.sql.Update; import org.hibernate.stat.spi.StatisticsImplementor; -import org.jboss.logging.Logger; /** * A pessimistic locking strategy where a lock is obtained via @@ -36,11 +35,8 @@ * @since 3.5 */ public class PessimisticWriteUpdateLockingStrategy implements LockingStrategy { - private static final CoreMessageLogger LOG = Logger.getMessageLogger( - MethodHandles.lookup(), - CoreMessageLogger.class, - PessimisticWriteUpdateLockingStrategy.class.getName() - ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( PessimisticWriteUpdateLockingStrategy.class ); private final EntityPersister lockable; private final LockMode lockMode; @@ -59,7 +55,7 @@ public PessimisticWriteUpdateLockingStrategy(EntityPersister lockable, LockMode throw new HibernateException( "[" + lockMode + "] not valid for update statement" ); } if ( !lockable.isVersioned() ) { - LOG.writeLocksNotSupported( lockable.getEntityName() ); + log.writeLocksNotSupported( lockable.getEntityName() ); this.sql = null; } else { diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/UpdateLockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/UpdateLockingStrategy.java index 052f9dc06245..9c4c93982b9d 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/UpdateLockingStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/UpdateLockingStrategy.java @@ -4,7 +4,6 @@ */ package org.hibernate.dialect.lock; -import java.lang.invoke.MethodHandles; import java.sql.PreparedStatement; import java.sql.SQLException; @@ -15,6 +14,7 @@ import org.hibernate.engine.jdbc.spi.JdbcCoordinator; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.internal.CoreLogging; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.pretty.MessageHelper; @@ -23,7 +23,6 @@ import org.hibernate.type.BasicType; import org.hibernate.type.Type; -import org.jboss.logging.Logger; /** * A locking strategy where a lock is obtained via an update statement. @@ -34,11 +33,8 @@ * @since 3.2 */ public class UpdateLockingStrategy implements LockingStrategy { - private static final CoreMessageLogger LOG = Logger.getMessageLogger( - MethodHandles.lookup(), - CoreMessageLogger.class, - UpdateLockingStrategy.class.getName() - ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( UpdateLockingStrategy.class ); private final EntityPersister lockable; private final LockMode lockMode; @@ -58,7 +54,7 @@ public UpdateLockingStrategy(EntityPersister lockable, LockMode lockMode) { throw new HibernateException( "[" + lockMode + "] not valid for update statement" ); } if ( !lockable.isVersioned() ) { - LOG.writeLocksNotSupported( lockable.getEntityName() ); + log.writeLocksNotSupported( lockable.getEntityName() ); this.sql = null; } else { diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/temptable/TemporaryTable.java b/hibernate-core/src/main/java/org/hibernate/dialect/temptable/TemporaryTable.java index dc1911c198f3..5155697dd99c 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/temptable/TemporaryTable.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/temptable/TemporaryTable.java @@ -63,7 +63,7 @@ public class TemporaryTable implements Exportable, Contributable { public static final String ENTITY_TABLE_IDENTITY_COLUMN = "HTE_IDENTITY"; public static final String ENTITY_ROW_NUMBER_COLUMN = "rn_"; - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( TemporaryTable.class ); + private static final CoreMessageLogger log = CoreLogging.messageLogger( TemporaryTable.class ); private final String contributor; private final String qualifiedTableName; @@ -388,7 +388,7 @@ else if ( dialect.getIdentityColumnSupport().supportsIdentityColumns() ) { .getIdentityColumnString( integerBasicType.getJdbcType().getDdlTypeCode() ); } else { - LOG.multiTableInsertNotAvailable( persistentClass.getEntityName() ); + log.multiTableInsertNotAvailable( persistentClass.getEntityName() ); rowNumberType = typeConfiguration.getDdlTypeRegistry().getTypeName( integerBasicType.getJdbcType().getDdlTypeCode(), dialect.getSizeStrategy().resolveSize( diff --git a/hibernate-core/src/main/java/org/hibernate/engine/config/internal/ConfigurationServiceImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/config/internal/ConfigurationServiceImpl.java index 64ebe71be3c1..07a398ea93d5 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/config/internal/ConfigurationServiceImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/config/internal/ConfigurationServiceImpl.java @@ -4,18 +4,17 @@ */ package org.hibernate.engine.config.internal; -import java.lang.invoke.MethodHandles; import java.util.Collections; import java.util.Map; import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import org.hibernate.boot.registry.classloading.spi.ClassLoadingException; import org.hibernate.engine.config.spi.ConfigurationService; +import org.hibernate.internal.CoreLogging; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.service.spi.ServiceRegistryAwareService; import org.hibernate.service.spi.ServiceRegistryImplementor; -import org.jboss.logging.Logger; import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.checker.nullness.qual.PolyNull; @@ -26,11 +25,8 @@ * @author Steve Ebersole */ public class ConfigurationServiceImpl implements ConfigurationService, ServiceRegistryAwareService { - private static final CoreMessageLogger LOG = Logger.getMessageLogger( - MethodHandles.lookup(), - CoreMessageLogger.class, - ConfigurationServiceImpl.class.getName() - ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( ConfigurationServiceImpl.class ); private final Map settings; private ServiceRegistryImplementor serviceRegistry; @@ -96,7 +92,7 @@ public void injectServices(ServiceRegistryImplementor serviceRegistry) { .classForName( candidate.toString() ); } catch ( ClassLoadingException e ) { - LOG.debugf( "Unable to locate %s implementation class %s", expected.getName(), candidate.toString() ); + log.debugf( "Unable to locate %s implementation class %s", expected.getName(), candidate.toString() ); target = null; } } @@ -105,7 +101,7 @@ public void injectServices(ServiceRegistryImplementor serviceRegistry) { return target.newInstance(); } catch ( Exception e ) { - LOG.debugf( + log.debugf( "Unable to instantiate %s class %s", expected.getName(), target.getName() ); diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/Cascade.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/Cascade.java index 6d6025bf86d3..db09f4d82bb2 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/internal/Cascade.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/Cascade.java @@ -46,7 +46,8 @@ * @see CascadingAction */ public final class Cascade { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( Cascade.class ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( Cascade.class ); private Cascade() { // NOP @@ -82,9 +83,9 @@ public static void cascade( final Object parent, final T anything) throws HibernateException { if ( action.anythingToCascade( persister ) ) { // performance opt - final boolean traceEnabled = LOG.isTraceEnabled(); + final boolean traceEnabled = log.isTraceEnabled(); if ( traceEnabled ) { - LOG.tracev( "Processing cascade {0} for: {1}", action, persister.getEntityName() ); + log.tracev( "Processing cascade {0} for: {1}", action, persister.getEntityName() ); } final var bytecodeEnhancement = persister.getBytecodeEnhancementMetadata(); final EntityEntry entry; @@ -194,7 +195,7 @@ && isLogicalOneToOne( type ) ) { } if ( traceEnabled ) { - LOG.tracev( "Done processing cascade {0} for: {1}", action, persister.getEntityName() ); + log.tracev( "Done processing cascade {0} for: {1}", action, persister.getEntityName() ); } } } @@ -346,8 +347,8 @@ private static void cascadeLogicalOneToOneOrphanRemoval( if ( valueEntry != null ) { final EntityPersister persister = valueEntry.getPersister(); final String entityName = persister.getEntityName(); - if ( LOG.isTraceEnabled() ) { - LOG.tracev( + if ( log.isTraceEnabled() ) { + log.tracev( "Deleting orphaned entity instance: {0}", infoString( entityName, persister.getIdentifier( loadedValue, eventSource ) ) ); @@ -576,9 +577,9 @@ private static void cascadeCollectionElements( && child != CollectionType.UNFETCHED_COLLECTION; if ( reallyDoCascade ) { - final boolean traceEnabled = LOG.isTraceEnabled(); + final boolean traceEnabled = log.isTraceEnabled(); if ( traceEnabled ) { - LOG.tracev( "Cascade {0} for collection: {1}", action, collectionType.getRole() ); + log.tracev( "Cascade {0} for collection: {1}", action, collectionType.getRole() ); } final Iterator iterator = action.getCascadableChildrenIterator( eventSource, collectionType, child ); @@ -601,7 +602,7 @@ private static void cascadeCollectionElements( } if ( traceEnabled ) { - LOG.tracev( "Done cascade {0} for collection: {1}", action, collectionType.getRole() ); + log.tracev( "Done cascade {0} for collection: {1}", action, collectionType.getRole() ); } } @@ -620,9 +621,9 @@ private static void cascadeCollectionElements( && !persistentCollection.isNewlyInstantiated(); if ( deleteOrphans ) { - final boolean traceEnabled = LOG.isTraceEnabled(); + final boolean traceEnabled = log.isTraceEnabled(); if ( traceEnabled ) { - LOG.tracev( "Deleting orphans for collection: {0}", collectionType.getRole() ); + log.tracev( "Deleting orphans for collection: {0}", collectionType.getRole() ); } // we can do the cast since orphan-delete does not apply to: // 1. newly instantiated collections @@ -631,7 +632,7 @@ private static void cascadeCollectionElements( deleteOrphans( eventSource, elementEntityName, persistentCollection ); if ( traceEnabled ) { - LOG.tracev( "Done deleting orphans for collection: {0}", collectionType.getRole() ); + log.tracev( "Done deleting orphans for collection: {0}", collectionType.getRole() ); } } } @@ -652,7 +653,7 @@ private static void deleteOrphans(EventSource eventSource, String entityName, Pe for ( Object orphan : orphans ) { if ( orphan != null ) { - LOG.tracev( "Deleting orphaned entity instance: {0}", entityName ); + log.tracev( "Deleting orphaned entity instance: {0}", entityName ); eventSource.delete( entityName, orphan, false, DeleteContext.create() ); } } diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/Collections.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/Collections.java index 4e98e64a2835..c7bce9430765 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/internal/Collections.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/Collections.java @@ -9,7 +9,6 @@ import org.hibernate.action.internal.DelayedPostInsertIdentifier; import org.hibernate.collection.spi.PersistentCollection; import org.hibernate.engine.spi.CollectionEntry; -import org.hibernate.engine.spi.EntityEntry; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.event.spi.EventSource; @@ -26,45 +25,45 @@ * @author Gavin King */ public final class Collections { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( Collections.class ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( Collections.class ); /** * record the fact that this collection was dereferenced * - * @param coll The collection to be updated by un-reachability. + * @param collection The collection to be updated by unreachability. * @param session The session */ - public static void processUnreachableCollection(PersistentCollection coll, SessionImplementor session) { - if ( coll.getOwner() == null ) { - processNeverReferencedCollection( coll, session ); + public static void processUnreachableCollection(PersistentCollection collection, SessionImplementor session) { + if ( collection.getOwner() == null ) { + processNeverReferencedCollection( collection, session ); } else { - processDereferencedCollection( coll, session ); + processDereferencedCollection( collection, session ); } } - private static void processDereferencedCollection(PersistentCollection coll, SessionImplementor session) { + private static void processDereferencedCollection(PersistentCollection collection, SessionImplementor session) { final var persistenceContext = session.getPersistenceContextInternal(); - final var entry = persistenceContext.getCollectionEntry( coll ); + final var entry = persistenceContext.getCollectionEntry( collection ); final var loadedPersister = entry.getLoadedPersister(); - if ( loadedPersister != null && LOG.isTraceEnabled() ) { - LOG.trace("Collection dereferenced: " - + collectionInfoString( loadedPersister, coll, entry.getLoadedKey(), session ) ); + if ( loadedPersister != null && log.isTraceEnabled() ) { + log.trace( "Collection dereferenced: " + + collectionInfoString( loadedPersister, collection, entry.getLoadedKey(), session ) ); } // do a check - final boolean hasOrphanDelete = loadedPersister != null && loadedPersister.hasOrphanDelete(); - if ( hasOrphanDelete ) { - final Object ownerId = getOwnerId( coll, session, loadedPersister ); + if ( loadedPersister != null && loadedPersister.hasOrphanDelete() ) { + final Object ownerId = getOwnerId( collection, session, loadedPersister ); final var key = session.generateEntityKey( ownerId, loadedPersister.getOwnerEntityPersister() ); final Object owner = persistenceContext.getEntity( key ); if ( owner == null ) { throw new AssertionFailure( "collection owner not associated with session: " + loadedPersister.getRole() ); } - final EntityEntry e = persistenceContext.getEntry( owner ); + final var entityEntry = persistenceContext.getEntry( owner ); //only collections belonging to deleted entities are allowed to be dereferenced in the case of orphan delete - if ( e != null && !e.getStatus().isDeletedOrGone() ) { + if ( entityEntry != null && !entityEntry.getStatus().isDeletedOrGone() ) { throw new HibernateException( "A collection with orphan deletion was no longer referenced by the owning entity instance: " + loadedPersister.getRole() @@ -75,27 +74,27 @@ private static void processDereferencedCollection(PersistentCollection coll, // do the work entry.setCurrentPersister( null ); entry.setCurrentKey( null ); - prepareCollectionForUpdate( coll, entry, session.getFactory() ); + prepareCollectionForUpdate( collection, entry, session.getFactory() ); } private static Object getOwnerId( - PersistentCollection coll, + PersistentCollection collection, SessionImplementor session, CollectionPersister loadedPersister) { - + final Object owner = collection.getOwner(); Object ownerId = loadedPersister.getOwnerEntityPersister() - .getIdentifier( coll.getOwner(), session ); + .getIdentifier( owner, session ); if ( ownerId == null ) { // the owning entity may have been deleted and its identifier unset due to - // identifier-rollback; in which case, try to look up its identifier from + // identifier rollback; in which case, try to look up its identifier from // the persistence context if ( session.getFactory().getSessionFactoryOptions() .isIdentifierRollbackEnabled() ) { final var ownerEntry = session.getPersistenceContextInternal() - .getEntry( coll.getOwner() ); + .getEntry( owner ); if ( ownerEntry != null ) { ownerId = ownerEntry.getId(); } @@ -107,22 +106,22 @@ private static Object getOwnerId( return ownerId; } - private static void processNeverReferencedCollection(PersistentCollection coll, SessionImplementor session) + private static void processNeverReferencedCollection(PersistentCollection collection, SessionImplementor session) throws HibernateException { final var entry = session.getPersistenceContextInternal() - .getCollectionEntry( coll ); + .getCollectionEntry( collection ); + final var loadedPersister = entry.getLoadedPersister(); + final Object loadedKey = entry.getLoadedKey(); - if ( LOG.isTraceEnabled() ) { - LOG.trace( "Found collection with unloaded owner: " + - collectionInfoString( entry.getLoadedPersister(), coll, entry.getLoadedKey(), session ) ); + if ( log.isTraceEnabled() ) { + log.trace( "Found collection with unloaded owner: " + + collectionInfoString( loadedPersister, collection, loadedKey, session ) ); } - entry.setCurrentPersister( entry.getLoadedPersister() ); - entry.setCurrentKey( entry.getLoadedKey() ); - - prepareCollectionForUpdate( coll, entry, session.getFactory() ); - + entry.setCurrentPersister( loadedPersister ); + entry.setCurrentKey( loadedKey ); + prepareCollectionForUpdate( collection, entry, session.getFactory() ); } /** @@ -139,11 +138,11 @@ public static void processReachableCollection( Object entity, SessionImplementor session) { collection.setOwner( entity ); - final var entry = + final var collectionEntry = session.getPersistenceContextInternal() .getCollectionEntry( collection ); - if ( entry == null ) { + if ( collectionEntry == null ) { // refer to comment in StatefulPersistenceContext.addCollection() throw new HibernateException( "Found two representations of same collection: " + type.getRole() ); } @@ -153,73 +152,78 @@ public static void processReachableCollection( factory.getMappingMetamodel() .getCollectionDescriptor( type.getRole() ); - entry.setCurrentPersister( persister ); + collectionEntry.setCurrentPersister( persister ); //TODO: better to pass the id in as an argument? - entry.setCurrentKey( type.getKeyOfOwner( entity, session ) ); + collectionEntry.setCurrentKey( type.getKeyOfOwner( entity, session ) ); final boolean isBytecodeEnhanced = persister.getOwnerEntityPersister() .getBytecodeEnhancementMetadata() .isEnhancedForLazyLoading(); if ( isBytecodeEnhanced && !collection.wasInitialized() ) { - // the class of the collection owner is enhanced for lazy loading and we found an un-initialized PersistentCollection - // - skip it - if ( LOG.isTraceEnabled() ) { - LOG.trace( "Skipping uninitialized bytecode-lazy collection: " - + collectionInfoString( persister, collection, entry.getCurrentKey(), session ) ); + // the class of the collection owner is enhanced for lazy loading, + // and we found an un-initialized PersistentCollection, so skip it + if ( log.isTraceEnabled() ) { + log.trace( "Skipping uninitialized bytecode-lazy collection: " + + collectionInfoString( persister, collection, collectionEntry.getCurrentKey(), session ) ); } - entry.setReached( true ); - entry.setProcessed( true ); - return; + collectionEntry.setReached( true ); + collectionEntry.setProcessed( true ); } - // The CollectionEntry.isReached() stuff is just to detect any silly users // who set up circular or shared references between/to collections. - if ( entry.isReached() ) { + else if ( collectionEntry.isReached() ) { // We've been here before throw new HibernateException( "Found shared references to a collection: " + type.getRole() ); } + else { + collectionEntry.setReached( true ); + logReachedCollection( collection, session, persister, collectionEntry ); + prepareCollectionForUpdate( collection, collectionEntry, factory ); + } + } - entry.setReached( true ); - - if ( LOG.isTraceEnabled() ) { + private static void logReachedCollection( + PersistentCollection collection, + SessionImplementor session, + CollectionPersister persister, + CollectionEntry collectionEntry) { + if ( log.isTraceEnabled() ) { if ( collection.wasInitialized() ) { - LOG.tracef( + log.tracef( "Collection found: %s, was: %s (initialized)", collectionInfoString( persister, collection, - entry.getCurrentKey(), + collectionEntry.getCurrentKey(), session ), collectionInfoString( - entry.getLoadedPersister(), + collectionEntry.getLoadedPersister(), collection, - entry.getLoadedKey(), + collectionEntry.getLoadedKey(), session ) ); } else { - LOG.tracef( + log.tracef( "Collection found: %s, was: %s (uninitialized)", collectionInfoString( persister, collection, - entry.getCurrentKey(), + collectionEntry.getCurrentKey(), session ), collectionInfoString( - entry.getLoadedPersister(), + collectionEntry.getLoadedPersister(), collection, - entry.getLoadedKey(), + collectionEntry.getLoadedKey(), session ) ); } } - - prepareCollectionForUpdate( collection, entry, factory ); } /** @@ -229,23 +233,22 @@ public static void processReachableCollection( */ private static void prepareCollectionForUpdate( PersistentCollection collection, - CollectionEntry entry, + CollectionEntry collectionEntry, SessionFactoryImplementor factory) { - if ( entry.isProcessed() ) { + if ( collectionEntry.isProcessed() ) { throw new AssertionFailure( "collection was processed twice by flush()" ); } - entry.setProcessed( true ); + collectionEntry.setProcessed( true ); - final var loadedPersister = entry.getLoadedPersister(); - final var currentPersister = entry.getCurrentPersister(); + final var loadedPersister = collectionEntry.getLoadedPersister(); + final var currentPersister = collectionEntry.getCurrentPersister(); if ( loadedPersister != null || currentPersister != null ) { // it is or was referenced _somewhere_ - // if either its role changed, or its key changed final boolean ownerChanged = loadedPersister != currentPersister - || wasKeyChanged( entry, factory, currentPersister ); + || wasKeyChanged( collectionEntry, factory, currentPersister ); if ( ownerChanged ) { // do a check @@ -261,21 +264,21 @@ private static void prepareCollectionForUpdate( // do the work if ( currentPersister != null ) { - entry.setDorecreate( true ); + collectionEntry.setDorecreate( true ); } if ( loadedPersister != null ) { // we will need to remove the old entries - entry.setDoremove( true ); - if ( entry.isDorecreate() ) { - LOG.trace( "Forcing collection initialization" ); + collectionEntry.setDoremove( true ); + if ( collectionEntry.isDorecreate() ) { + log.trace( "Forcing collection initialization" ); collection.forceInitialization(); } } } else if ( collection.isDirty() ) { // the collection's elements have changed - entry.setDoupdate( true ); + collectionEntry.setDoupdate( true ); } } } @@ -288,7 +291,7 @@ private static boolean wasKeyChanged( CollectionEntry entry, SessionFactoryImplementor factory, CollectionPersister currentPersister) { return currentPersister != null && !currentPersister.getKeyType().isEqual( entry.getLoadedKey(), entry.getCurrentKey(), factory ) - && !(entry.getLoadedKey() instanceof DelayedPostInsertIdentifier); + && !( entry.getLoadedKey() instanceof DelayedPostInsertIdentifier ); } /** @@ -314,5 +317,4 @@ public static boolean skipRemoval(EventSource session, CollectionPersister persi */ private Collections() { } - } diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/NaturalIdResolutionsImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/NaturalIdResolutionsImpl.java index 1c0591af9d34..a21abedd6e20 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/internal/NaturalIdResolutionsImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/NaturalIdResolutionsImpl.java @@ -35,7 +35,8 @@ import static org.hibernate.engine.internal.NaturalIdLogging.NATURAL_ID_MESSAGE_LOGGER; public class NaturalIdResolutionsImpl implements NaturalIdResolutions, Serializable { - private static final Logger LOG = Logger.getLogger( NaturalIdResolutionsImpl.class ); + + private static final Logger log = Logger.getLogger( NaturalIdResolutionsImpl.class ); private final StatefulPersistenceContext persistenceContext; private final ConcurrentHashMap resolutionsByEntity = new ConcurrentHashMap<>(); @@ -268,8 +269,8 @@ private void manageSharedResolution( break; default: - if ( LOG.isDebugEnabled() ) { - LOG.debug( "Unexpected CachedNaturalIdValueSource [" + source + "]" ); + if ( log.isDebugEnabled() ) { + log.debug( "Unexpected CachedNaturalIdValueSource [" + source + "]" ); } } } diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java index 9e01c3ff6c78..e61ffd85c399 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java @@ -9,7 +9,6 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.Serializable; -import java.lang.invoke.MethodHandles; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -50,6 +49,7 @@ import org.hibernate.event.service.spi.EventListenerGroup; import org.hibernate.event.spi.PostLoadEvent; import org.hibernate.event.spi.PostLoadEventListener; +import org.hibernate.internal.CoreLogging; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.util.collections.InstanceIdentityMap; import org.hibernate.persister.collection.CollectionPersister; @@ -62,7 +62,6 @@ import org.hibernate.sql.results.jdbc.spi.JdbcValuesSourceProcessingState; import org.hibernate.sql.results.spi.LoadContexts; -import org.jboss.logging.Logger; import org.checkerframework.checker.nullness.qual.Nullable; @@ -88,11 +87,8 @@ * @author Sanne Grinovero */ class StatefulPersistenceContext implements PersistenceContext { - private static final CoreMessageLogger LOG = Logger.getMessageLogger( - MethodHandles.lookup(), - CoreMessageLogger.class, - StatefulPersistenceContext.class.getName() - ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( StatefulPersistenceContext.class ); private static final int INIT_COLL_SIZE = 8; @@ -724,7 +720,7 @@ public boolean reassociateIfUninitializedProxy(Object value) throws MappingExcep public void reassociateProxy(Object value, Object id) throws MappingException { final var lazyInitializer = extractLazyInitializer( value ); if ( lazyInitializer != null ) { - LOG.tracef( "Setting proxy identifier: %s", id ); + log.tracef( "Setting proxy identifier: %s", id ); lazyInitializer.setIdentifier( id ); reassociateProxy( lazyInitializer, asHibernateProxy( value ) ); } @@ -814,7 +810,7 @@ public Object narrowProxy(Object proxy, EntityPersister persister, EntityKey key final boolean alreadyNarrow = concreteProxyClass.isInstance( proxy ); if ( !alreadyNarrow ) { - LOG.narrowingProxy( concreteProxyClass ); + log.narrowingProxy( concreteProxyClass ); // If an impl is passed, there is really no point in creating a proxy. // It would just be extra processing. Just return the impl @@ -1513,7 +1509,7 @@ && isFoundInParent( propertyName, childEntity, persister, collectionPersister, p collectionPersister, unmergedInstance ); - LOG.tracef( + log.tracef( "Detached object being merged (corresponding with a managed entity) has a collection that [%s] the detached child", ( found ? "contains" : "does not contain" ) ); @@ -1544,7 +1540,7 @@ && isFoundInParent( propertyName, childEntity, persister, collectionPersister, p collectionPersister, mergeMap.get( proxy ) ); - LOG.debugf( + log.debugf( "Detached proxy being merged has a collection that [%s] the managed child", (found ? "contains" : "does not contain") ); @@ -1556,7 +1552,7 @@ && isFoundInParent( propertyName, childEntity, persister, collectionPersister, p collectionPersister, mergeMap.get( proxy ) ); - LOG.debugf( + log.debugf( "Detached proxy being merged has a collection that [%s] the detached child being merged", (found ? "contains" : "does not contain") ); @@ -1598,7 +1594,7 @@ public Object getIndexInOwner(String entity, String property, Object childEntity final var cp = metamodel.getCollectionDescriptor( entity + '.' + property ); //Extracted as we're logging within two hot loops - final boolean debugEnabled = LOG.isDebugEnabled(); + final boolean debugEnabled = log.isDebugEnabled(); // try cache lookup first final Object parent = getParentsByChild( childEntity ); @@ -1613,7 +1609,7 @@ public Object getIndexInOwner(String entity, String property, Object childEntity if ( unMergedInstance != null && unMergedChild != null ) { index = getIndexInParent( property, unMergedChild, persister, cp, unMergedInstance ); if ( debugEnabled ) { - LOG.debugf( + log.debugf( "A detached object being merged (corresponding to a parent in parentsByChild) has an indexed collection that [%s] the detached child being merged. ", ( index != null ? "contains" : "does not contain" ) ); @@ -1643,7 +1639,7 @@ public Object getIndexInOwner(String entity, String property, Object childEntity if ( unMergedInstance != null && unMergedChild!=null ) { index = getIndexInParent( property, unMergedChild, persister, cp, unMergedInstance ); if ( debugEnabled ) { - LOG.debugf( + log.debugf( "A detached object being merged (corresponding to a managed entity) has an indexed collection that [%s] the detached child being merged. ", (index != null ? "contains" : "does not contain" ) ); @@ -1801,7 +1797,7 @@ public void replaceEntityEntryRowId(Object entity, Object rowId) { * @throws IOException serialization errors. */ public void serialize(ObjectOutputStream oos) throws IOException { - LOG.trace( "Serializing persistence context" ); + log.trace( "Serializing persistence context" ); oos.writeBoolean( defaultReadOnly ); oos.writeBoolean( hasNonReadOnlyEntities ); @@ -1883,8 +1879,8 @@ private void writeCollectionToStream( } else { oos.writeInt( collection.size() ); - if ( LOG.isTraceEnabled() ) { - LOG.trace( "Starting serialization of [" + collection.size() + "] " + keysName + " entries" ); + if ( log.isTraceEnabled() ) { + log.trace( "Starting serialization of [" + collection.size() + "] " + keysName + " entries" ); } for ( E entry : collection ) { serializer.serialize( entry, oos ); @@ -1906,7 +1902,7 @@ private void writeCollectionToStream( public static StatefulPersistenceContext deserialize( ObjectInputStream ois, SessionImplementor session) throws IOException, ClassNotFoundException { - LOG.trace( "Deserializing persistence context" ); + log.trace( "Deserializing persistence context" ); final var rtn = new StatefulPersistenceContext( session ); final var sfi = session.getFactory(); @@ -1921,9 +1917,9 @@ public static StatefulPersistenceContext deserialize( rtn.hasNonReadOnlyEntities = ois.readBoolean(); int count = ois.readInt(); - final boolean traceEnabled = LOG.isTraceEnabled(); + final boolean traceEnabled = log.isTraceEnabled(); if ( traceEnabled ) { - LOG.trace( "Starting deserialization of [" + count + "] entitiesByUniqueKey entries" ); + log.trace( "Starting deserialization of [" + count + "] entitiesByUniqueKey entries" ); } if ( count != 0 ) { rtn.entitiesByUniqueKey = mapOfSize(Math.max(count, INIT_COLL_SIZE)); @@ -1934,7 +1930,7 @@ public static StatefulPersistenceContext deserialize( count = ois.readInt(); if ( traceEnabled ) { - LOG.trace( "Starting deserialization of [" + count + "] entitySnapshotsByKey entries" ); + log.trace( "Starting deserialization of [" + count + "] entitySnapshotsByKey entries" ); } rtn.entitySnapshotsByKey = mapOfSize(Math.max(count, INIT_COLL_SIZE)); for ( int i = 0; i < count; i++ ) { @@ -1945,7 +1941,7 @@ public static StatefulPersistenceContext deserialize( count = ois.readInt(); if ( traceEnabled ) { - LOG.trace( "Starting deserialization of [" + count + "] entitiesByKey entries" ); + log.trace( "Starting deserialization of [" + count + "] entitiesByKey entries" ); } rtn.entitiesByKey = mapOfSize(Math.max(count, INIT_COLL_SIZE)); final var metamodel = sfi.getMappingMetamodel(); @@ -1966,7 +1962,7 @@ public static StatefulPersistenceContext deserialize( else { // otherwise, the proxy was pruned during the serialization process if ( traceEnabled ) { - LOG.trace( "Encountered pruned proxy" ); + log.trace( "Encountered pruned proxy" ); } } } @@ -1976,7 +1972,7 @@ public static StatefulPersistenceContext deserialize( count = ois.readInt(); if ( traceEnabled ) { - LOG.trace( "Starting deserialization of [" + count + "] collectionsByKey entries" ); + log.trace( "Starting deserialization of [" + count + "] collectionsByKey entries" ); } rtn.collectionsByKey = mapOfSize(Math.max(count, INIT_COLL_SIZE)); for ( int i = 0; i < count; i++ ) { @@ -1988,7 +1984,7 @@ public static StatefulPersistenceContext deserialize( count = ois.readInt(); if ( traceEnabled ) { - LOG.trace( "Starting deserialization of [" + count + "] collectionEntries entries" ); + log.trace( "Starting deserialization of [" + count + "] collectionEntries entries" ); } for ( int i = 0; i < count; i++ ) { final var pc = (PersistentCollection) ois.readObject(); @@ -1999,7 +1995,7 @@ public static StatefulPersistenceContext deserialize( count = ois.readInt(); if ( traceEnabled ) { - LOG.trace( "Starting deserialization of [" + count + "] arrayHolders entries" ); + log.trace( "Starting deserialization of [" + count + "] arrayHolders entries" ); } if ( count != 0 ) { rtn.arrayHolders = new IdentityHashMap<>(Math.max(count, INIT_COLL_SIZE)); @@ -2010,7 +2006,7 @@ public static StatefulPersistenceContext deserialize( count = ois.readInt(); if ( traceEnabled ) { - LOG.trace( "Starting deserialization of [" + count + "] nullifiableEntityKey entries" ); + log.trace( "Starting deserialization of [" + count + "] nullifiableEntityKey entries" ); } rtn.nullifiableEntityKeys = new HashSet<>(); for ( int i = 0; i < count; i++ ) { @@ -2018,8 +2014,8 @@ public static StatefulPersistenceContext deserialize( } count = ois.readInt(); - if ( LOG.isTraceEnabled() ) { - LOG.trace( "Starting deserialization of [" + count + "] deletedUnloadedEntityKeys entries" ); + if ( log.isTraceEnabled() ) { + log.trace( "Starting deserialization of [" + count + "] deletedUnloadedEntityKeys entries" ); } rtn.deletedUnloadedEntityKeys = new HashSet<>(); for ( int i = 0; i < count; i++ ) { diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/Versioning.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/Versioning.java index bebda63bcfa7..ef518d21ee4b 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/internal/Versioning.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/Versioning.java @@ -20,7 +20,6 @@ * @author Gavin King */ public final class Versioning { - private static final VersionLogger LOG = VersionLogger.INSTANCE; /** * Private constructor disallowing instantiation. @@ -45,7 +44,7 @@ public static Object seed(EntityVersionMapping versionMapping, SharedSessionCont versionMapping.getScale(), session ); - LOG.seed( seed ); + VersionLogger.INSTANCE.seed( seed ); return seed; } @@ -74,7 +73,7 @@ public static boolean seedVersion( return true; } else { - LOG.initial( initialVersion ); + VersionLogger.INSTANCE.initial( initialVersion ); return false; } } @@ -137,7 +136,7 @@ public static Object increment(Object version, EntityVersionMapping versionMappi versionMapping.getScale(), session ); - LOG.incrementing( version, next ); + VersionLogger.INSTANCE.incrementing( version, next ); return next; } diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/ConnectionProviderInitiator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/ConnectionProviderInitiator.java index 4f678b7bf0b1..04268e5011da 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/ConnectionProviderInitiator.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/ConnectionProviderInitiator.java @@ -54,7 +54,8 @@ * @author Brett Meyer */ public class ConnectionProviderInitiator implements StandardServiceInitiator { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( ConnectionProviderInitiator.class ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( ConnectionProviderInitiator.class ); /** * Singleton access @@ -99,7 +100,7 @@ public ConnectionProvider initiateService( return provider; } else if ( explicitSetting instanceof Class providerClass ) { - LOG.instantiatingExplicitConnectionProvider( providerClass.getName() ); + log.instantiatingExplicitConnectionProvider( providerClass.getName() ); return instantiateExplicitConnectionProvider( connectionProviderClass( providerClass ), beanContainer ); } else { @@ -125,7 +126,7 @@ private static Class connectionProviderClass(Class private ConnectionProvider instantiateNamedConnectionProvider( String providerName, StrategySelector strategySelector, BeanContainer beanContainer) { - LOG.instantiatingExplicitConnectionProvider( providerName ); + log.instantiatingExplicitConnectionProvider( providerName ); final var providerClass = strategySelector.selectStrategyImplementor( ConnectionProvider.class, providerName ); try { return instantiateExplicitConnectionProvider( providerClass, beanContainer ); @@ -180,7 +181,7 @@ else if ( configurationValues.containsKey( URL ) ) { } private ConnectionProvider noAppropriateConnectionProvider() { - LOG.noAppropriateConnectionProvider(); + log.noAppropriateConnectionProvider(); return new UserSuppliedConnectionProviderImpl(); } @@ -224,7 +225,7 @@ private static ConnectionProvider instantiateProvider(StrategySelector selector, return selector.selectStrategyImplementor( ConnectionProvider.class, strategy ).getConstructor().newInstance(); } catch ( Exception e ) { - LOG.providerClassNotFound(strategy); + log.providerClassNotFound(strategy); return null; } } diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/DialectResolverSet.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/DialectResolverSet.java index c70a345b2fd0..de3b4b9d3a7c 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/DialectResolverSet.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/DialectResolverSet.java @@ -23,7 +23,8 @@ * @author Steve Ebersole */ public class DialectResolverSet implements DialectResolver { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( DialectResolverSet.class ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( DialectResolverSet.class ); private final List resolvers; @@ -52,7 +53,7 @@ public Dialect resolveDialect(DialectResolutionInfo info) { throw e; } catch ( Exception e ) { - LOG.exceptionInSubResolver( e.getMessage() ); + log.exceptionInSubResolver( e.getMessage() ); } } 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 34bd963d416b..0d61716f0ba4 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 @@ -4,7 +4,6 @@ */ package org.hibernate.engine.jdbc.env.internal; -import java.lang.invoke.MethodHandles; import java.sql.Connection; import java.sql.DatabaseMetaData; import java.sql.SQLException; @@ -32,6 +31,7 @@ import org.hibernate.engine.jdbc.spi.SqlExceptionHelper; import org.hibernate.event.monitor.internal.EmptyEventMonitor; import org.hibernate.event.monitor.spi.EventMonitor; +import org.hibernate.internal.CoreLogging; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.log.ConnectionInfoLogger; import org.hibernate.jdbc.AbstractReturningWork; @@ -47,7 +47,6 @@ import org.hibernate.service.spi.ServiceRegistryImplementor; import org.hibernate.stat.spi.StatisticsImplementor; -import org.jboss.logging.Logger; import static org.hibernate.engine.jdbc.JdbcLogging.JDBC_MESSAGE_LOGGER; @@ -80,11 +79,8 @@ * @author Steve Ebersole */ public class JdbcEnvironmentInitiator implements StandardServiceInitiator { - private static final CoreMessageLogger log = Logger.getMessageLogger( - MethodHandles.lookup(), - CoreMessageLogger.class, - JdbcEnvironmentInitiator.class.getName() - ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( JdbcEnvironmentInitiator.class ); public static final JdbcEnvironmentInitiator INSTANCE = new JdbcEnvironmentInitiator(); diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/TypeInfo.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/TypeInfo.java index 27f751599a51..3d1d61d72288 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/TypeInfo.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/TypeInfo.java @@ -4,15 +4,14 @@ */ package org.hibernate.engine.jdbc.spi; -import java.lang.invoke.MethodHandles; import java.sql.DatabaseMetaData; import java.sql.ResultSet; import java.sql.SQLException; import java.util.LinkedHashSet; +import org.hibernate.internal.CoreLogging; import org.hibernate.internal.CoreMessageLogger; -import org.jboss.logging.Logger; import static org.hibernate.internal.util.StringHelper.split; import static org.hibernate.internal.util.collections.ArrayHelper.EMPTY_STRING_ARRAY; @@ -26,11 +25,8 @@ */ @Deprecated(since = "7.0", forRemoval = true) public class TypeInfo { - private static final CoreMessageLogger LOG = Logger.getMessageLogger( - MethodHandles.lookup(), - CoreMessageLogger.class, - TypeInfo.class.getName() - ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( TypeInfo.class ); private final String typeName; private final int jdbcTypeCode; @@ -108,19 +104,19 @@ public static LinkedHashSet extractTypeInfo(DatabaseMetaData metaData) } } catch ( SQLException e ) { - LOG.unableToAccessTypeInfoResultSet( e.toString() ); + log.unableToAccessTypeInfoResultSet( e.toString() ); } finally { try { resultSet.close(); } catch ( SQLException e ) { - LOG.unableToReleaseTypeInfoResultSet(); + log.unableToReleaseTypeInfoResultSet(); } } } catch ( SQLException e ) { - LOG.unableToRetrieveTypeInfoResultSet( e.toString() ); + log.unableToRetrieveTypeInfoResultSet( e.toString() ); } return typeInfoSet; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jndi/internal/JndiServiceImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jndi/internal/JndiServiceImpl.java index cf2bf62d8e74..91d166538168 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jndi/internal/JndiServiceImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jndi/internal/JndiServiceImpl.java @@ -4,7 +4,6 @@ */ package org.hibernate.engine.jndi.internal; -import java.lang.invoke.MethodHandles; import java.net.URI; import java.net.URISyntaxException; import java.util.Hashtable; @@ -22,10 +21,10 @@ import org.hibernate.engine.jndi.JndiException; import org.hibernate.engine.jndi.JndiNameException; import org.hibernate.engine.jndi.spi.JndiService; +import org.hibernate.internal.CoreLogging; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.util.NullnessUtil; -import org.jboss.logging.Logger; /** * Standard implementation of JNDI services. @@ -33,11 +32,8 @@ * @author Steve Ebersole */ final class JndiServiceImpl implements JndiService { - private static final CoreMessageLogger LOG = Logger.getMessageLogger( - MethodHandles.lookup(), - CoreMessageLogger.class, - JndiServiceImpl.class.getName() - ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( JndiServiceImpl.class ); private final Hashtable initialContextSettings; @@ -149,7 +145,7 @@ private void cleanUp(InitialContext initialContext) { initialContext.close(); } catch ( NamingException e ) { - LOG.unableToCloseInitialContext(e.toString()); + log.unableToCloseInitialContext(e.toString()); } } @@ -167,7 +163,7 @@ public void bind(String jndiName, Object value) { private void bind(Name name, Object value, Context context) { try { - LOG.tracef( "Binding: %s", name ); + log.tracef( "Binding: %s", name ); context.rebind( name, value ); } catch ( Exception initialException ) { @@ -185,7 +181,7 @@ private void bind(Name name, Object value, Context context) { Context intermediateContext = null; try { - LOG.tracef( "Intermediate lookup: %s", intermediateContextName ); + log.tracef( "Intermediate lookup: %s", intermediateContextName ); intermediateContext = (Context) intermediateContextBase.lookup( intermediateContextName ); } catch ( NameNotFoundException handledBelow ) { @@ -196,10 +192,10 @@ private void bind(Name name, Object value, Context context) { } if ( intermediateContext != null ) { - LOG.tracef( "Found intermediate context: %s", intermediateContextName ); + log.tracef( "Found intermediate context: %s", intermediateContextName ); } else { - LOG.tracef( "Creating subcontext: %s", intermediateContextName ); + log.tracef( "Creating subcontext: %s", intermediateContextName ); try { intermediateContext = intermediateContextBase.createSubcontext( intermediateContextName ); } @@ -210,7 +206,7 @@ private void bind(Name name, Object value, Context context) { intermediateContextBase = intermediateContext; name = name.getSuffix( 1 ); } - LOG.tracef( "Binding: %s", name ); + log.tracef( "Binding: %s", name ); try { intermediateContextBase.rebind( name, value ); } @@ -218,7 +214,7 @@ private void bind(Name name, Object value, Context context) { throw new JndiException( "Error performing intermediate bind [" + name + "]", e ); } } - LOG.tracef( "Bound name: %s", name ); + log.tracef( "Bound name: %s", name ); } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/engine/profile/FetchProfile.java b/hibernate-core/src/main/java/org/hibernate/engine/profile/FetchProfile.java index 74170808ed4a..dae09859dc7a 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/profile/FetchProfile.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/profile/FetchProfile.java @@ -41,7 +41,8 @@ * @author Steve Ebersole */ public class FetchProfile { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( FetchProfile.class ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( FetchProfile.class ); private final String name; private final Map fetches = new HashMap<>(); @@ -72,7 +73,7 @@ public void addFetch(final Fetch fetch) { final Type associationType = association.getOwner().getPropertyType( association.getAssociationPath() ); if ( associationType instanceof CollectionType ) { - LOG.tracev( "Handling request to add collection fetch [{0}]", role ); + log.tracev( "Handling request to add collection fetch [{0}]", role ); // couple of things for which to account in the case of collection // join fetches @@ -81,7 +82,7 @@ public void addFetch(final Fetch fetch) { // processed collection join fetches if ( associationType instanceof BagType ) { if ( containsJoinFetchedCollection ) { - LOG.containsJoinFetchedCollection( role ); + log.containsJoinFetchedCollection( role ); // EARLY EXIT!!! return; } @@ -93,7 +94,7 @@ public void addFetch(final Fetch fetch) { if ( containsJoinFetchedBag ) { // just for safety... if ( bagJoinFetch != null && fetches.remove( bagJoinFetch.getAssociation().getRole() ) != bagJoinFetch ) { - LOG.unableToRemoveBagJoinFetch(); + log.unableToRemoveBagJoinFetch(); } bagJoinFetch = null; containsJoinFetchedBag = false; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java index 12aa20a18918..77f5bc784124 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java @@ -67,7 +67,8 @@ * @author Anton Marsden */ public class ActionQueue { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( ActionQueue.class ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( ActionQueue.class ); private final SessionImplementor session; @@ -251,7 +252,7 @@ public void clear() { * @param action The action representing the entity insertion */ public void addAction(EntityInsertAction action) { - LOG.tracev( "Adding an EntityInsertAction for [{0}] object", action.getEntityName() ); + log.tracev( "Adding an EntityInsertAction for [{0}] object", action.getEntityName() ); addInsertAction( action ); } @@ -259,17 +260,17 @@ private void addInsertAction(AbstractEntityInsertAction insert) { if ( insert.isEarlyInsert() ) { // For early inserts, must execute inserts before finding non-nullable transient entities. // TODO: find out why this is necessary - LOG.tracev( "Executing inserts before finding non-nullable transient entities for early insert: [{0}]", insert ); + log.tracev( "Executing inserts before finding non-nullable transient entities for early insert: [{0}]", insert ); executeInserts(); } final NonNullableTransientDependencies nonNullableTransientDependencies = insert.findNonNullableTransientEntities(); if ( nonNullableTransientDependencies == null ) { - LOG.tracev( "Adding insert with no non-nullable, transient entities: [{0}]", insert ); + log.tracev( "Adding insert with no non-nullable, transient entities: [{0}]", insert ); addResolvedEntityInsertAction( insert ); } else { - if ( LOG.isTraceEnabled() ) { - LOG.tracev( "Adding insert with non-nullable, transient entities; insert=[{0}], dependencies=[{1}]", insert, + if ( log.isTraceEnabled() ) { + log.tracev( "Adding insert with non-nullable, transient entities; insert=[{0}], dependencies=[{1}]", insert, nonNullableTransientDependencies.toLoggableString( insert.getSession() ) ); } if ( unresolvedInsertions == null ) { @@ -281,13 +282,13 @@ private void addInsertAction(AbstractEntityInsertAction insert) { private void addResolvedEntityInsertAction(AbstractEntityInsertAction insert) { if ( insert.isEarlyInsert() ) { - LOG.trace( "Executing insertions before resolved early-insert" ); + log.trace( "Executing insertions before resolved early-insert" ); executeInserts(); - LOG.trace( "Executing identity-insert immediately" ); + log.trace( "Executing identity-insert immediately" ); execute( insert ); } else { - LOG.trace( "Adding resolved non-early insert action." ); + log.trace( "Adding resolved non-early insert action." ); OrderedActions.EntityInsertAction.ensureInitialized( this ); insertions.add( insert ); } @@ -314,7 +315,7 @@ private void addResolvedEntityInsertAction(AbstractEntityInsertAction insert) { * @param action The action representing the entity insertion */ public void addAction(EntityIdentityInsertAction action) { - LOG.tracev( "Adding an EntityIdentityInsertAction for [{0}] object", action.getEntityName() ); + log.tracev( "Adding an EntityIdentityInsertAction for [{0}] object", action.getEntityName() ); addInsertAction( action ); } @@ -603,7 +604,7 @@ private static boolean areTablesToBeUpdated(@Nullable ExecutableList queue, S else { for ( var actionSpace : queue.getQuerySpaces() ) { if ( tableSpaces.contains( actionSpace ) ) { - LOG.tracef( "Changes must be flushed to space: %s", actionSpace ); + log.tracef( "Changes must be flushed to space: %s", actionSpace ); return true; } } @@ -615,7 +616,7 @@ private static boolean areTablesToBeUpdated(UnresolvedEntityInsertActions action for ( var action : actions.getDependentEntityInsertActions() ) { for ( var space : action.getPropertySpaces() ) { if ( tableSpaces.contains( space ) ) { - LOG.tracef( "Changes must be flushed to space: %s", space ); + log.tracef( "Changes must be flushed to space: %s", space ); return true; } } @@ -916,7 +917,7 @@ public void unScheduleDeletion(EntityEntry entry, Object rescuedEntity) { * @throws IOException Indicates an error writing to the stream */ public void serialize(ObjectOutputStream oos) throws IOException { - LOG.trace( "Serializing action-queue" ); + log.trace( "Serializing action-queue" ); if ( unresolvedInsertions == null ) { unresolvedInsertions = new UnresolvedEntityInsertActions(); } @@ -945,9 +946,9 @@ public void serialize(ObjectOutputStream oos) throws IOException { */ public static ActionQueue deserialize(ObjectInputStream ois, EventSource session) throws IOException, ClassNotFoundException { - final boolean traceEnabled = LOG.isTraceEnabled(); + final boolean traceEnabled = log.isTraceEnabled(); if ( traceEnabled ) { - LOG.trace( "Deserializing action-queue" ); + log.trace( "Deserializing action-queue" ); } final var actionQueue = new ActionQueue( session ); actionQueue.unresolvedInsertions = UnresolvedEntityInsertActions.deserialize( ois, session ); @@ -962,7 +963,7 @@ public static ActionQueue deserialize(ObjectInputStream ois, EventSource session } queue.readExternal( ois ); if ( traceEnabled ) { - LOG.tracev( "Deserialized [{0}] entries", queue.size() ); + log.tracev( "Deserialized [{0}] entries", queue.size() ); } queue.afterDeserialize( session ); } @@ -1039,7 +1040,7 @@ public void afterTransactionCompletion(boolean success) { process.doAfterTransactionCompletion( success, session ); } catch (CacheException ce) { - LOG.unableToReleaseCacheLock( ce ); + log.unableToReleaseCacheLock( ce ); // continue loop } catch (Exception e) { @@ -1288,8 +1289,8 @@ public void sort(List insertions) { } while ( lastScheduleSize != scheduledEntityNames.size() ); if ( !insertInfosByEntityName.isEmpty() ) { - LOG.warn("The batch containing " + insertions.size() + " statements could not be sorted. " + - "This might indicate a circular entity relationship."); + log.warn( "The batch containing " + insertions.size() + " statements could not be sorted. " + + "This might indicate a circular entity relationship."); } insertions.clear(); for ( InsertInfo insertInfo : insertInfos ) { 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 4b66722d8633..6077120e487d 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 @@ -38,7 +38,8 @@ * @author Guenther Demetz */ public class BatchFetchQueue { - private static final Logger LOG = CoreLogging.logger( BatchFetchQueue.class ); + + private static final Logger log = CoreLogging.logger( BatchFetchQueue.class ); private final PersistenceContext context; @@ -109,8 +110,8 @@ public void addSubselect(EntityKey key, SubselectFetch subquery) { } final var previous = subselectsByEntityKey.put( key, subquery ); - if ( previous != null && LOG.isDebugEnabled() ) { - LOG.debugf( + if ( previous != null && log.isDebugEnabled() ) { + log.debugf( "SubselectFetch previously registered with BatchFetchQueue for `%s#s`", key.getEntityName(), key.getIdentifier() diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadingActions.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadingActions.java index f92b35186de1..cd6f14b1663b 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadingActions.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadingActions.java @@ -18,6 +18,7 @@ import org.hibernate.event.spi.MergeContext; import org.hibernate.event.spi.PersistContext; import org.hibernate.event.spi.RefreshContext; +import org.hibernate.internal.CoreLogging; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.type.AssociationType; @@ -26,9 +27,7 @@ import org.hibernate.type.ManyToOneType; import org.hibernate.type.OneToOneType; import org.hibernate.type.Type; -import org.jboss.logging.Logger; -import java.lang.invoke.MethodHandles; import java.util.Iterator; import java.util.List; @@ -41,11 +40,8 @@ * @author Steve Ebersole */ public class CascadingActions { - private static final CoreMessageLogger LOG = Logger.getMessageLogger( - MethodHandles.lookup(), - CoreMessageLogger.class, - CascadingAction.class.getName() - ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( CascadingAction.class ); /** * Disallow instantiation @@ -67,7 +63,7 @@ public void cascade( List attributePath, DeleteContext context, boolean isCascadeDeleteEnabled) { - LOG.tracev( "Cascading to delete: {0}", childEntityName ); + log.tracev( "Cascading to delete: {0}", childEntityName ); session.delete( childEntityName, child, isCascadeDeleteEnabled, context ); } @@ -128,7 +124,7 @@ public void cascade( List attributePath, LockOptions lockOptions, boolean isCascadeDeleteEnabled) { - LOG.tracev( "Cascading to lock: {0}", childEntityName ); + log.tracev( "Cascading to lock: {0}", childEntityName ); session.lock( childEntityName, child, lockOptions ); } @@ -168,7 +164,7 @@ public void cascade( RefreshContext context, boolean isCascadeDeleteEnabled) throws HibernateException { - LOG.tracev( "Cascading to refresh: {0}", childEntityName ); + log.tracev( "Cascading to refresh: {0}", childEntityName ); session.refresh( childEntityName, child, context ); } @@ -207,7 +203,7 @@ public void cascade( Void nothing, boolean isCascadeDeleteEnabled) throws HibernateException { - LOG.tracev( "Cascading to evict: {0}", childEntityName ); + log.tracev( "Cascading to evict: {0}", childEntityName ); session.evict( child ); } @@ -251,7 +247,7 @@ public void cascade( MergeContext context, boolean isCascadeDeleteEnabled) throws HibernateException { - LOG.tracev( "Cascading to merge: {0}", childEntityName ); + log.tracev( "Cascading to merge: {0}", childEntityName ); session.merge( childEntityName, child, context ); } @@ -291,7 +287,7 @@ public void cascade( PersistContext context, boolean isCascadeDeleteEnabled) throws HibernateException { - LOG.tracev( "Cascading to persist: {0}", childEntityName ); + log.tracev( "Cascading to persist: {0}", childEntityName ); session.persist( childEntityName, child, context ); } @@ -342,7 +338,7 @@ public void cascade( PersistContext context, boolean isCascadeDeleteEnabled) throws HibernateException { - LOG.tracev( "Cascading to persist on flush: {0}", childEntityName ); + log.tracev( "Cascading to persist on flush: {0}", childEntityName ); session.persistOnFlush( childEntityName, child, context ); } @@ -547,7 +543,7 @@ public void cascade( ReplicationMode mode, boolean isCascadeDeleteEnabled) throws HibernateException { - LOG.tracev( "Cascading to replicate: {0}", childEntityName ); + log.tracev( "Cascading to replicate: {0}", childEntityName ); session.replicate( childEntityName, child, mode ); } diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/CollectionEntry.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/CollectionEntry.java index 5e547ee21856..400d8da0ed21 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/CollectionEntry.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/CollectionEntry.java @@ -29,7 +29,8 @@ * @author Gavin King */ public final class CollectionEntry implements Serializable { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( CollectionEntry.class ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( CollectionEntry.class ); //ATTRIBUTES MAINTAINED BETWEEN FLUSH CYCLES @@ -185,8 +186,8 @@ public void preFlush(PersistentCollection collection) { dirty( collection ); - if ( LOG.isTraceEnabled() && collection.isDirty() && loadedPersister != null ) { - LOG.trace( "Collection dirty: " + collectionInfoString( loadedPersister.getRole(), getLoadedKey() ) ); + if ( log.isTraceEnabled() && collection.isDirty() && loadedPersister != null ) { + log.trace( "Collection dirty: " + collectionInfoString( loadedPersister.getRole(), getLoadedKey() ) ); } setReached( false ); @@ -266,7 +267,7 @@ public void afterAction(PersistentCollection collection) { * @param storedSnapshot the new stored snapshot */ public void resetStoredSnapshot(PersistentCollection collection, Serializable storedSnapshot) { - LOG.tracef("Reset storedSnapshot to %s for %s", storedSnapshot, this); + log.tracef("Reset storedSnapshot to %s for %s", storedSnapshot, this); if ( !fromMerge ) { snapshot = storedSnapshot; 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 9a80e4c3c1b1..ab32c27e4288 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 @@ -21,7 +21,8 @@ * @author Gavin King */ public class IdentifierValue implements UnsavedValueStrategy { - private static final Logger LOG = CoreLogging.logger( IdentifierValue.class ); + + private static final Logger log = CoreLogging.logger( IdentifierValue.class ); private final @Nullable Object value; @@ -31,7 +32,7 @@ public class IdentifierValue implements UnsavedValueStrategy { public static final IdentifierValue ANY = new IdentifierValue() { @Override public Boolean isUnsaved(Object id) { - LOG.trace( "ID unsaved-value strategy ANY" ); + log.trace( "ID unsaved-value strategy ANY" ); return Boolean.TRUE; } @@ -52,7 +53,7 @@ public String toString() { public static final IdentifierValue NONE = new IdentifierValue() { @Override public Boolean isUnsaved(Object id) { - LOG.trace( "ID unsaved-value strategy NONE" ); + log.trace( "ID unsaved-value strategy NONE" ); return Boolean.FALSE; } @@ -74,7 +75,7 @@ public String toString() { public static final IdentifierValue NULL = new IdentifierValue() { @Override public Boolean isUnsaved(@Nullable Object id) { - LOG.trace( "ID unsaved-value strategy NULL" ); + log.trace( "ID unsaved-value strategy NULL" ); return id == null; } @@ -95,7 +96,7 @@ public String toString() { public static final IdentifierValue UNDEFINED = new IdentifierValue() { @Override public @Nullable Boolean isUnsaved(Object id) { - LOG.trace( "ID unsaved-value strategy UNDEFINED" ); + log.trace( "ID unsaved-value strategy UNDEFINED" ); return null; } @@ -127,7 +128,7 @@ public IdentifierValue(Object value) { */ @Override public @Nullable Boolean isUnsaved(@Nullable Object id) { - LOG.tracef( "ID unsaved-value: %s", value ); + log.tracef( "ID unsaved-value: %s", 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 e8a71b6836b2..2482ee429afd 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 @@ -21,7 +21,8 @@ * @author Gavin King */ public class VersionValue implements UnsavedValueStrategy { - private static final Logger LOG = CoreLogging.logger( VersionValue.class ); + + private static final Logger log = CoreLogging.logger( VersionValue.class ); private final @Nullable Object value; /** @@ -31,7 +32,7 @@ public class VersionValue implements UnsavedValueStrategy { public static final VersionValue NULL = new VersionValue() { @Override public Boolean isUnsaved(@Nullable Object version) { - LOG.trace( "Version unsaved-value strategy NULL" ); + log.trace( "Version unsaved-value strategy NULL" ); return version == null; } @@ -53,7 +54,7 @@ public String toString() { public static final VersionValue UNDEFINED = new VersionValue() { @Override public @Nullable Boolean isUnsaved(@Nullable Object version) { - LOG.trace( "Version unsaved-value strategy UNDEFINED" ); + log.trace( "Version unsaved-value strategy UNDEFINED" ); return version == null ? Boolean.TRUE : null; } @@ -76,7 +77,7 @@ public String toString() { @Override public Boolean isUnsaved(@Nullable Object version) throws MappingException { - LOG.trace( "Version unsaved-value strategy NEGATIVE" ); + log.trace( "Version unsaved-value strategy NEGATIVE" ); if ( version == null ) { return Boolean.TRUE; } @@ -115,7 +116,7 @@ public VersionValue(Object value) { @Override public @Nullable Boolean isUnsaved(@Nullable Object version) throws MappingException { - LOG.tracef( "Version unsaved-value: %s", value ); + log.tracef( "Version unsaved-value: %s", 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 438d8b391b6b..31ca00bc48d8 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 @@ -24,7 +24,8 @@ * @author Steve Ebersole */ public class TransactionImpl implements TransactionImplementor { - private static final Logger LOG = CoreLogging.logger( TransactionImpl.class ); + + private static final Logger log = CoreLogging.logger( TransactionImpl.class ); private final TransactionCoordinator transactionCoordinator; private final boolean jpaCompliance; @@ -45,11 +46,11 @@ public TransactionImpl( this.transactionDriverControl = transactionCoordinator.getTransactionDriverControl(); } else { - LOG.debug( "TransactionImpl created on closed Session/EntityManager" ); + log.debug( "TransactionImpl created on closed Session/EntityManager" ); } - if ( LOG.isDebugEnabled() && jpaCompliance ) { - LOG.debugf( "TransactionImpl created in JPA compliant mode" ); + if ( log.isDebugEnabled() && jpaCompliance ) { + log.debugf( "TransactionImpl created in JPA compliant mode" ); } } @@ -72,7 +73,7 @@ else if ( !transactionCoordinator.getTransactionCoordinatorBuilder().isJta() ) { } } else { - LOG.debug( "Beginning transaction" ); + log.debug( "Beginning transaction" ); transactionDriverControl.begin(); } } @@ -85,7 +86,7 @@ public void commit() { throw new IllegalStateException( "Transaction not successfully started" ); } else { - LOG.debug( "Committing transaction" ); + log.debug( "Committing transaction" ); try { internalGetTransactionDriverControl().commit(); } @@ -114,13 +115,13 @@ public void rollback() { final TransactionStatus status = getStatus(); if ( status == TransactionStatus.ROLLED_BACK || status == TransactionStatus.NOT_ACTIVE ) { // allow rollback() on completed transaction as noop - LOG.debug( "rollback() called on an inactive transaction" ); + log.debug( "rollback() called on an inactive transaction" ); } else if ( !status.canRollback() ) { throw new TransactionException( "Cannot roll back transaction in current status [" + status.name() + "]" ); } else if ( status != TransactionStatus.FAILED_COMMIT || allowFailedCommitToPhysicallyRollback() ) { - LOG.debug( "Rolling back transaction" ); + log.debug( "Rolling back transaction" ); internalGetTransactionDriverControl().rollback(); } } @@ -196,7 +197,7 @@ public void setRollbackOnly() { else { // JpaCompliance disables the check, so this method // is equivalent our native markRollbackOnly() - LOG.debug( "setRollbackOnly() called on a inactive transaction" ); + log.debug( "setRollbackOnly() called on a inactive transaction" ); } } else { diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JtaPlatformInitiator.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JtaPlatformInitiator.java index bded3891aa69..a9ea6cbdabeb 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JtaPlatformInitiator.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JtaPlatformInitiator.java @@ -4,7 +4,6 @@ */ package org.hibernate.engine.transaction.jta.platform.internal; -import java.lang.invoke.MethodHandles; import java.util.Map; import org.hibernate.boot.registry.StandardServiceInitiator; @@ -12,10 +11,10 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform; import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatformResolver; +import org.hibernate.internal.CoreLogging; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.service.spi.ServiceRegistryImplementor; -import org.jboss.logging.Logger; import org.checkerframework.checker.nullness.qual.Nullable; @@ -27,7 +26,7 @@ public class JtaPlatformInitiator implements StandardServiceInitiator { public static final JtaPlatformInitiator INSTANCE = new JtaPlatformInitiator(); - private static final CoreMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, JtaPlatformInitiator.class.getName() ); + private static final CoreMessageLogger log = CoreLogging.messageLogger( JtaPlatformInitiator.class ); @Override public Class getServiceInitiated() { @@ -42,21 +41,21 @@ public Class getServiceInitiated() { .resolveStrategy( JtaPlatform.class, setting ); if ( platform == null ) { - LOG.trace( "No JtaPlatform was specified, checking resolver" ); + log.trace( "No JtaPlatform was specified, checking resolver" ); platform = registry.requireService( JtaPlatformResolver.class ) .resolveJtaPlatform( configurationValues, registry ); } if ( platform == null ) { - LOG.trace( "No JtaPlatform was specified, checking fallback provider" ); + log.trace( "No JtaPlatform was specified, checking fallback provider" ); platform = getFallbackProvider( configurationValues, registry ); } if ( platform == null || platform instanceof NoJtaPlatform ) { - LOG.noJtaPlatform(); + log.noJtaPlatform(); } else { - LOG.usingJtaPlatform( platform.getClass().getName() ); + log.usingJtaPlatform( platform.getClass().getName() ); } return platform; } diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractFlushingEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractFlushingEventListener.java index c616f3ed6b7e..220edbbe26f4 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractFlushingEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractFlushingEventListener.java @@ -4,7 +4,6 @@ */ package org.hibernate.event.internal; -import java.lang.invoke.MethodHandles; import java.util.Map; import org.hibernate.HibernateException; @@ -28,12 +27,12 @@ import org.hibernate.event.spi.FlushEntityEventListener; import org.hibernate.event.spi.FlushEvent; import org.hibernate.event.spi.PersistContext; +import org.hibernate.internal.CoreLogging; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.util.EntityPrinter; import org.hibernate.internal.util.collections.InstanceIdentityMap; import org.hibernate.persister.entity.EntityPersister; -import org.jboss.logging.Logger; import static org.hibernate.engine.internal.Collections.processUnreachableCollection; import static org.hibernate.engine.internal.Collections.skipRemoval; @@ -45,7 +44,7 @@ */ public abstract class AbstractFlushingEventListener { - private static final CoreMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, AbstractFlushingEventListener.class.getName() ); + private static final CoreMessageLogger log = CoreLogging.messageLogger( AbstractFlushingEventListener.class ); // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Pre-flushing section @@ -60,7 +59,7 @@ public abstract class AbstractFlushingEventListener { * @throws HibernateException Error flushing caches to execution queues. */ protected void flushEverythingToExecutions(FlushEvent event) throws HibernateException { - LOG.trace( "Flushing session" ); + log.trace( "Flushing session" ); final var session = event.getSession(); final var persistenceContext = session.getPersistenceContextInternal(); preFlush( session, persistenceContext ); @@ -95,18 +94,18 @@ protected void preFlush(EventSource session, PersistenceContext persistenceConte } protected void logFlushResults(FlushEvent event) { - if ( LOG.isDebugEnabled() ) { + if ( log.isDebugEnabled() ) { final var session = event.getSession(); final var persistenceContext = session.getPersistenceContextInternal(); final var actionQueue = session.getActionQueue(); - LOG.debugf( + log.debugf( "Flushed: %s insertions, %s updates, %s deletions to %s objects", actionQueue.numberOfInsertions(), actionQueue.numberOfUpdates(), actionQueue.numberOfDeletions(), persistenceContext.getNumberOfManagedEntities() ); - LOG.debugf( + log.debugf( "Flushed: %s (re)creations, %s updates, %s removals to %s collections", actionQueue.numberOfCollectionCreations(), actionQueue.numberOfCollectionUpdates(), @@ -125,7 +124,7 @@ protected void logFlushResults(FlushEvent event) { */ private void prepareEntityFlushes(EventSource session, PersistenceContext persistenceContext) throws HibernateException { - LOG.trace( "Processing flush-time cascades" ); + log.trace( "Processing flush-time cascades" ); final var context = PersistContext.create(); // safe from concurrent modification because of how concurrentEntries() is implemented on IdentityMap for ( var me : persistenceContext.reentrantSafeEntityEntries() ) { @@ -189,7 +188,7 @@ private void cascadeOnFlush(EventSource session, EntityPersister persister, Obje private void prepareCollectionFlushes(PersistenceContext persistenceContext) throws HibernateException { // Initialize dirty flags for arrays + collections with composite elements // and reset reached, doupdate, etc. - LOG.trace( "Dirty checking collections" ); + log.trace( "Dirty checking collections" ); final var collectionEntries = persistenceContext.getCollectionEntries(); if ( collectionEntries != null ) { final var identityMap = @@ -210,7 +209,7 @@ private void prepareCollectionFlushes(PersistenceContext persistenceContext) thr */ private int flushEntities(final FlushEvent event, final PersistenceContext persistenceContext) throws HibernateException { - LOG.trace( "Flushing entities and processing referenced collections" ); + log.trace( "Flushing entities and processing referenced collections" ); final var source = event.getSession(); final var flushListeners = @@ -268,13 +267,13 @@ private FlushEntityEvent createOrReuseEventInstance( */ private int flushCollections(final EventSource session, final PersistenceContext persistenceContext) throws HibernateException { - LOG.trace( "Processing unreferenced collections" ); + log.trace( "Processing unreferenced collections" ); final var collectionEntries = persistenceContext.getCollectionEntries(); final int count = processUnreachableCollections( session, collectionEntries ); // Schedule updates to collections: - LOG.trace( "Scheduling collection removes/(re)creates/updates" ); + log.trace( "Scheduling collection removes/(re)creates/updates" ); final var actionQueue = session.getActionQueue(); final var interceptor = session.getInterceptor(); persistenceContext.forEachCollectionEntry( @@ -371,7 +370,7 @@ private static int processUnreachableCollections( * @param session The session being flushed */ protected void performExecutions(EventSource session) { - LOG.trace( "Executing flush" ); + log.trace( "Executing flush" ); // IMPL NOTE : here we alter the flushing flag of the persistence context to allow // during-flush callbacks more leniency in regards to initializing proxies and @@ -407,7 +406,7 @@ protected void performExecutions(EventSource session) { * */ protected void postFlush(SessionImplementor session) throws HibernateException { - LOG.trace( "Post flush" ); + log.trace( "Post flush" ); final var persistenceContext = session.getPersistenceContextInternal(); persistenceContext.clearCollectionsByKey(); diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractSaveEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractSaveEventListener.java index 4edfb0155c30..0e78dc63e489 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractSaveEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractSaveEventListener.java @@ -47,7 +47,8 @@ * @author Steve Ebersole. */ public abstract class AbstractSaveEventListener implements CallbackRegistryConsumer { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( AbstractSaveEventListener.class ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( AbstractSaveEventListener.class ); private CallbackRegistry callbackRegistry; @@ -157,9 +158,9 @@ private static Object generateId( throw new IdentifierGenerationException( "Null id generated for entity '" + persister.getEntityName() + "'" ); } else { - if ( LOG.isTraceEnabled() ) { + if ( log.isTraceEnabled() ) { // TODO: define toString()s for generators - LOG.tracef( + log.tracef( "Generated identifier [%s] using generator '%s'", persister.getIdentifierType().toLoggableString( id, source.getFactory() ), generator.getClass().getName() @@ -209,8 +210,8 @@ protected Object performSave( } } - if ( LOG.isTraceEnabled() ) { - LOG.trace( "Persisting " + infoString( persister, id, source.getFactory() ) ); + if ( log.isTraceEnabled() ) { + log.trace( "Persisting " + infoString( persister, id, source.getFactory() ) ); } final var key = useIdentityColumn ? null : entityKey( id, persister, source ); diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultAutoFlushEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultAutoFlushEventListener.java index 97557c6e5ea6..84e2f782c9ac 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultAutoFlushEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultAutoFlushEventListener.java @@ -9,11 +9,10 @@ import org.hibernate.event.spi.AutoFlushEvent; import org.hibernate.event.spi.AutoFlushEventListener; import org.hibernate.event.spi.EventSource; +import org.hibernate.internal.CoreLogging; import org.hibernate.internal.CoreMessageLogger; -import org.jboss.logging.Logger; -import java.lang.invoke.MethodHandles; /** * Defines the default flush event listeners used by hibernate for @@ -23,7 +22,7 @@ */ public class DefaultAutoFlushEventListener extends AbstractFlushingEventListener implements AutoFlushEventListener { - private static final CoreMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, DefaultAutoFlushEventListener.class.getName() ); + private static final CoreMessageLogger log = CoreLogging.messageLogger( DefaultAutoFlushEventListener.class ); /** * Handle the given auto-flush event. @@ -51,7 +50,7 @@ public void onAutoFlush(AutoFlushEvent event) throws HibernateException { final int oldSize = actionQueue.numberOfCollectionRemovals(); flushEverythingToExecutions( event, persistenceContext, session ); if ( flushIsReallyNeeded( event, source ) ) { - LOG.trace( "Need to execute flush" ); + log.trace( "Need to execute flush" ); event.setFlushRequired( true ); // note: performExecutions() clears all collectionXxxxtion @@ -71,7 +70,7 @@ public void onAutoFlush(AutoFlushEvent event) throws HibernateException { } } else { - LOG.trace( "No need to execute flush" ); + log.trace( "No need to execute flush" ); event.setFlushRequired( false ); actionQueue.clearFromFlushNeededCheck( oldSize ); } diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultDeleteEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultDeleteEventListener.java index 1ebae93176fa..225fad2b51fa 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultDeleteEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultDeleteEventListener.java @@ -52,7 +52,8 @@ * @author Steve Ebersole */ public class DefaultDeleteEventListener implements DeleteEventListener, CallbackRegistryConsumer { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( DefaultDeleteEventListener.class ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( DefaultDeleteEventListener.class ); private CallbackRegistry callbackRegistry; @@ -154,7 +155,7 @@ private void delete(DeleteEvent event, DeleteContext transientEntities) { } private void deleteUnmanagedInstance(DeleteEvent event, DeleteContext transientEntities, Object entity) { - LOG.trace( "Deleted entity was not associated with current session" ); + log.trace( "Deleted entity was not associated with current session" ); final var source = event.getSession(); final var persister = source.getEntityPersister( event.getEntityName(), entity ); if ( ForeignKeys.isTransient( persister.getEntityName(), entity, null, source ) ) { @@ -219,7 +220,7 @@ private static boolean flushAndEvictExistingEntity( return true; } else { - LOG.flushAndEvictOnRemove( key.getEntityName() ); + log.flushAndEvictOnRemove( key.getEntityName() ); source.flush(); if ( !persister.isVersioned() || persister.getVersionType() @@ -243,12 +244,12 @@ private void deletePersistentInstance( DeleteContext transientEntities, Object entity, EntityEntry entityEntry) { - LOG.trace( "Deleting a persistent instance" ); + log.trace( "Deleting a persistent instance" ); final var source = event.getSession(); if ( entityEntry.getStatus().isDeletedOrGone() || source.getPersistenceContextInternal() .containsDeletedUnloadedEntityKey( entityEntry.getEntityKey() ) ) { - LOG.trace( "Object was already deleted" ); + log.trace( "Object was already deleted" ); } else { delete( @@ -338,13 +339,13 @@ protected void deleteTransientEntity( Object entity, EntityPersister persister, DeleteContext transientEntities) { - LOG.handlingTransientEntity(); + log.handlingTransientEntity(); if ( transientEntities.add( entity ) ) { cascadeBeforeDelete( session, persister, entity, transientEntities ); cascadeAfterDelete( session, persister, entity, transientEntities ); } else { - LOG.trace( "Already handled transient entity; skipping" ); + log.trace( "Already handled transient entity; skipping" ); } } @@ -369,8 +370,8 @@ protected final void deleteEntity( final EntityPersister persister, final DeleteContext transientEntities) { - if ( LOG.isTraceEnabled() ) { - LOG.trace( "Deleting " + infoString( persister, entityEntry.getId(), session.getFactory() ) ); + if ( log.isTraceEnabled() ) { + log.trace( "Deleting " + infoString( persister, entityEntry.getId(), session.getFactory() ) ); } final Object version = entityEntry.getVersion(); diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultEvictEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultEvictEventListener.java index 4f4ef9f2356d..39a3ffe533e1 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultEvictEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultEvictEventListener.java @@ -29,7 +29,8 @@ * @author Steve Ebersole */ public class DefaultEvictEventListener implements EvictEventListener { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( DefaultEvictEventListener.class ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( DefaultEvictEventListener.class ); /** * Handle the given evict event. @@ -105,8 +106,8 @@ protected void doEvict( final EntityPersister persister, final EventSource session) throws HibernateException { - if ( LOG.isTraceEnabled() ) { - LOG.trace( "Evicting " + infoString( persister ) ); + if ( log.isTraceEnabled() ) { + log.trace( "Evicting " + infoString( persister ) ); } final var persistenceContext = session.getPersistenceContextInternal(); diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultFlushEntityEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultFlushEntityEventListener.java index 843d5aad2eb4..4dde26baff3d 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultFlushEntityEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultFlushEntityEventListener.java @@ -51,7 +51,8 @@ * @author Gavin King */ public class DefaultFlushEntityEventListener implements FlushEntityEventListener, CallbackRegistryConsumer { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( DefaultFlushEntityEventListener.class ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( DefaultFlushEntityEventListener.class ); private CallbackRegistry callbackRegistry; @@ -286,21 +287,21 @@ private static int[] getDirtyProperties(FlushEntityEvent event, boolean intercep private static void logScheduleUpdate( EntityEntry entry, SessionFactoryImplementor factory, Status status, EntityPersister persister) { - if ( LOG.isTraceEnabled() ) { + if ( log.isTraceEnabled() ) { final String info = infoString( persister, entry.getId(), factory ); if ( status == Status.DELETED ) { if ( !persister.isMutable() ) { - LOG.trace( "Updating immutable, deleted entity: " + info ); + log.trace( "Updating immutable, deleted entity: " + info ); } else if ( !entry.isModifiableEntity() ) { - LOG.trace( "Updating non-modifiable, deleted entity: " + info ); + log.trace( "Updating non-modifiable, deleted entity: " + info ); } else { - LOG.trace( "Updating deleted entity: " + info ); + log.trace( "Updating deleted entity: " + info ); } } else { - LOG.trace( "Updating entity: " + info ); + log.trace( "Updating entity: " + info ); } } } @@ -647,15 +648,15 @@ public int[] visitAttributes(CustomEntityDirtinessStrategy.AttributeChecker attr } private void logDirtyProperties(EntityEntry entry, int[] dirtyProperties) { - if ( dirtyProperties != null && dirtyProperties.length > 0 && LOG.isTraceEnabled() ) { + if ( dirtyProperties != null && dirtyProperties.length > 0 && log.isTraceEnabled() ) { final var persister = entry.getPersister(); final String[] allPropertyNames = persister.getPropertyNames(); final String[] dirtyPropertyNames = new String[dirtyProperties.length]; for ( int i = 0; i < dirtyProperties.length; i++ ) { dirtyPropertyNames[i] = allPropertyNames[dirtyProperties[i]]; } - LOG.trace( "Found dirty properties [" + infoString( persister.getEntityName(), entry.getId() ) - + "] : "+ Arrays.toString( dirtyPropertyNames ) ); + log.trace( "Found dirty properties [" + infoString( persister.getEntityName(), entry.getId() ) + + "] : " + Arrays.toString( dirtyPropertyNames ) ); } } diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultInitializeCollectionEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultInitializeCollectionEventListener.java index 48d9f430c218..cc81d0598a16 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultInitializeCollectionEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultInitializeCollectionEventListener.java @@ -23,7 +23,8 @@ * @author Gavin King */ public class DefaultInitializeCollectionEventListener implements InitializeCollectionEventListener { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( DefaultInitializeCollectionEventListener.class ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( DefaultInitializeCollectionEventListener.class ); /** * called by a collection that wants to initialize itself @@ -42,20 +43,20 @@ public void onInitializeCollection(InitializeCollectionEvent event) throws Hiber final var loadedPersister = ce.getLoadedPersister(); checkPersister(collection, loadedPersister); final Object loadedKey = ce.getLoadedKey(); - if ( LOG.isTraceEnabled() ) { - LOG.trace( "Initializing collection " + if ( log.isTraceEnabled() ) { + log.trace( "Initializing collection " + collectionInfoString( loadedPersister, collection, loadedKey, source ) ); } final boolean foundInCache = initializeFromCache( loadedKey, loadedPersister, collection, source ); if ( foundInCache ) { - LOG.trace( "Collection initialized from cache" ); + log.trace( "Collection initialized from cache" ); } else { - LOG.trace( "Collection not cached" ); + log.trace( "Collection not cached" ); loadedPersister.initialize( loadedKey, source ); handlePotentiallyEmptyCollection( collection, persistenceContext, loadedKey, loadedPersister ); - LOG.trace( "Collection initialized" ); + log.trace( "Collection initialized" ); final var statistics = source.getFactory().getStatistics(); if ( statistics.isStatisticsEnabled() ) { @@ -100,7 +101,7 @@ private boolean initializeFromCache( SessionImplementor source) { if ( source.getLoadQueryInfluencers().hasEnabledFilters() && persister.isAffectedByEnabledFilters( source ) ) { - LOG.trace( "Disregarding cached version (if any) of collection due to enabled filters" ); + log.trace( "Disregarding cached version (if any) of collection due to enabled filters" ); return false; } else { diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLoadEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLoadEventListener.java index 2bce2ea75847..9811bcc1055c 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLoadEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLoadEventListener.java @@ -41,7 +41,7 @@ */ public class DefaultLoadEventListener implements LoadEventListener { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( DefaultLoadEventListener.class ); + private static final CoreMessageLogger log = CoreLogging.messageLogger( DefaultLoadEventListener.class ); /** * Handle the given load event. @@ -103,7 +103,7 @@ private void doOnLoad(EntityPersister persister, LoadEvent event, LoadType loadT } } catch (HibernateException e) { - LOG.unableToLoadCommand( e ); + log.unableToLoadCommand( e ); throw e; } } @@ -217,8 +217,8 @@ else if ( isOptionalInstance && entity != event.getInstanceToLoad() ) { * @return The result of the proxy/load operation. */ private Object proxyOrLoad(LoadEvent event, EntityPersister persister, EntityKey keyToLoad, LoadType options) { - if ( LOG.isTraceEnabled() ) { - LOG.trace( "Loading entity: " + infoString( persister, event.getEntityId(), persister.getFactory() ) ); + if ( log.isTraceEnabled() ) { + log.trace( "Loading entity: " + infoString( persister, event.getEntityId(), persister.getFactory() ) ); } if ( hasBytecodeProxy( persister, options ) ) { return loadWithBytecodeProxy( event, persister, keyToLoad, options ); @@ -297,9 +297,9 @@ private static Object loadWithProxyFactory( // existing proxy associated with the PC - and if so, use it final Object proxy = holder == null ? null : holder.getProxy(); if ( proxy != null ) { - LOG.trace( "Entity proxy found in session cache" ); - if ( LOG.isDebugEnabled() && extractLazyInitializer( proxy ).isUnwrap() ) { - LOG.debug( "Ignoring NO_PROXY to honor laziness" ); + log.trace( "Entity proxy found in session cache" ); + if ( log.isDebugEnabled() && extractLazyInitializer( proxy ).isUnwrap() ) { + log.debug( "Ignoring NO_PROXY to honor laziness" ); } return persistenceContext.narrowProxy( proxy, persister, keyToLoad, null ); } @@ -357,8 +357,8 @@ private static Object proxyOrCached(LoadEvent event, EntityPersister persister, * @return The created/existing proxy */ private Object narrowedProxy(LoadEvent event, EntityPersister persister, EntityKey keyToLoad, LoadType options, Object proxy) { - if ( LOG.isTraceEnabled() ) { - LOG.trace( "Entity proxy found in session cache" ); + if ( log.isTraceEnabled() ) { + log.trace( "Entity proxy found in session cache" ); } final var li = extractLazyInitializer( proxy ); if ( li.isUnwrap() ) { @@ -416,16 +416,16 @@ private static Object createProxyIfNecessary( final Object existing = holder == null ? null : holder.getEntity(); if ( existing != null ) { // return existing object or initialized proxy (unless deleted) - if ( LOG.isTraceEnabled() ) { - LOG.trace( "Entity found in session cache" ); + if ( log.isTraceEnabled() ) { + log.trace( "Entity found in session cache" ); } return options.isCheckDeleted() && wasDeleted( event.getSession().getPersistenceContextInternal(), existing ) ? null : existing; } else { - if ( LOG.isTraceEnabled() ) { - LOG.trace( "Creating new proxy for entity" ); + if ( log.isTraceEnabled() ) { + log.trace( "Creating new proxy for entity" ); } return createProxy( event, persister, keyToLoad ); } @@ -506,8 +506,8 @@ private Object lockAndLoad(LoadEvent event, EntityPersister persister, EntityKey */ private Object doLoad(LoadEvent event, EntityPersister persister, EntityKey keyToLoad, LoadType options) { - if ( LOG.isTraceEnabled() ) { - LOG.trace( "Attempting to resolve: " + if ( log.isTraceEnabled() ) { + log.trace( "Attempting to resolve: " + infoString( persister, event.getEntityId(), event.getFactory() ) ); } @@ -562,8 +562,8 @@ private Object loadFromCacheOrDatasource(LoadEvent event, EntityPersister persis return loadFromDatasource( event, persister ); } else { - if ( LOG.isTraceEnabled() ) { - LOG.trace( "Resolved entity in second-level cache: " + if ( log.isTraceEnabled() ) { + log.trace( "Resolved entity in second-level cache: " + infoString( persister, event.getEntityId(), event.getFactory() ) ); } return entity; @@ -580,8 +580,8 @@ private Object loadFromCacheOrDatasource(LoadEvent event, EntityPersister persis * @return The object loaded from the datasource, or null if not found. */ protected Object loadFromDatasource(final LoadEvent event, final EntityPersister persister) { - if ( LOG.isTraceEnabled() ) { - LOG.trace( "Entity not resolved in any cache, loading from datastore: " + if ( log.isTraceEnabled() ) { + log.trace( "Entity not resolved in any cache, loading from datastore: " + infoString( persister, event.getEntityId(), event.getFactory() ) ); } diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLockEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLockEventListener.java index 259a1290ec62..97e0fa184bb2 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLockEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLockEventListener.java @@ -16,13 +16,12 @@ import org.hibernate.event.spi.AbstractEvent; import org.hibernate.event.spi.LockEvent; import org.hibernate.event.spi.LockEventListener; +import org.hibernate.internal.CoreLogging; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.type.TypeHelper; -import org.jboss.logging.Logger; -import java.lang.invoke.MethodHandles; import static org.hibernate.engine.internal.Versioning.getVersion; import static org.hibernate.loader.ast.internal.LoaderHelper.upgradeLock; @@ -36,11 +35,7 @@ */ public class DefaultLockEventListener implements LockEventListener { - private static final CoreMessageLogger LOG = Logger.getMessageLogger( - MethodHandles.lookup(), - CoreMessageLogger.class, - DefaultLockEventListener.class.getName() - ); + private static final CoreMessageLogger log = CoreLogging.messageLogger( DefaultLockEventListener.class ); /** * Handle the given lock event. @@ -59,7 +54,7 @@ public void onLock(LockEvent event) throws HibernateException { throw new HibernateException( "Invalid lock mode for lock()" ); } if ( lockMode == LockMode.UPGRADE_SKIPLOCKED ) { - LOG.explicitSkipLockedLockCombo(); + log.explicitSkipLockedLockCombo(); } final var source = event.getSession(); @@ -115,8 +110,8 @@ private void cascadeOnLock(LockEvent event, EntityPersister persister, Object en */ protected final EntityEntry reassociate(AbstractEvent event, Object object, Object id, EntityPersister persister) { - if ( LOG.isTraceEnabled() ) { - LOG.trace( "Reassociating transient instance: " + infoString( persister, id, event.getFactory() ) ); + if ( log.isTraceEnabled() ) { + log.trace( "Reassociating transient instance: " + infoString( persister, id, event.getFactory() ) ); } final var source = event.getSession(); diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultMergeEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultMergeEventListener.java index 592b0afe9784..e75fa7f31b99 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultMergeEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultMergeEventListener.java @@ -55,7 +55,8 @@ public class DefaultMergeEventListener extends AbstractSaveEventListener implements MergeEventListener { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( DefaultMergeEventListener.class ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( DefaultMergeEventListener.class ); @Override protected Map getMergeMap(MergeContext context) { @@ -99,7 +100,7 @@ public void onMerge(MergeEvent event, MergeContext copiedAlready) throws Hiberna final var lazyInitializer = extractLazyInitializer( original ); if ( lazyInitializer != null ) { if ( lazyInitializer.isUninitialized() ) { - LOG.trace( "Ignoring uninitialized proxy" ); + log.trace( "Ignoring uninitialized proxy" ); event.setResult( source.getReference( lazyInitializer.getEntityName(), lazyInitializer.getInternalIdentifier() ) ); } else { @@ -109,7 +110,7 @@ public void onMerge(MergeEvent event, MergeContext copiedAlready) throws Hiberna else if ( isPersistentAttributeInterceptable( original ) ) { if ( asPersistentAttributeInterceptable( original ).$$_hibernate_getInterceptor() instanceof EnhancementAsProxyLazinessInterceptor proxyInterceptor ) { - LOG.trace( "Ignoring uninitialized enhanced proxy" ); + log.trace( "Ignoring uninitialized enhanced proxy" ); event.setResult( source.byId( proxyInterceptor.getEntityName() ) .getReference( proxyInterceptor.getIdentifier() ) ); } @@ -125,12 +126,12 @@ else if ( isPersistentAttributeInterceptable( original ) ) { private void doMerge(MergeEvent event, MergeContext copiedAlready, Object entity) { if ( copiedAlready.containsKey( entity ) && copiedAlready.isOperatedOn( entity ) ) { - LOG.trace( "Already in merge process" ); + log.trace( "Already in merge process" ); event.setResult( entity ); } else { if ( copiedAlready.containsKey( entity ) ) { - LOG.trace( "Already in copyCache; setting in merge process" ); + log.trace( "Already in copyCache; setting in merge process" ); copiedAlready.setOperatedOn( entity, true ); } event.setEntity( entity ); @@ -255,7 +256,7 @@ else if ( subtype instanceof ComponentType componentType ) { } protected void entityIsPersistent(MergeEvent event, MergeContext copyCache) { - LOG.trace( "Ignoring persistent instance" ); + log.trace( "Ignoring persistent instance" ); //TODO: check that entry.getIdentifier().equals(requestedId) final Object entity = event.getEntity(); final var source = event.getSession(); @@ -267,7 +268,7 @@ protected void entityIsPersistent(MergeEvent event, MergeContext copyCache) { } protected void entityIsTransient(MergeEvent event, Object id, MergeContext copyCache) { - LOG.trace( "Merging transient instance" ); + log.trace( "Merging transient instance" ); final Object entity = event.getEntity(); final var session = event.getSession(); @@ -394,7 +395,7 @@ private void saveTransientEntity( } protected void entityIsDetached(MergeEvent event, Object copiedId, Object originalId, MergeContext copyCache) { - LOG.trace( "Merging detached instance" ); + log.trace( "Merging detached instance" ); final Object entity = event.getEntity(); final var session = event.getSession(); @@ -416,7 +417,7 @@ protected void entityIsDetached(MergeEvent event, Object copiedId, Object origin () -> session.get( entityName, clonedIdentifier ) ); if ( result == null ) { - LOG.trace( "Detached instance not found in database" ); + log.trace( "Detached instance not found in database" ); // we got here because we assumed that an instance // with an assigned id and no version was detached // when it was really transient (or deleted) diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultPersistEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultPersistEventListener.java index 42b43ee0508c..562552f4dd0b 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultPersistEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultPersistEventListener.java @@ -33,7 +33,8 @@ public class DefaultPersistEventListener extends AbstractSaveEventListener implements PersistEventListener, CallbackRegistryConsumer { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( DefaultPersistEventListener.class ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( DefaultPersistEventListener.class ); @Override protected CascadingAction getCascadeAction() { @@ -118,7 +119,7 @@ private static String entityName(PersistEvent event, Object entity, EntityEntry } protected void entityIsPersistent(PersistEvent event, PersistContext createCache) { - LOG.trace( "Ignoring persistent instance" ); + log.trace( "Ignoring persistent instance" ); final var source = event.getSession(); //TODO: check that entry.getIdentifier().equals(requestedId) final Object entity = source.getPersistenceContextInternal().unproxy( event.getObject() ); @@ -140,7 +141,7 @@ private void justCascade(PersistContext createCache, EventSource source, Object * @param createCache The copy cache of entity instance to merge/copy instance */ protected void entityIsTransient(PersistEvent event, PersistContext createCache) { - LOG.trace( "Persisting transient instance" ); + log.trace( "Persisting transient instance" ); final var source = event.getSession(); final Object entity = source.getPersistenceContextInternal().unproxy( event.getObject() ); if ( createCache.add( entity ) ) { @@ -152,9 +153,9 @@ private void entityIsDeleted(PersistEvent event, PersistContext createCache) { final var source = event.getSession(); final Object entity = source.getPersistenceContextInternal().unproxy( event.getObject() ); final var persister = source.getEntityPersister( event.getEntityName(), entity ); - if ( LOG.isTraceEnabled() ) { + if ( log.isTraceEnabled() ) { final Object id = persister.getIdentifier( entity, source ); - LOG.trace( "Unscheduling entity deletion: " + infoString( persister, id, source.getFactory() ) ); + log.trace( "Unscheduling entity deletion: " + infoString( persister, id, source.getFactory() ) ); } if ( createCache.add( entity ) ) { justCascade( createCache, source, entity, persister ); diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultRefreshEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultRefreshEventListener.java index a6fbb2eb04b1..f92190d7652b 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultRefreshEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultRefreshEventListener.java @@ -38,7 +38,8 @@ * @author Steve Ebersole */ public class DefaultRefreshEventListener implements RefreshEventListener { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( DefaultRefreshEventListener.class ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( DefaultRefreshEventListener.class ); @Override public void onRefresh(RefreshEvent event) throws HibernateException { @@ -64,7 +65,7 @@ public void onRefresh(RefreshEvent event, RefreshContext refreshedAlready) { refresh( event, refreshedAlready, entity ); } else { - LOG.trace( "Already refreshed" ); + log.trace( "Already refreshed" ); } } } @@ -138,16 +139,16 @@ private static void refresh(RefreshEvent event, RefreshContext refreshedAlready, throw new TransientObjectException( "Cannot refresh instance of entity '" + persister.getEntityName() + "' because it has a null identifier" ); } - if ( LOG.isTraceEnabled() ) { - LOG.trace( "Refreshing transient " + infoString( persister, id, event.getFactory() ) ); + if ( log.isTraceEnabled() ) { + log.trace( "Refreshing transient " + infoString( persister, id, event.getFactory() ) ); } if ( persistenceContext.getEntry( source.generateEntityKey( id, persister ) ) != null ) { throw new NonUniqueObjectException( id, persister.getEntityName() ); } } else { - if ( LOG.isTraceEnabled() ) { - LOG.trace( "Refreshing " + infoString( entry.getPersister(), entry.getId(), event.getFactory() ) ); + if ( log.isTraceEnabled() ) { + log.trace( "Refreshing " + infoString( entry.getPersister(), entry.getId(), event.getFactory() ) ); } if ( !entry.isExistsInDatabase() ) { throw new UnresolvableObjectException( diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultReplicateEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultReplicateEventListener.java index bb6c35dcacb9..2e22c232f984 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultReplicateEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultReplicateEventListener.java @@ -37,7 +37,8 @@ public class DefaultReplicateEventListener extends AbstractSaveEventListener implements ReplicateEventListener { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( DefaultReplicateEventListener.class ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( DefaultReplicateEventListener.class ); /** * Handle the given replicate event. @@ -51,12 +52,12 @@ public void onReplicate(ReplicateEvent event) { final var source = event.getSession(); final var persistenceContext = source.getPersistenceContextInternal(); if ( persistenceContext.reassociateIfUninitializedProxy( event.getObject() ) ) { - LOG.trace( "Uninitialized proxy passed to replicate()" ); + log.trace( "Uninitialized proxy passed to replicate()" ); } else { final Object entity = persistenceContext.unproxyAndReassociate( event.getObject() ); if ( persistenceContext.isEntryFor( entity ) ) { - LOG.trace( "Ignoring persistent instance passed to replicate()" ); + log.trace( "Ignoring persistent instance passed to replicate()" ); //hum ... should we cascade anyway? throw an exception? fine like it is? } else { @@ -82,8 +83,8 @@ private void doReplicate(ReplicateEvent event, EventSource source, Object entity : persister.getCurrentVersion( id, source); // what is the version on the database? if ( oldVersion != null ) { - if ( LOG.isTraceEnabled() ) { - LOG.trace( "Found existing row for " + infoString( persister, id, event.getFactory() ) ); + if ( log.isTraceEnabled() ) { + log.trace( "Found existing row for " + infoString( persister, id, event.getFactory() ) ); } // If the entity has no version, getCurrentVersion() just returns // a meaningless value to indicate that the row exists (HHH-2378) @@ -94,17 +95,17 @@ private void doReplicate(ReplicateEvent event, EventSource source, Object entity // execute a SQL UPDATE performReplication( entity, id, realOldVersion, persister, replicationMode, source ); } - else if ( LOG.isTraceEnabled() ) { + else if ( log.isTraceEnabled() ) { // do nothing (don't even reassociate entity!) - LOG.trace( "No need to replicate" ); + log.trace( "No need to replicate" ); } //TODO: would it be better to do a refresh from db? } else { // no existing row - execute a SQL INSERT - if ( LOG.isTraceEnabled() ) { - LOG.trace( "No existing row, replicating new instance " + if ( log.isTraceEnabled() ) { + log.trace( "No existing row, replicating new instance " + infoString( persister, id, event.getFactory() ) ); } final boolean regenerate = persister.isIdentifierAssignedByInsert(); // prefer re-generation of identity! @@ -154,8 +155,8 @@ private void performReplication( ReplicationMode replicationMode, EventSource source) throws HibernateException { - if ( LOG.isTraceEnabled() ) { - LOG.trace( "Replicating changes to " + infoString( persister, id, source.getFactory() ) ); + if ( log.isTraceEnabled() ) { + log.trace( "Replicating changes to " + infoString( persister, id, source.getFactory() ) ); } new OnReplicateVisitor( source, id, entity, true ).process( entity, persister ); diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyAllowedLoggedObserver.java b/hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyAllowedLoggedObserver.java index 33902fd089a9..3beb35ba87ca 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyAllowedLoggedObserver.java +++ b/hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyAllowedLoggedObserver.java @@ -27,7 +27,7 @@ */ public final class EntityCopyAllowedLoggedObserver implements EntityCopyObserver { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( EntityCopyAllowedLoggedObserver.class ); + private static final CoreMessageLogger log = CoreLogging.messageLogger( EntityCopyAllowedLoggedObserver.class ); public static final EntityCopyObserverFactory FACTORY_OF_SELF = EntityCopyAllowedLoggedObserver::new; @@ -54,8 +54,8 @@ public void entityCopyDetected( Object mergeEntity2, EventSource session) { final String entityName = session.getEntityName( managedEntity ); - if ( LOG.isTraceEnabled() ) { - LOG.trace( "More than one representation of the same persistent entity being merged for: " + if ( log.isTraceEnabled() ) { + log.trace( "More than one representation of the same persistent entity being merged for: " + infoString( entityName, session.getIdentifier( managedEntity ) ) ); } Set detachedEntitiesForManaged = null; @@ -111,7 +111,7 @@ public void topLevelMergeComplete(EventSource session) { // Log the summary. if ( countsByEntityName != null ) { for ( var entry : countsByEntityName.entrySet() ) { - LOG.debug( + log.debug( String.format( "Summary: number of %s entities with multiple representations merged: %d", entry.getKey(), @@ -121,7 +121,7 @@ public void topLevelMergeComplete(EventSource session) { } } else { - LOG.debug( "No entity copies merged" ); + log.debug( "No entity copies merged" ); } if ( managedToMergeEntitiesXref != null ) { @@ -146,7 +146,7 @@ public void topLevelMergeComplete(EventSource session) { sb.append( getManagedOrDetachedEntityString( managedEntity, mergeEntity ) ); } sb.append( "; resulting managed entity: [" ).append( managedEntity ).append( ']' ); - LOG.debug( sb.toString()); + log.debug( sb.toString()); } } } diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyObserverFactoryInitiator.java b/hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyObserverFactoryInitiator.java index 74b5efc26b33..6e1f70d589d0 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyObserverFactoryInitiator.java +++ b/hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyObserverFactoryInitiator.java @@ -29,7 +29,8 @@ public class EntityCopyObserverFactoryInitiator implements StandardServiceInitiator { public static final EntityCopyObserverFactoryInitiator INSTANCE = new EntityCopyObserverFactoryInitiator(); - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( EntityCopyObserverFactoryInitiator.class ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( EntityCopyObserverFactoryInitiator.class ); @Override public EntityCopyObserverFactory initiateService(final Map configurationValues, final ServiceRegistryImplementor registry) { @@ -39,19 +40,19 @@ public EntityCopyObserverFactory initiateService(final Map confi } else if ( value.equals( EntityCopyNotAllowedObserver.SHORT_NAME ) || value.equals( EntityCopyNotAllowedObserver.class.getName() ) ) { - LOG.tracef( "Configured EntityCopyObserver strategy: %s", + log.tracef( "Configured EntityCopyObserver strategy: %s", EntityCopyNotAllowedObserver.SHORT_NAME ); return EntityCopyNotAllowedObserver.FACTORY_OF_SELF; } else if ( value.equals( EntityCopyAllowedObserver.SHORT_NAME ) || value.equals( EntityCopyAllowedObserver.class.getName() ) ) { - LOG.tracef( "Configured EntityCopyObserver strategy: %s", + log.tracef( "Configured EntityCopyObserver strategy: %s", EntityCopyAllowedObserver.SHORT_NAME ); return EntityCopyAllowedObserver.FACTORY_OF_SELF; } else if ( value.equals( EntityCopyAllowedLoggedObserver.SHORT_NAME ) || value.equals( EntityCopyAllowedLoggedObserver.class.getName() ) ) { - LOG.tracef( "Configured EntityCopyObserver strategy: %s", + log.tracef( "Configured EntityCopyObserver strategy: %s", EntityCopyAllowedLoggedObserver.SHORT_NAME ); return EntityCopyAllowedLoggedObserver.FACTORY_OF_SELF; } @@ -64,7 +65,7 @@ else if ( value.equals( EntityCopyAllowedLoggedObserver.SHORT_NAME ) registry.requireService( StrategySelector.class ) .resolveStrategy( EntityCopyObserver.class, value ); final var observerType = exampleInstance.getClass(); - LOG.tracef( "Configured EntityCopyObserver is a custom implementation of type '%s'", + log.tracef( "Configured EntityCopyObserver is a custom implementation of type '%s'", observerType.getName() ); return new EntityCopyObserverFactoryFromClass( observerType ); } diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/EntityState.java b/hibernate-core/src/main/java/org/hibernate/event/internal/EntityState.java index 2373195b9390..02afa61b424e 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/internal/EntityState.java +++ b/hibernate-core/src/main/java/org/hibernate/event/internal/EntityState.java @@ -16,7 +16,7 @@ public enum EntityState { PERSISTENT, TRANSIENT, DETACHED, DELETED; - static final CoreMessageLogger LOG = CoreLogging.messageLogger( EntityState.class ); + static final CoreMessageLogger log = CoreLogging.messageLogger( EntityState.class ); /** * Determine whether the entity is persistent, detached, or transient @@ -39,14 +39,14 @@ public static EntityState getEntityState( //the entity is associated with the session, so check its status if ( entry.getStatus() != Status.DELETED ) { // do nothing for persistent instances - if ( LOG.isTraceEnabled() ) { - LOG.trace( "Persistent instance of: " + getLoggableName( entityName, entity ) ); + if ( log.isTraceEnabled() ) { + log.trace( "Persistent instance of: " + getLoggableName( entityName, entity ) ); } return PERSISTENT; } // ie. e.status==DELETED - if ( LOG.isTraceEnabled() ) { - LOG.trace( "Deleted instance of: " + getLoggableName( entityName, entity ) ); + if ( log.isTraceEnabled() ) { + log.trace( "Deleted instance of: " + getLoggableName( entityName, entity ) ); } return DELETED; } @@ -56,13 +56,13 @@ public static EntityState getEntityState( // try interceptor and unsaved-value if ( ForeignKeys.isTransient( entityName, entity, assumedUnsaved, source ) ) { - if ( LOG.isTraceEnabled() ) { - LOG.trace( "Transient instance of: " + getLoggableName( entityName, entity ) ); + if ( log.isTraceEnabled() ) { + log.trace( "Transient instance of: " + getLoggableName( entityName, entity ) ); } return TRANSIENT; } - if ( LOG.isTraceEnabled() ) { - LOG.trace( "Detached instance of: " + getLoggableName( entityName, entity ) ); + if ( log.isTraceEnabled() ) { + log.trace( "Detached instance of: " + getLoggableName( entityName, entity ) ); } final var persistenceContext = source.getPersistenceContextInternal(); diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/EvictVisitor.java b/hibernate-core/src/main/java/org/hibernate/event/internal/EvictVisitor.java index bb860bb45fd5..35f5d9abed7d 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/internal/EvictVisitor.java +++ b/hibernate-core/src/main/java/org/hibernate/event/internal/EvictVisitor.java @@ -23,7 +23,8 @@ * @author Gavin King */ public class EvictVisitor extends AbstractVisitor { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( EvictVisitor.class ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( EvictVisitor.class ); private final Object owner; @@ -69,8 +70,8 @@ private void evictCollection(PersistentCollection collection) { final var persister = ce.getLoadedPersister(); final Object loadedKey = ce.getLoadedKey(); - if ( LOG.isTraceEnabled() ) { - LOG.trace( "Evicting collection: " + collectionInfoString( persister, collection, loadedKey, session ) ); + if ( log.isTraceEnabled() ) { + log.trace( "Evicting collection: " + collectionInfoString( persister, collection, loadedKey, session ) ); } if ( persister != null ) { diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/ReattachVisitor.java b/hibernate-core/src/main/java/org/hibernate/event/internal/ReattachVisitor.java index 9089e00a9205..41a30b805f2d 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/internal/ReattachVisitor.java +++ b/hibernate-core/src/main/java/org/hibernate/event/internal/ReattachVisitor.java @@ -21,7 +21,8 @@ * @author Gavin King */ public abstract class ReattachVisitor extends ProxyVisitor { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( ReattachVisitor.class ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( ReattachVisitor.class ); private final Object ownerIdentifier; private final Object owner; @@ -75,8 +76,8 @@ Object processComponent(Object component, CompositeType componentType) throws Hi */ void removeCollection(CollectionPersister role, Object collectionKey, EventSource source) throws HibernateException { - if ( LOG.isTraceEnabled() ) { - LOG.trace( "Collection dereferenced while transient " + if ( log.isTraceEnabled() ) { + log.trace( "Collection dereferenced while transient " + collectionInfoString( role, ownerIdentifier, source.getFactory() ) ); } source.getActionQueue().addAction( new CollectionRemoveAction( owner, role, collectionKey, false, source ) ); diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/WrapVisitor.java b/hibernate-core/src/main/java/org/hibernate/event/internal/WrapVisitor.java index 8e21addc9d5d..7312dd8cdb6b 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/internal/WrapVisitor.java +++ b/hibernate-core/src/main/java/org/hibernate/event/internal/WrapVisitor.java @@ -28,7 +28,8 @@ * @author Gavin King */ public class WrapVisitor extends ProxyVisitor { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( WrapVisitor.class ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( WrapVisitor.class ); protected Object entity; protected Object id; @@ -116,8 +117,8 @@ else if ( attributeInterceptor instanceof LazyAttributeLoadingInterceptor lazyLo final var persistentCollection = collectionType.wrap( session, collection ); persistenceContext.addNewCollection( persister, persistentCollection ); - if ( LOG.isTraceEnabled() ) { - LOG.trace( "Wrapped collection in role: " + collectionType.getRole() ); + if ( log.isTraceEnabled() ) { + log.trace( "Wrapped collection in role: " + collectionType.getRole() ); } return persistentCollection; //Force a substitution! } diff --git a/hibernate-core/src/main/java/org/hibernate/generator/values/internal/GeneratedValuesHelper.java b/hibernate-core/src/main/java/org/hibernate/generator/values/internal/GeneratedValuesHelper.java index b976681be8ac..e0662121fcb1 100644 --- a/hibernate-core/src/main/java/org/hibernate/generator/values/internal/GeneratedValuesHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/generator/values/internal/GeneratedValuesHelper.java @@ -60,7 +60,8 @@ */ @Internal public class GeneratedValuesHelper { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( IdentifierGeneratorHelper.class ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( IdentifierGeneratorHelper.class ); /** * Reads the {@linkplain EntityPersister#getGeneratedProperties(EventType) generated values} @@ -98,9 +99,9 @@ public static GeneratedValues getGeneratedValues( final var generatedValues = new GeneratedValuesImpl( generatedProperties ); final var results = readGeneratedValues( resultSet, statement, persister, mappingProducer, session ); - if ( LOG.isDebugEnabled() ) { - LOG.debug( "Extracted generated values for entity " - + infoString( persister ) + ": " + ArrayHelper.toString( results ) ); + if ( log.isDebugEnabled() ) { + log.debug( "Extracted generated values for entity " + + infoString( persister ) + ": " + ArrayHelper.toString( results ) ); } for ( int i = 0; i < results.length; i++ ) { diff --git a/hibernate-core/src/main/java/org/hibernate/id/GUIDGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/GUIDGenerator.java index 42d12523dd85..dddeec9487ef 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/GUIDGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/id/GUIDGenerator.java @@ -24,14 +24,15 @@ */ @Deprecated(since = "6.0") public class GUIDGenerator implements IdentifierGenerator { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( GUIDGenerator.class ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( GUIDGenerator.class ); private static boolean WARNED; public GUIDGenerator() { if ( !WARNED ) { WARNED = true; - LOG.deprecatedUuidGenerator( UUIDGenerator.class.getName(), UUIDGenerationStrategy.class.getName() ); + log.deprecatedUuidGenerator( UUIDGenerator.class.getName(), UUIDGenerationStrategy.class.getName() ); } } @@ -46,7 +47,7 @@ public Object generate(SharedSessionContractImplementor session, Object obj) thr throw new HibernateException( "The database returned no GUID identity value" ); } final String result = rs.getString( 1 ); - LOG.guidGenerated( result ); + log.guidGenerated( result ); return result; } finally { diff --git a/hibernate-core/src/main/java/org/hibernate/id/IdentifierGeneratorHelper.java b/hibernate-core/src/main/java/org/hibernate/id/IdentifierGeneratorHelper.java index 015dc6008e9d..f350fbe86fc3 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/IdentifierGeneratorHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/id/IdentifierGeneratorHelper.java @@ -46,7 +46,8 @@ */ @Internal public final class IdentifierGeneratorHelper { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( IdentifierGeneratorHelper.class ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( IdentifierGeneratorHelper.class ); /** * Marker object returned from {@link IdentifierGenerator#generate} to indicate that we should @@ -176,7 +177,7 @@ public IntegralDataTypeHolder initialize(ResultSet resultSet, long defaultValue) public void bind(PreparedStatement preparedStatement, int position) throws SQLException { // TODO : bind it as 'exact type'? Not sure if that gains us anything... - LOG.tracef( "binding parameter [%s] - [%s]", position, value ); + log.tracef( "binding parameter [%s] - [%s]", position, value ); preparedStatement.setLong( position, value ); } diff --git a/hibernate-core/src/main/java/org/hibernate/id/IncrementGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/IncrementGenerator.java index 79913b2b898c..6a738ab3a4d5 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/IncrementGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/id/IncrementGenerator.java @@ -47,7 +47,8 @@ * @implNote This also implements the {@code increment} generation type in {@code hbm.xml} mappings. */ public class IncrementGenerator implements IdentifierGenerator { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( IncrementGenerator.class ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( IncrementGenerator.class ); /** * A parameter identifying the column holding the id. @@ -131,8 +132,8 @@ public void initialize(SqlStringGenerationContext context) { private void initializePreviousValueHolder(SharedSessionContractImplementor session) { previousValueHolder = getIntegralDataTypeHolder( returnClass ); - if ( LOG.isTraceEnabled() ) { - LOG.tracef( "Fetching initial value: %s", sql ); + if ( log.isTraceEnabled() ) { + log.tracef( "Fetching initial value: %s", sql ); } try { final PreparedStatement st = session.getJdbcCoordinator().getStatementPreparer().prepareStatement( sql ); @@ -146,8 +147,8 @@ private void initializePreviousValueHolder(SharedSessionContractImplementor sess previousValueHolder.initialize( 1L ); } sql = null; - if ( LOG.isTraceEnabled() ) { - LOG.tracef( "First free id: %s", previousValueHolder.makeValue() ); + if ( log.isTraceEnabled() ) { + log.tracef( "First free id: %s", previousValueHolder.makeValue() ); } } finally { diff --git a/hibernate-core/src/main/java/org/hibernate/id/UUIDGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/UUIDGenerator.java index ed52c9389e40..f3617a8b6a91 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/UUIDGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/id/UUIDGenerator.java @@ -39,7 +39,8 @@ */ @Deprecated(since = "6.0") public class UUIDGenerator implements IdentifierGenerator { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( UUIDGenerator.class ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( UUIDGenerator.class ); public static final String UUID_GEN_STRATEGY = "uuid_gen_strategy"; public static final String UUID_GEN_STRATEGY_CLASS = "uuid_gen_strategy_class"; @@ -64,11 +65,11 @@ public void configure(GeneratorCreationContext creationContext, Properties param strategy = (UUIDGenerationStrategy) strategyClass.newInstance(); } catch ( Exception e ) { - LOG.unableToInstantiateUuidGenerationStrategy(e); + log.unableToInstantiateUuidGenerationStrategy(e); } } catch ( ClassLoadingException ignore ) { - LOG.unableToLocateUuidGenerationStrategy( strategyClassName ); + log.unableToLocateUuidGenerationStrategy( strategyClassName ); } } } diff --git a/hibernate-core/src/main/java/org/hibernate/id/UUIDHexGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/UUIDHexGenerator.java index a86390fb2b8e..724a64cdba77 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/UUIDHexGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/id/UUIDHexGenerator.java @@ -30,7 +30,8 @@ */ @Deprecated(since = "6") public class UUIDHexGenerator extends AbstractUUIDGenerator { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( UUIDHexGenerator.class ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( UUIDHexGenerator.class ); /** * The configuration parameter specifying the separator to use. @@ -44,7 +45,7 @@ public class UUIDHexGenerator extends AbstractUUIDGenerator { public UUIDHexGenerator() { if ( !WARNED ) { WARNED = true; - LOG.usingUuidHexGenerator( this.getClass().getName(), UUIDGenerator.class.getName() ); + log.usingUuidHexGenerator( this.getClass().getName(), UUIDGenerator.class.getName() ); } } diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/OptimizerFactory.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/OptimizerFactory.java index 2085b797f987..7c973a354b40 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/OptimizerFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/OptimizerFactory.java @@ -4,14 +4,13 @@ */ package org.hibernate.id.enhanced; -import java.lang.invoke.MethodHandles; import java.lang.reflect.Constructor; import java.util.Properties; import org.hibernate.cfg.AvailableSettings; +import org.hibernate.internal.CoreLogging; import org.hibernate.internal.CoreMessageLogger; -import org.jboss.logging.Logger; import static org.hibernate.internal.util.StringHelper.isNotEmpty; @@ -21,11 +20,8 @@ * @author Steve Ebersole */ public class OptimizerFactory { - private static final CoreMessageLogger LOG = Logger.getMessageLogger( - MethodHandles.lookup(), - CoreMessageLogger.class, - OptimizerFactory.class.getName() - ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( OptimizerFactory.class ); private static final Class[] CTOR_SIG = new Class[] { Class.class, int.class }; @@ -35,7 +31,7 @@ private static Optimizer buildOptimizer(OptimizerDescriptor descriptor, Class optimizerClass = descriptor.getOptimizerClass(); } catch ( Throwable ignore ) { - LOG.unableToLocateCustomOptimizerClass( descriptor.getExternalName() ); + log.unableToLocateCustomOptimizerClass( descriptor.getExternalName() ); return buildFallbackOptimizer( returnClass, incrementSize ); } @@ -44,7 +40,7 @@ private static Optimizer buildOptimizer(OptimizerDescriptor descriptor, Class return ctor.newInstance( returnClass, incrementSize ); } catch ( Throwable ignore ) { - LOG.unableToInstantiateOptimizer( descriptor.getExternalName() ); + log.unableToInstantiateOptimizer( descriptor.getExternalName() ); } return buildFallbackOptimizer( returnClass, incrementSize ); diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/PooledLoOptimizer.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/PooledLoOptimizer.java index c6c5acdcc0b0..c0854a8bcf6d 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/PooledLoOptimizer.java +++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/PooledLoOptimizer.java @@ -7,12 +7,11 @@ import org.hibernate.HibernateException; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.id.IntegralDataTypeHolder; +import org.hibernate.internal.CoreLogging; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.sql.ast.tree.expression.Expression; -import org.jboss.logging.Logger; import java.io.Serializable; -import java.lang.invoke.MethodHandles; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.locks.Lock; @@ -27,11 +26,8 @@ * @see PooledOptimizer */ public class PooledLoOptimizer extends AbstractOptimizer { - private static final CoreMessageLogger LOG = Logger.getMessageLogger( - MethodHandles.lookup(), - CoreMessageLogger.class, - PooledLoOptimizer.class.getName() - ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( PooledLoOptimizer.class ); private static class GenerationState { // last value read from db source @@ -53,7 +49,7 @@ public PooledLoOptimizer(Class returnClass, int incrementSize) { if ( incrementSize < 1 ) { throw new HibernateException( "increment size cannot be less than 1" ); } - LOG.creatingPooledLoOptimizer( incrementSize, returnClass.getName() ); + log.creatingPooledLoOptimizer( incrementSize, returnClass.getName() ); } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/PooledLoThreadLocalOptimizer.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/PooledLoThreadLocalOptimizer.java index 977868a5f188..279b3c61a54b 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/PooledLoThreadLocalOptimizer.java +++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/PooledLoThreadLocalOptimizer.java @@ -7,12 +7,11 @@ import org.hibernate.HibernateException; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.id.IntegralDataTypeHolder; +import org.hibernate.internal.CoreLogging; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.sql.ast.tree.expression.Expression; -import org.jboss.logging.Logger; import java.io.Serializable; -import java.lang.invoke.MethodHandles; import java.util.HashMap; import java.util.Map; @@ -27,11 +26,8 @@ * @see PooledOptimizer */ public class PooledLoThreadLocalOptimizer extends AbstractOptimizer { - private static final CoreMessageLogger LOG = Logger.getMessageLogger( - MethodHandles.lookup(), - CoreMessageLogger.class, - PooledLoOptimizer.class.getName() - ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( PooledLoOptimizer.class ); private final ThreadLocal singleTenantState = ThreadLocal.withInitial( GenerationState::new ); private final ThreadLocal> multiTenantStates = ThreadLocal.withInitial( HashMap::new ); @@ -47,7 +43,7 @@ public PooledLoThreadLocalOptimizer(Class returnClass, int incrementSize) { if ( incrementSize < 1 ) { throw new HibernateException( "increment size cannot be less than 1" ); } - LOG.creatingPooledLoOptimizer( incrementSize, returnClass.getName() ); + log.creatingPooledLoOptimizer( incrementSize, returnClass.getName() ); } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/PooledOptimizer.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/PooledOptimizer.java index 9f942691f581..3641d00eb19d 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/PooledOptimizer.java +++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/PooledOptimizer.java @@ -7,16 +7,15 @@ import org.hibernate.HibernateException; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.id.IntegralDataTypeHolder; +import org.hibernate.internal.CoreLogging; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.metamodel.mapping.BasicValuedMapping; import org.hibernate.query.sqm.BinaryArithmeticOperator; import org.hibernate.sql.ast.tree.expression.BinaryArithmeticExpression; import org.hibernate.sql.ast.tree.expression.Expression; import org.hibernate.sql.ast.tree.expression.QueryLiteral; -import org.jboss.logging.Logger; import java.io.Serializable; -import java.lang.invoke.MethodHandles; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.locks.Lock; @@ -37,11 +36,8 @@ * @see PooledLoOptimizer */ public class PooledOptimizer extends AbstractOptimizer implements InitialValueAwareOptimizer { - private static final CoreMessageLogger log = Logger.getMessageLogger( - MethodHandles.lookup(), - CoreMessageLogger.class, - PooledOptimizer.class.getName() - ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( PooledOptimizer.class ); private static class GenerationState { private IntegralDataTypeHolder hiValue; diff --git a/hibernate-core/src/main/java/org/hibernate/integrator/internal/IntegratorServiceImpl.java b/hibernate-core/src/main/java/org/hibernate/integrator/internal/IntegratorServiceImpl.java index 37c13453a185..4dd160836ef9 100644 --- a/hibernate-core/src/main/java/org/hibernate/integrator/internal/IntegratorServiceImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/integrator/internal/IntegratorServiceImpl.java @@ -18,7 +18,8 @@ * @author Steve Ebersole */ public class IntegratorServiceImpl implements IntegratorService { - private static final Logger LOG = Logger.getLogger( IntegratorServiceImpl.class.getName() ); + + private static final Logger log = Logger.getLogger( IntegratorServiceImpl.class ); private final LinkedHashSet integrators = new LinkedHashSet<>(); @@ -45,8 +46,8 @@ public static IntegratorServiceImpl create(LinkedHashSet providedInt } private void addIntegrator(Integrator integrator) { - if ( LOG.isDebugEnabled() ) { - LOG.debugf( "Adding Integrator [%s]", integrator.getClass().getName() ); + if ( log.isDebugEnabled() ) { + log.debugf( "Adding Integrator [%s]", integrator.getClass().getName() ); } integrators.add( integrator ); } diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java index 697d9cf1fa08..e54850b9e859 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java @@ -165,7 +165,7 @@ * @author Chris Cranford */ public class SessionFactoryImpl implements SessionFactoryImplementor { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( SessionFactoryImpl.class ); + private static final CoreMessageLogger log = CoreLogging.messageLogger( SessionFactoryImpl.class ); private final String name; private final String jndiName; @@ -221,7 +221,7 @@ public SessionFactoryImpl( final MetadataImplementor bootMetamodel, final SessionFactoryOptions options, final BootstrapContext bootstrapContext) { - LOG.trace( "Building session factory" ); + log.trace( "Building session factory" ); typeConfiguration = bootstrapContext.getTypeConfiguration(); sessionFactoryOptions = options; @@ -238,7 +238,7 @@ public SessionFactoryImpl( jdbcServices = serviceRegistry.requireService( JdbcServices.class ); settings = getMaskedSettings( options, serviceRegistry ); - LOG.instantiatingFactory( uuid, settings ); + log.instantiatingFactory( uuid, settings ); sqlStringGenerationContext = createSqlStringGenerationContext( bootMetamodel, options, jdbcServices ); @@ -340,13 +340,13 @@ public SessionFactoryImpl( close(); } catch (Exception closeException) { - LOG.trace( "Eating error closing factory after failed instantiation" ); + log.trace( "Eating error closing factory after failed instantiation" ); } throw e; } - if ( LOG.isTraceEnabled() ) { - LOG.trace( "Instantiated factory: " + uuid ); + if ( log.isTraceEnabled() ) { + log.trace( "Instantiated factory: " + uuid ); } } @@ -762,7 +762,7 @@ public Interceptor getInterceptor() { @Override public Reference getReference() { // from javax.naming.Referenceable - LOG.trace( "Returning a Reference to the factory" ); + log.trace( "Returning a Reference to the factory" ); return new Reference( SessionFactoryImpl.class.getName(), new StringRefAddr( "uuid", getUuid() ), @@ -793,7 +793,7 @@ public void close() { throw new IllegalStateException( "EntityManagerFactory is already closed" ); } - LOG.trace( "Already closed" ); + log.trace( "Already closed" ); return; } @@ -801,7 +801,7 @@ public void close() { } try { - LOG.closingFactory( getUuid() ); + log.closingFactory( getUuid() ); observer.sessionFactoryClosing( this ); // NOTE: the null checks below handle cases where close is called @@ -1037,7 +1037,7 @@ private CurrentSessionContext createSessionContext(String sessionContextType) { .newInstance( this ); } catch ( Throwable t ) { - LOG.unableToConstructCurrentSessionContext( sessionContextType, t ); + log.unableToConstructCurrentSessionContext( sessionContextType, t ); return null; } } @@ -1595,9 +1595,9 @@ boolean connectionProviderHandlesConnectionSchema() { */ @Serial private void writeObject(ObjectOutputStream out) throws IOException { - LOG.serializingFactory( getUuid() ); + log.serializingFactory( getUuid() ); out.defaultWriteObject(); - LOG.trace( "Serialized factory" ); + log.trace( "Serialized factory" ); } /** @@ -1610,9 +1610,9 @@ private void writeObject(ObjectOutputStream out) throws IOException { */ @Serial private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException { - LOG.trace( "Deserializing factory" ); + log.trace( "Deserializing factory" ); in.defaultReadObject(); - LOG.deserializedFactory( getUuid() ); + log.deserializedFactory( getUuid() ); } /** @@ -1628,7 +1628,7 @@ private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundE */ @Serial private Object readResolve() throws InvalidObjectException { - LOG.trace( "Resolving serialized factory" ); + log.trace( "Resolving serialized factory" ); return locateSessionFactoryOnDeserialization( getUuid(), name ); } @@ -1636,8 +1636,8 @@ private static SessionFactory locateSessionFactoryOnDeserialization(String uuid, throws InvalidObjectException{ final SessionFactory uuidResult = SessionFactoryRegistry.INSTANCE.getSessionFactory( uuid ); if ( uuidResult != null ) { - if ( LOG.isTraceEnabled() ) { - LOG.trace( "Resolved factory by UUID: " + uuid ); + if ( log.isTraceEnabled() ) { + log.trace( "Resolved factory by UUID: " + uuid ); } return uuidResult; } @@ -1647,8 +1647,8 @@ private static SessionFactory locateSessionFactoryOnDeserialization(String uuid, if ( name != null ) { final SessionFactory namedResult = SessionFactoryRegistry.INSTANCE.getNamedSessionFactory( name ); if ( namedResult != null ) { - if ( LOG.isTraceEnabled() ) { - LOG.trace( "Resolved factory by name: " + name ); + if ( log.isTraceEnabled() ) { + log.trace( "Resolved factory by name: " + name ); } return namedResult; } @@ -1679,7 +1679,7 @@ void serialize(ObjectOutputStream oos) throws IOException { * @throws IOException indicates problems reading back serial data stream */ static SessionFactoryImpl deserialize(ObjectInputStream ois) throws IOException { - LOG.trace( "Resolving factory from deserialized session" ); + log.trace( "Resolving factory from deserialized session" ); final String uuid = ois.readUTF(); boolean isNamed = ois.readBoolean(); final String name = isNamed ? ois.readUTF() : null; diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryRegistry.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryRegistry.java index 368955923885..52c90ff90d85 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryRegistry.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryRegistry.java @@ -30,7 +30,7 @@ * @author Steve Ebersole */ public class SessionFactoryRegistry { - private static final SessionFactoryRegistryMessageLogger LOG = SessionFactoryRegistryMessageLogger.INSTANCE; + private static final SessionFactoryRegistryMessageLogger log = SessionFactoryRegistryMessageLogger.INSTANCE; /** * Singleton access @@ -48,7 +48,7 @@ public class SessionFactoryRegistry { private final ConcurrentHashMap nameUuidXref = new ConcurrentHashMap<>(); private SessionFactoryRegistry() { - LOG.tracef( "Initializing SessionFactoryRegistry @%s", hashCode() ); + log.tracef( "Initializing SessionFactoryRegistry @%s", hashCode() ); } /** @@ -70,14 +70,14 @@ public void addSessionFactory( throw new IllegalArgumentException( "SessionFactory UUID cannot be null" ); } - LOG.registeringSessionFactory( uuid, name == null ? "" : name ); + log.registeringSessionFactory( uuid, name == null ? "" : name ); sessionFactoryMap.put( uuid, instance ); if ( name != null ) { nameUuidXref.put( name, uuid ); } if ( jndiName == null ) { - LOG.notBindingSessionFactory(); + log.notBindingSessionFactory(); return; } @@ -86,21 +86,21 @@ public void addSessionFactory( private void bindToJndi(String jndiName, SessionFactoryImplementor instance, JndiService jndiService) { try { - LOG.attemptingToBindFactoryToJndi( jndiName ); + log.attemptingToBindFactoryToJndi( jndiName ); jndiService.bind( jndiName, instance ); - LOG.factoryBoundToJndiName( jndiName ); + log.factoryBoundToJndiName( jndiName ); try { jndiService.addListener( jndiName, listener ); } catch (Exception e) { - LOG.couldNotBindJndiListener(); + log.couldNotBindJndiListener(); } } catch (JndiNameException e) { - LOG.invalidJndiName( jndiName, e ); + log.invalidJndiName( jndiName, e ); } catch (JndiException e) { - LOG.unableToBindFactoryToJndi( e ); + log.unableToBindFactoryToJndi( e ); } } @@ -123,15 +123,15 @@ public void removeSessionFactory( if ( jndiName != null ) { try { - LOG.attemptingToUnbindFactoryFromJndi( jndiName ); + log.attemptingToUnbindFactoryFromJndi( jndiName ); jndiService.unbind( jndiName ); - LOG.factoryUnboundFromJndiName( jndiName ); + log.factoryUnboundFromJndiName( jndiName ); } catch (JndiNameException e) { - LOG.invalidJndiName( jndiName, e ); + log.invalidJndiName( jndiName, e ); } catch (JndiException e) { - LOG.unableToUnbindFactoryFromJndi( e ); + log.unableToUnbindFactoryFromJndi( e ); } } @@ -146,18 +146,18 @@ public void removeSessionFactory( * @return The SessionFactory */ public SessionFactoryImplementor getNamedSessionFactory(String name) { - LOG.tracef( "Lookup: name=%s", name ); + log.tracef( "Lookup: name=%s", name ); final String uuid = nameUuidXref.get( name ); // protect against NPE -- see HHH-8428 return uuid == null ? null : getSessionFactory( uuid ); } public SessionFactoryImplementor getSessionFactory(String uuid) { - LOG.tracef( "Lookup: uid=%s", uuid ); + log.tracef( "Lookup: uid=%s", uuid ); final SessionFactoryImplementor sessionFactory = sessionFactoryMap.get( uuid ); - if ( sessionFactory == null && LOG.isDebugEnabled() ) { - LOG.debugf( "Not found: %s", uuid ); - LOG.debug( sessionFactoryMap.toString() ); + if ( sessionFactory == null && log.isDebugEnabled() ) { + log.debugf( "Not found: %s", uuid ); + log.debug( sessionFactoryMap.toString() ); } return sessionFactory; } @@ -196,15 +196,15 @@ public void clearRegistrations() { private final NamespaceChangeListener listener = new NamespaceChangeListener() { @Override public void objectAdded(NamingEvent evt) { - if ( LOG.isDebugEnabled() ) { - LOG.factoryBoundToJndi( evt.getNewBinding().getName() ); + if ( log.isDebugEnabled() ) { + log.factoryBoundToJndi( evt.getNewBinding().getName() ); } } @Override public void objectRemoved(NamingEvent evt) { final String jndiName = evt.getOldBinding().getName(); - LOG.factoryUnboundFromName( jndiName ); + log.factoryUnboundFromName( jndiName ); final String uuid = nameUuidXref.remove( jndiName ); //noinspection StatementWithEmptyBody @@ -220,23 +220,23 @@ public void objectRemoved(NamingEvent evt) { public void objectRenamed(NamingEvent evt) { final String oldJndiName = evt.getOldBinding().getName(); final String newJndiName = evt.getNewBinding().getName(); - LOG.factoryJndiRename( oldJndiName, newJndiName ); + log.factoryJndiRename( oldJndiName, newJndiName ); final String uuid = nameUuidXref.remove( oldJndiName ); nameUuidXref.put( newJndiName, uuid ); } @Override public void namingExceptionThrown(NamingExceptionEvent evt) { - LOG.namingExceptionAccessingFactory( evt.getException() ); + log.namingExceptionAccessingFactory( evt.getException() ); } }; public static class ObjectFactoryImpl implements ObjectFactory { @Override public Object getObjectInstance(Object reference, Name name, Context nameCtx, Hashtable environment) { - LOG.tracef( "JNDI lookup: %s", name ); + log.tracef( "JNDI lookup: %s", name ); final String uuid = (String) ( (Reference) reference ).get( 0 ).getContent(); - LOG.tracef( "Resolved to UUID = %s", uuid ); + log.tracef( "Resolved to UUID = %s", uuid ); return INSTANCE.getSessionFactory( uuid ); } } diff --git a/hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java index 50c11bb96d05..374efb18c443 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java @@ -110,7 +110,8 @@ * @author Steve Ebersole */ public class StatelessSessionImpl extends AbstractSharedSessionContract implements StatelessSession { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( StatelessSessionImpl.class ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( StatelessSessionImpl.class ); public static final MultiIdLoadOptions MULTI_ID_LOAD_OPTIONS = new MultiLoadOptions(); @@ -907,8 +908,8 @@ public void refresh(String entityName, Object entity, LockMode lockMode) { checkOpen(); final var persister = getEntityPersister( entityName, entity ); final Object id = persister.getIdentifier( entity, this ); - if ( LOG.isTraceEnabled() ) { - LOG.tracev( "Refreshing transient {0}", infoString( persister, id, getFactory() ) ); + if ( log.isTraceEnabled() ) { + log.tracev( "Refreshing transient {0}", infoString( persister, id, getFactory() ) ); } if ( persister.canWriteToCache() ) { @@ -954,19 +955,19 @@ public void initializeCollection(PersistentCollection collection, boolean wri if ( !collection.wasInitialized() ) { final var loadedPersister = ce.getLoadedPersister(); final Object loadedKey = ce.getLoadedKey(); - if ( LOG.isTraceEnabled() ) { - LOG.trace( "Initializing collection " + if ( log.isTraceEnabled() ) { + log.trace( "Initializing collection " + collectionInfoString( loadedPersister, collection, loadedKey, this ) ); } final boolean foundInCache = initializeCollectionFromCache( loadedKey, loadedPersister, collection, this ); if ( foundInCache ) { - LOG.trace( "Collection initialized from cache" ); + log.trace( "Collection initialized from cache" ); } else { loadedPersister.initialize( loadedKey, this ); handlePotentiallyEmptyCollection( collection, persistenceContext, loadedKey, loadedPersister ); - LOG.trace( "Collection initialized" ); + log.trace( "Collection initialized" ); final var statistics = getStatistics(); if ( statistics.isStatisticsEnabled() ) { statistics.fetchCollection( loadedPersister.getRole() ); @@ -1020,9 +1021,9 @@ public Object internalLoad( final Object proxy = holder == null ? null : holder.getProxy(); if ( proxy != null ) { - LOG.trace( "Entity proxy found in session cache" ); - if ( LOG.isDebugEnabled() && extractLazyInitializer( proxy ).isUnwrap() ) { - LOG.debug( "Ignoring NO_PROXY to honor laziness" ); + log.trace( "Entity proxy found in session cache" ); + if ( log.isDebugEnabled() && extractLazyInitializer( proxy ).isUnwrap() ) { + log.debug( "Ignoring NO_PROXY to honor laziness" ); } return persistenceContext.narrowProxy( proxy, persister, entityKey, null ); @@ -1031,7 +1032,7 @@ public Object internalLoad( // specialized handling for entities with subclasses with a HibernateProxy factory if ( persister.hasSubclasses() ) { // entities with subclasses that define a ProxyFactory can create a HibernateProxy. - LOG.trace( "Creating a HibernateProxy for to-one association with subclasses to honor laziness" ); + log.trace( "Creating a HibernateProxy for to-one association with subclasses to honor laziness" ); return createProxy( entityKey ); } return enhancementMetadata.createEnhancedProxy( entityKey, false, this ); @@ -1128,13 +1129,13 @@ else if ( association instanceof PersistentCollection collection ) { final boolean foundInCache = initializeCollectionFromCache( key, collectionDescriptor, collection, this ); if ( foundInCache ) { - LOG.trace( "Collection fetched from cache" ); + log.trace( "Collection fetched from cache" ); } else { collectionDescriptor.initialize( key, this ); handlePotentiallyEmptyCollection( collection, getPersistenceContextInternal(), key, collectionDescriptor ); - LOG.trace( "Collection fetched" ); + log.trace( "Collection fetched" ); final var statistics = getStatistics(); if ( statistics.isStatisticsEnabled() ) { statistics.fetchCollection( collectionDescriptor.getRole() ); @@ -1318,7 +1319,7 @@ private void processAfterCompletions(boolean successful) { completion.doAfterTransactionCompletion( successful, this ); } catch (CacheException ce) { - LOG.unableToReleaseCacheLock( ce ); + log.unableToReleaseCacheLock( ce ); // continue loop } catch (Exception e) { diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/EntityPrinter.java b/hibernate-core/src/main/java/org/hibernate/internal/util/EntityPrinter.java index aa000e8cc549..ce3929112f0a 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/EntityPrinter.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/EntityPrinter.java @@ -25,7 +25,8 @@ * @author Gavin King */ public final class EntityPrinter { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( EntityPrinter.class ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( EntityPrinter.class ); private final SessionFactoryImplementor factory; @@ -98,8 +99,8 @@ public String toString(Map namedTypedValues) throws Hibernat // Cannot use Map as an argument because it clashes with the previous method (due to type erasure) public void logEntities(Iterable> entitiesByEntityKey) throws HibernateException { - if ( LOG.isDebugEnabled() && entitiesByEntityKey.iterator().hasNext() ) { - LOG.debug( "Listing entities:" ); + if ( log.isDebugEnabled() && entitiesByEntityKey.iterator().hasNext() ) { + log.debug( "Listing entities:" ); int i = 0; for ( Map.Entry entityKeyAndEntity : entitiesByEntityKey ) { final EntityHolder holder = entityKeyAndEntity.getValue(); @@ -107,10 +108,10 @@ public void logEntities(Iterable> entitiesByE continue; } if ( i++ > 20 ) { - LOG.debug( "More......" ); + log.debug( "More......" ); break; } - LOG.debug( toString( entityKeyAndEntity.getKey().getEntityName(), holder.getEntity() ) ); + log.debug( toString( entityKeyAndEntity.getKey().getEntityName(), holder.getEntity() ) ); } } } diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/SerializationHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/SerializationHelper.java index b7498d27e4c5..f17e2d4cabf9 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/SerializationHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/SerializationHelper.java @@ -42,7 +42,8 @@ * @since 1.0 */ public final class SerializationHelper { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( SerializationHelper.class ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( SerializationHelper.class ); private SerializationHelper() { } @@ -66,7 +67,7 @@ private SerializationHelper() { * @throws SerializationException (runtime) if the serialization fails */ public static Object clone(Serializable object) throws SerializationException { - LOG.trace( "Starting clone through serialization" ); + log.trace( "Starting clone through serialization" ); if ( object == null ) { return null; } @@ -97,12 +98,12 @@ public static void serialize(Serializable obj, OutputStream outputStream) throws throw new IllegalArgumentException( "The OutputStream must not be null" ); } - if ( LOG.isTraceEnabled() ) { + if ( log.isTraceEnabled() ) { if ( Hibernate.isInitialized( obj ) ) { - LOG.tracev( "Starting serialization of object [{0}]", obj ); + log.tracev( "Starting serialization of object [{0}]", obj ); } else { - LOG.trace( "Starting serialization of [uninitialized proxy]" ); + log.trace( "Starting serialization of [uninitialized proxy]" ); } } @@ -196,7 +197,7 @@ public static T doDeserialize( throw new IllegalArgumentException( "The InputStream must not be null" ); } - LOG.trace( "Starting deserialization of object" ); + log.trace( "Starting deserialization of object" ); try ( var in = new CustomObjectInputStream( inputStream, loader, fallbackLoader1, fallbackLoader2 ) ) { //noinspection unchecked @@ -278,13 +279,13 @@ private CustomObjectInputStream( @Override protected Class resolveClass(ObjectStreamClass v) throws IOException, ClassNotFoundException { final String className = v.getName(); - LOG.tracev( "Attempting to locate class [{0}]", className ); + log.tracev( "Attempting to locate class [{0}]", className ); try { return Class.forName( className, false, loader1 ); } catch (ClassNotFoundException e) { - LOG.trace( "Unable to locate class using given classloader" ); + log.trace( "Unable to locate class using given classloader" ); } if ( !Objects.equals( loader1, loader2 ) ) { @@ -292,7 +293,7 @@ protected Class resolveClass(ObjectStreamClass v) throws IOException, ClassNo return Class.forName( className, false, loader2 ); } catch (ClassNotFoundException e) { - LOG.trace( "Unable to locate class using given classloader" ); + log.trace( "Unable to locate class using given classloader" ); } } @@ -301,7 +302,7 @@ protected Class resolveClass(ObjectStreamClass v) throws IOException, ClassNo return Class.forName( className, false, loader3 ); } catch (ClassNotFoundException e) { - LOG.trace( "Unable to locate class using given classloader" ); + log.trace( "Unable to locate class using given classloader" ); } } diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/xml/DTDEntityResolver.java b/hibernate-core/src/main/java/org/hibernate/internal/util/xml/DTDEntityResolver.java index b9a10ce671aa..14c017774583 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/xml/DTDEntityResolver.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/xml/DTDEntityResolver.java @@ -6,12 +6,11 @@ import java.io.InputStream; import java.io.Serializable; -import java.lang.invoke.MethodHandles; +import org.hibernate.internal.CoreLogging; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.util.ConfigHelper; -import org.jboss.logging.Logger; import org.xml.sax.EntityResolver; import org.xml.sax.InputSource; @@ -43,7 +42,7 @@ @Deprecated public class DTDEntityResolver implements EntityResolver, Serializable { - private static final CoreMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, DTDEntityResolver.class.getName() ); + private static final CoreMessageLogger log = CoreLogging.messageLogger( DTDEntityResolver.class ); private static final String HIBERNATE_NAMESPACE = "http://www.hibernate.org/dtd/"; private static final String OLD_HIBERNATE_NAMESPACE = "http://hibernate.sourceforge.net/"; @@ -52,25 +51,25 @@ public class DTDEntityResolver implements EntityResolver, Serializable { public InputSource resolveEntity(String publicId, String systemId) { InputSource source = null; // returning null triggers default behavior if ( systemId != null ) { - LOG.debugf( "Trying to resolve system-id [%s]", systemId ); + log.debugf( "Trying to resolve system-id [%s]", systemId ); if ( systemId.startsWith( HIBERNATE_NAMESPACE ) ) { - LOG.debug( "Recognized hibernate namespace; attempting to resolve on classpath under org/hibernate/" ); + log.debug( "Recognized hibernate namespace; attempting to resolve on classpath under org/hibernate/" ); source = resolveOnClassPath( publicId, systemId, HIBERNATE_NAMESPACE ); } else if ( systemId.startsWith( OLD_HIBERNATE_NAMESPACE ) ) { - LOG.recognizedObsoleteHibernateNamespace( OLD_HIBERNATE_NAMESPACE, HIBERNATE_NAMESPACE ); - LOG.debug( "Attempting to resolve on classpath under org/hibernate/" ); + log.recognizedObsoleteHibernateNamespace( OLD_HIBERNATE_NAMESPACE, HIBERNATE_NAMESPACE ); + log.debug( "Attempting to resolve on classpath under org/hibernate/" ); source = resolveOnClassPath( publicId, systemId, OLD_HIBERNATE_NAMESPACE ); } else if ( systemId.startsWith( USER_NAMESPACE ) ) { - LOG.debug( "Recognized local namespace; attempting to resolve on classpath" ); + log.debug( "Recognized local namespace; attempting to resolve on classpath" ); String path = systemId.substring( USER_NAMESPACE.length() ); InputStream stream = resolveInLocalNamespace( path ); if ( stream == null ) { - LOG.debugf( "Unable to locate [%s] on classpath", systemId ); + log.debugf( "Unable to locate [%s] on classpath", systemId ); } else { - LOG.debugf( "Located [%s] on classpath", systemId ); + log.debugf( "Located [%s] on classpath", systemId ); source = new InputSource( stream ); source.setPublicId( publicId ); source.setSystemId( systemId ); @@ -85,13 +84,13 @@ private InputSource resolveOnClassPath(String publicId, String systemId, String String path = "org/hibernate/" + systemId.substring( namespace.length() ); InputStream dtdStream = resolveInHibernateNamespace( path ); if ( dtdStream == null ) { - LOG.debugf( "Unable to locate [%s] on classpath", systemId ); + log.debugf( "Unable to locate [%s] on classpath", systemId ); if ( systemId.substring( namespace.length() ).contains("2.0") ) { - LOG.usingOldDtd(); + log.usingOldDtd(); } } else { - LOG.debugf( "Located [%s] on classpath", systemId ); + log.debugf( "Located [%s] on classpath", systemId ); source = new InputSource( dtdStream ); source.setPublicId( publicId ); source.setSystemId( systemId ); diff --git a/hibernate-core/src/main/java/org/hibernate/jdbc/Expectations.java b/hibernate-core/src/main/java/org/hibernate/jdbc/Expectations.java index b05dde846514..eeff3d88a4d3 100644 --- a/hibernate-core/src/main/java/org/hibernate/jdbc/Expectations.java +++ b/hibernate-core/src/main/java/org/hibernate/jdbc/Expectations.java @@ -24,7 +24,8 @@ * @author Steve Ebersole */ public class Expectations { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( Expectations.class ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( Expectations.class ); static final SqlExceptionHelper sqlExceptionHelper = new SqlExceptionHelper( false ); @@ -69,7 +70,7 @@ static void checkBatched(int expectedRowCount, int rowCount, int batchPosition, case EXECUTE_FAILED: throw new BatchFailedException( "Batch update failed: " + batchPosition ); case SUCCESS_NO_INFO: - LOG.debugf( "Success of batch update unknown: %s", batchPosition ); + log.debugf( "Success of batch update unknown: %s", batchPosition ); break; default: if ( expectedRowCount > rowCount ) { diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/LogHelper.java b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/LogHelper.java index 5ae85996e0e4..540cdc439ebd 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/LogHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/LogHelper.java @@ -4,23 +4,23 @@ */ package org.hibernate.jpa.internal.util; -import java.lang.invoke.MethodHandles; import java.net.URL; import java.util.Enumeration; import java.util.List; import java.util.Properties; +import org.hibernate.internal.CoreLogging; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.jpa.boot.spi.PersistenceUnitDescriptor; -import org.jboss.logging.Logger; /** * @author Emmanuel Bernard * @author Steve Ebersole */ public final class LogHelper { - private static final CoreMessageLogger log = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, LogHelper.class.getName() ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( LogHelper.class ); private LogHelper() { } diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/RootClass.java b/hibernate-core/src/main/java/org/hibernate/mapping/RootClass.java index d7e9ed3c1f45..1b1f9f009e62 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/RootClass.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/RootClass.java @@ -26,7 +26,8 @@ * @author Gavin King */ public final class RootClass extends PersistentClass implements TableOwner, SoftDeletable { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( RootClass.class ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( RootClass.class ); private Property identifierProperty; private KeyValue identifier; @@ -333,10 +334,10 @@ private void checkCompositeIdentifier() { final Class idClass = id.getComponentClass(); if ( idClass != null ) { if ( !overridesEquals( idClass ) ) { - LOG.compositeIdClassDoesNotOverrideEquals( idClass.getName() ); + log.compositeIdClassDoesNotOverrideEquals( idClass.getName() ); } else if ( !overridesHashCode( idClass ) ) { - LOG.compositeIdClassDoesNotOverrideHashCode( idClass.getName() ); + log.compositeIdClassDoesNotOverrideHashCode( idClass.getName() ); } } } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorPojoStandard.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorPojoStandard.java index 5056f849e143..32f55e3934bd 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorPojoStandard.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorPojoStandard.java @@ -20,7 +20,8 @@ * Support for instantiating embeddables as POJO representation */ public class EmbeddableInstantiatorPojoStandard extends AbstractPojoInstantiator implements StandardEmbeddableInstantiator { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( EmbeddableInstantiatorPojoStandard.class ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( EmbeddableInstantiatorPojoStandard.class ); private final Supplier embeddableMappingAccess; private final Constructor constructor; @@ -36,7 +37,7 @@ protected static Constructor resolveConstructor(Class mappedPojoClass) { return getDefaultConstructor( mappedPojoClass ); } catch ( PropertyNotFoundException e ) { - LOG.noDefaultConstructor( mappedPojoClass.getName() ); + log.noDefaultConstructor( mappedPojoClass.getName() ); return null; } } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EntityInstantiatorPojoStandard.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EntityInstantiatorPojoStandard.java index 57642d938da7..dcf01cd31f93 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EntityInstantiatorPojoStandard.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EntityInstantiatorPojoStandard.java @@ -23,7 +23,8 @@ * Support for instantiating entity values as POJO representation */ public class EntityInstantiatorPojoStandard extends AbstractEntityInstantiatorPojo { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( EntityInstantiatorPojoStandard.class ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( EntityInstantiatorPojoStandard.class ); private final Class proxyInterface; private final boolean applyBytecodeInterception; @@ -56,7 +57,7 @@ protected static Constructor resolveConstructor(Class mappedPojoClass) { return getDefaultConstructor( mappedPojoClass); } catch ( PropertyNotFoundException e ) { - LOG.noDefaultConstructor( mappedPojoClass.getName() ); + log.noDefaultConstructor( mappedPojoClass.getName() ); return null; } } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EntityRepresentationStrategyMap.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EntityRepresentationStrategyMap.java index 14eb2596356b..7bbd16d934fe 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EntityRepresentationStrategyMap.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EntityRepresentationStrategyMap.java @@ -28,7 +28,8 @@ * @author Steve Ebersole */ public class EntityRepresentationStrategyMap implements EntityRepresentationStrategy { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( EntityRepresentationStrategyMap.class ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( EntityRepresentationStrategyMap.class ); private final JavaType> mapJavaType; @@ -62,7 +63,7 @@ private static ProxyFactory createProxyFactory(PersistentClass bootType) { return proxyFactory; } catch (HibernateException he) { - LOG.unableToCreateProxyFactory( bootType.getEntityName(), he ); + log.unableToCreateProxyFactory( bootType.getEntityName(), he ); return null; } } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EntityRepresentationStrategyPojoStandard.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EntityRepresentationStrategyPojoStandard.java index b91e55e2d5cb..3065238fe24e 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EntityRepresentationStrategyPojoStandard.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EntityRepresentationStrategyPojoStandard.java @@ -44,7 +44,8 @@ * @author Steve Ebersole */ public class EntityRepresentationStrategyPojoStandard implements EntityRepresentationStrategy { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( EntityRepresentationStrategyPojoStandard.class ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( EntityRepresentationStrategyPojoStandard.class ); private final JavaType mappedJtd; private final JavaType proxyJtd; @@ -208,7 +209,7 @@ private ProxyFactory createProxyFactory( } } catch (HibernateException he) { - LOG.unableToCreateProxyFactory( clazz.getName(), he ); + log.unableToCreateProxyFactory( clazz.getName(), he ); return null; } @@ -295,7 +296,7 @@ private static ProxyFactory instantiateProxyFactory( ); } catch (HibernateException he) { - LOG.unableToCreateProxyFactory( entityName, he ); + log.unableToCreateProxyFactory( entityName, he ); return null; } return proxyFactory; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/FetchOptionsHelper.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/FetchOptionsHelper.java index 81210afce5de..cefff4971b7d 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/FetchOptionsHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/FetchOptionsHelper.java @@ -24,7 +24,7 @@ */ public final class FetchOptionsHelper { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( FetchOptionsHelper.class ); + private static final CoreMessageLogger log = CoreLogging.messageLogger( FetchOptionsHelper.class ); private FetchOptionsHelper() { } @@ -101,7 +101,7 @@ public static FetchTiming determineFetchTiming( switch ( style ) { case JOIN: { if ( lazy ) { - LOG.fetchModeJoinWithLazyWarning( role ); + log.fetchModeJoinWithLazyWarning( role ); return FetchTiming.DELAYED; } return FetchTiming.IMMEDIATE; diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java index bdf1a9aef57c..680ac46dbf25 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java @@ -308,7 +308,7 @@ public abstract class AbstractEntityPersister implements EntityPersister, InFlightEntityMappingType, EntityMutationTarget, LazyPropertyInitializer, FetchProfileAffectee, Joinable { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( AbstractEntityPersister.class ); + private static final CoreMessageLogger log = CoreLogging.messageLogger( AbstractEntityPersister.class ); public static final String ENTITY_CLASS = "class"; public static final String VERSION_COLUMN_ALIAS = "version_"; @@ -1451,8 +1451,8 @@ private Object initializedLazyField( throw new HibernateException( "entity is not associated with the session: " + id ); } - if ( LOG.isTraceEnabled() ) { - LOG.tracev( + if ( log.isTraceEnabled() ) { + log.tracev( "Initializing lazy properties of: {0}, field access: {1}", infoString( this, id, getFactory() ), fieldName @@ -1596,7 +1596,7 @@ private Object initLazyProperties( SharedSessionContractImplementor session) { assert hasLazyProperties(); - LOG.tracef( "Initializing lazy properties from datastore (triggered for '%s')", fieldName ); + log.tracef( "Initializing lazy properties from datastore (triggered for '%s')", fieldName ); final var interceptor = asPersistentAttributeInterceptable( entity ).$$_hibernate_getInterceptor(); assert interceptor != null : "Expecting bytecode interceptor to be non-null"; @@ -1634,7 +1634,7 @@ private Object initLazyProperties( } } } - LOG.trace( "Done initializing lazy properties" ); + log.trace( "Done initializing lazy properties" ); return finalResult; } catch (JDBCException ex) { @@ -1695,7 +1695,7 @@ protected Object initializeLazyPropertiesFromCache( final SharedSessionContractImplementor session, final EntityEntry entry, final CacheEntry cacheEntry) { - LOG.trace( "Initializing lazy properties from second-level cache" ); + log.trace( "Initializing lazy properties from second-level cache" ); Object result = null; final var disassembledValues = cacheEntry.getDisassembledState(); for ( int j = 0; j < lazyPropertyNames.length; j++ ) { @@ -1713,7 +1713,7 @@ protected Object initializeLazyPropertiesFromCache( } } } - LOG.trace( "Done initializing lazy properties" ); + log.trace( "Done initializing lazy properties" ); return result; } @@ -2028,8 +2028,8 @@ public Object[] getDatabaseSnapshot(Object id, SharedSessionContractImplementor @Override public Object getIdByUniqueKey(Object key, String uniquePropertyName, SharedSessionContractImplementor session) { - if ( LOG.isTraceEnabled() ) { - LOG.tracef( "resolving unique key [%s] to identifier for entity [%s]", + if ( log.isTraceEnabled() ) { + log.tracef( "resolving unique key [%s] to identifier for entity [%s]", key, getEntityName() ); } @@ -2087,9 +2087,9 @@ private Object calculateNextVersion(Object id, Object currentVersion, SharedSess generatorForForceIncrement() // TODO: pass in owner entity .generate( session, null, currentVersion, FORCE_INCREMENT ); - if ( LOG.isTraceEnabled() ) { + if ( log.isTraceEnabled() ) { final var versionType = getVersionType(); - LOG.trace( + log.trace( "Forcing version increment [" + infoString( this, id, factory ) + "; " + versionType.toLoggableString( currentVersion, factory ) + " -> " + versionType.toLoggableString( nextVersion, factory ) + "]" @@ -2131,8 +2131,8 @@ else if ( isVersionGeneratedOnExecution() ) { @Override public Object getCurrentVersion(Object id, SharedSessionContractImplementor session) throws HibernateException { - if ( LOG.isTraceEnabled() ) { - LOG.tracev( "Getting version: {0}", infoString( this, id, getFactory() ) ); + if ( log.isTraceEnabled() ) { + log.tracev( "Getting version: {0}", infoString( this, id, getFactory() ) ); } final String versionSelectString = getVersionSelectString(); try { @@ -3507,8 +3507,8 @@ public Object load(Object id, Object optionalObject, LockOptions lockOptions, Sh private Object doLoad(Object id, Object optionalObject, LockOptions lockOptions, Boolean readOnly, SharedSessionContractImplementor session) throws HibernateException { - if ( LOG.isTraceEnabled() ) { - LOG.tracev( "Fetching entity: {0}", infoString( this, id, getFactory() ) ); + if ( log.isTraceEnabled() ) { + log.tracev( "Fetching entity: {0}", infoString( this, id, getFactory() ) ); } final SingleIdEntityLoader loader = determineLoaderToUse( session, lockOptions ); @@ -3723,10 +3723,10 @@ public boolean[] getPropertyUpdateability(Object entity) { } private void logDirtyProperties(int[] props) { - if ( LOG.isTraceEnabled() ) { + if ( log.isTraceEnabled() ) { for ( int prop : props ) { final String propertyName = getAttributeMapping( prop ).getAttributeName(); - LOG.trace( qualify( getEntityName(), propertyName ) + " is dirty" ); + log.trace( qualify( getEntityName(), propertyName ) + " is dirty" ); } } } @@ -4430,8 +4430,8 @@ protected void verifyHasNaturalId() { @Override public Object getNaturalIdentifierSnapshot(Object id, SharedSessionContractImplementor session) { verifyHasNaturalId(); - if ( LOG.isTraceEnabled() ) { - LOG.tracef( + if ( log.isTraceEnabled() ) { + log.tracef( "Getting current natural-id snapshot state for `%s#%s", getEntityName(), id diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPropertyMapping.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPropertyMapping.java index e6ed1c6536b8..170f07acc496 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPropertyMapping.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPropertyMapping.java @@ -40,7 +40,8 @@ @Deprecated(since = "6", forRemoval = true) @Remove class EntityPropertyMapping { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( EntityPropertyMapping.class ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( EntityPropertyMapping.class ); private final Map typesByPropertyPath = new HashMap<>(); private final AbstractEntityPersister persister; @@ -107,8 +108,8 @@ private void logDuplicateRegistration(String path, Type existingType, Type type) } private void logIncompatibleRegistration(String path, Type existingType, Type type) { - if ( LOG.isTraceEnabled() ) { - LOG.tracev( + if ( log.isTraceEnabled() ) { + log.tracev( "Skipped adding attribute [{1}] to base type [{0}] as more than one subtype defined the attribute using incompatible types (strictly speaking the attributes are not inherited); existing type = [{2}], incoming type = [{3}]", getEntityName(), path, diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinatorStandard.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinatorStandard.java index 0d4a44374031..25afa84af2e6 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinatorStandard.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinatorStandard.java @@ -71,7 +71,8 @@ * @author Steve Ebersole */ public class UpdateCoordinatorStandard extends AbstractMutationCoordinator implements UpdateCoordinator { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( UpdateCoordinatorStandard.class ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( UpdateCoordinatorStandard.class ); private final MutationOperationGroup staticUpdateGroup; private final BatchKey batchKey; @@ -655,7 +656,7 @@ private UpdateValuesAnalysisImpl analyzeUpdateValues( // In this case we check for exactly DirtynessStatus.DIRTY so to not log warnings when the user didn't get it wrong: if ( analysis.currentAttributeAnalysis.getDirtynessStatus() == AttributeAnalysis.DirtynessStatus.DIRTY ) { if ( !propertyUpdateability[attributeIndex] ) { - LOG.ignoreImmutablePropertyModification( attributeMapping.getAttributeName(), persister.getEntityName() ); + log.ignoreImmutablePropertyModification( attributeMapping.getAttributeName(), persister.getEntityName() ); } } } diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParamBindings.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParamBindings.java index 7a3027b412f9..15fa2f3c675f 100644 --- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParamBindings.java +++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParamBindings.java @@ -26,7 +26,8 @@ * @author Steve Ebersole */ public class ProcedureParamBindings implements QueryParameterBindings { - private static final Logger LOG = Logger.getLogger( QueryParameterBindings.class ); + + private static final Logger log = Logger.getLogger( QueryParameterBindings.class ); private final ProcedureParameterMetadataImpl parameterMetadata; private final SessionFactoryImplementor sessionFactory; @@ -104,11 +105,11 @@ private void validate(ProcedureParameterImplementor procParam) { if ( !getBinding( procParam ).isBound() ) { // depending on "pass nulls" this might be OK - for now, just log a warning if ( procParam.getPosition() != null ) { - LOG.debugf( "Procedure parameter at position %s is not bound", procParam.getPosition() ); + log.debugf( "Procedure parameter at position %s is not bound", procParam.getPosition() ); } else { - LOG.debugf( "Procedure parameter %s is not bound", procParam.getName() ); + log.debugf( "Procedure parameter %s is not bound", procParam.getName() ); } } } diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/spi/GetterMethodImpl.java b/hibernate-core/src/main/java/org/hibernate/property/access/spi/GetterMethodImpl.java index e8a2ad02ee3c..2962ce859b25 100644 --- a/hibernate-core/src/main/java/org/hibernate/property/access/spi/GetterMethodImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/property/access/spi/GetterMethodImpl.java @@ -29,7 +29,8 @@ */ @Internal public class GetterMethodImpl implements Getter { - private static final CoreMessageLogger LOG = messageLogger( GetterMethodImpl.class ); + + private static final CoreMessageLogger log = messageLogger( GetterMethodImpl.class ); private final Class containerClass; private final String propertyName; @@ -71,7 +72,7 @@ public GetterMethodImpl(Class containerClass, String propertyName, Method get //cannot occur } catch (IllegalArgumentException iae) { - LOG.illegalPropertyGetterArgument( containerClass.getName(), propertyName ); + log.illegalPropertyGetterArgument( containerClass.getName(), propertyName ); throw new PropertyAccessException( iae, "IllegalArgumentException occurred calling", diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/spi/SetterMethodImpl.java b/hibernate-core/src/main/java/org/hibernate/property/access/spi/SetterMethodImpl.java index 6d4f90db8b7f..a2eb2ef3689f 100644 --- a/hibernate-core/src/main/java/org/hibernate/property/access/spi/SetterMethodImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/property/access/spi/SetterMethodImpl.java @@ -24,7 +24,8 @@ */ @Internal public class SetterMethodImpl implements Setter { - private static final CoreMessageLogger LOG = messageLogger( SetterMethodImpl.class ); + + private static final CoreMessageLogger log = messageLogger( SetterMethodImpl.class ); private final Class containerClass; private final String propertyName; @@ -100,8 +101,8 @@ public void set(Object target, @Nullable Object value) { } else { final var expectedType = setterMethod.getParameterTypes()[0]; - LOG.illegalPropertySetterArgument( containerClass.getName(), propertyName ); - LOG.expectedType( expectedType.getName(), value == null ? null : value.getClass().getName() ); + log.illegalPropertySetterArgument( containerClass.getName(), propertyName ); + log.expectedType( expectedType.getName(), value == null ? null : value.getClass().getName() ); throw new PropertySetterAccessException( iae, containerClass, diff --git a/hibernate-core/src/main/java/org/hibernate/proxy/AbstractLazyInitializer.java b/hibernate-core/src/main/java/org/hibernate/proxy/AbstractLazyInitializer.java index 3e1d9f00e090..529616ee4665 100644 --- a/hibernate-core/src/main/java/org/hibernate/proxy/AbstractLazyInitializer.java +++ b/hibernate-core/src/main/java/org/hibernate/proxy/AbstractLazyInitializer.java @@ -10,11 +10,11 @@ import org.hibernate.SessionException; import org.hibernate.boot.spi.SessionFactoryOptions; import org.hibernate.engine.spi.EntityKey; +import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.internal.CoreLogging; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.SessionFactoryRegistry; -import org.hibernate.metamodel.spi.MappingMetamodelImplementor; import org.hibernate.persister.entity.EntityPersister; /** @@ -25,7 +25,8 @@ * @author Gavin King */ public abstract class AbstractLazyInitializer implements LazyInitializer { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( AbstractLazyInitializer.class ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( AbstractLazyInitializer.class ); private final String entityName; private Object id; @@ -77,20 +78,22 @@ public final Object getIdentifier() { return id; } - private MappingMetamodelImplementor getMappingMetamodel() { - return session.getFactory().getMappingMetamodel(); + private SessionFactoryImplementor getFactory() { + return session.getFactory(); } - private EntityPersister getEntityDescriptor() { - return getMappingMetamodel().getEntityDescriptor( entityName ); + public EntityPersister getEntityDescriptor() { + return getFactory().getMappingMetamodel().getEntityDescriptor( entityName ); } private SessionFactoryOptions getSessionFactoryOptions() { - return session.getFactory().getSessionFactoryOptions(); + return getFactory().getSessionFactoryOptions(); } private boolean isInitializeProxyWhenAccessingIdentifier() { - return session != null && getSessionFactoryOptions().getJpaCompliance().isJpaProxyComplianceEnabled(); + return session != null + && getSessionFactoryOptions().getJpaCompliance() + .isJpaProxyComplianceEnabled(); } @Override @@ -117,7 +120,7 @@ public final void setSession(SharedSessionContractImplementor session) throws Hi } else if ( isConnectedToSession() ) { //TODO: perhaps this should be some other RuntimeException... - LOG.attemptToAssociateProxyWithTwoOpenSessions( entityName, id ); + log.attemptToAssociateProxyWithTwoOpenSessions( entityName, id ); throw new HibernateException( "Illegally attempted to associate proxy [" + entityName + "#" + id + "] with two open sessions" ); } @@ -208,8 +211,10 @@ protected void permissiveInitialization() { session.getPersistenceContext().setDefaultReadOnly( true ); session.setHibernateFlushMode( FlushMode.MANUAL ); - final boolean isJTA = session.getTransactionCoordinator().getTransactionCoordinatorBuilder().isJta(); - + final boolean isJTA = + session.getTransactionCoordinator() + .getTransactionCoordinatorBuilder() + .isJta(); if ( !isJTA ) { // Explicitly handle the transactions only if we're not in // a JTA environment. A lazy loading temporary session can @@ -233,12 +238,12 @@ protected void permissiveInitialization() { session.close(); } catch (Exception e) { - LOG.warn( "Unable to close temporary session used to load lazy proxy associated to no session" ); + log.warn( "Unable to close temporary session used to load lazy proxy associated to no session" ); } } } catch (Exception e) { - LOG.error( "Initialization failure [" + entityName + "#" + id + "]", e ); + log.error( "Initialization failure [" + entityName + "#" + id + "]", e ); throw new LazyInitializationException( e.getMessage() ); } } @@ -262,8 +267,7 @@ else if ( session.isOpenOrWaitingForAutoClose() && session.isConnected() ) { */ public final void initializeWithoutLoadIfPossible() { if ( !initialized && session != null && session.isOpenOrWaitingForAutoClose() ) { - final var entityDescriptor = getMappingMetamodel().getEntityDescriptor( getEntityName() ); - final var key = session.generateEntityKey( getInternalIdentifier(), entityDescriptor ); + final var key = session.generateEntityKey( getInternalIdentifier(), getEntityDescriptor() ); final Object entity = session.getPersistenceContextInternal().getEntity( key ); if ( entity != null ) { setImplementation( entity ); @@ -279,16 +283,15 @@ protected void prepareForPossibleLoadingOutsideTransaction() { if ( session != null ) { allowLoadOutsideTransaction = getSessionFactoryOptions().isInitializeLazyStateOutsideTransactionsEnabled(); - if ( sessionFactoryUuid == null ) { // we're going to need the UUID even if the SessionFactory configuration doesn't // allow any operations on it, as we need it to match deserialized objects with // the originating SessionFactory: at very least it's useful to actually get // such configuration, so to know if such operation isn't allowed or configured otherwise. - sessionFactoryUuid = session.getFactory().getUuid(); + sessionFactoryUuid = getFactory().getUuid(); } if ( sessionFactoryName == null ) { - sessionFactoryName = session.getFactory().getName(); + sessionFactoryName = getFactory().getName(); } } } @@ -312,10 +315,9 @@ protected final boolean isConnectedToSession() { private Object getProxyOrNull() { final var entityKey = generateEntityKeyOrNull( getInternalIdentifier(), session, getEntityName() ); - if ( entityKey != null && session != null && session.isOpenOrWaitingForAutoClose() ) { - return session.getPersistenceContextInternal().getProxy( entityKey ); - } - return null; + return entityKey != null && session != null && session.isOpenOrWaitingForAutoClose() + ? session.getPersistenceContextInternal().getProxy( entityKey ) + : null; } @Override @@ -344,7 +346,7 @@ public String getImplementationEntityName() { } if ( getEntityDescriptor().hasSubclasses() ) { initialize(); - return session.getFactory().bestGuessEntityName( target ); + return getFactory().bestGuessEntityName( target ); } return entityName; } diff --git a/hibernate-core/src/main/java/org/hibernate/proxy/map/MapProxy.java b/hibernate-core/src/main/java/org/hibernate/proxy/map/MapProxy.java index 33dba08967ad..8afed965a6ac 100644 --- a/hibernate-core/src/main/java/org/hibernate/proxy/map/MapProxy.java +++ b/hibernate-core/src/main/java/org/hibernate/proxy/map/MapProxy.java @@ -21,77 +21,77 @@ @SuppressWarnings("rawtypes") public class MapProxy implements HibernateProxy, Map, Serializable { - private final MapLazyInitializer li; + private final MapLazyInitializer lazyInitializer; private Object replacement; - MapProxy(MapLazyInitializer li) { - this.li = li; + MapProxy(MapLazyInitializer lazyInitializer) { + this.lazyInitializer = lazyInitializer; } @Override public LazyInitializer getHibernateLazyInitializer() { - return li; + return lazyInitializer; } @Override public int size() { - return li.getMap().size(); + return lazyInitializer.getMap().size(); } @Override public void clear() { - li.getMap().clear(); + lazyInitializer.getMap().clear(); } @Override public boolean isEmpty() { - return li.getMap().isEmpty(); + return lazyInitializer.getMap().isEmpty(); } @Override public boolean containsKey(Object key) { - return li.getMap().containsKey(key); + return lazyInitializer.getMap().containsKey(key); } @Override public boolean containsValue(Object value) { - return li.getMap().containsValue(value); + return lazyInitializer.getMap().containsValue(value); } @Override public Collection values() { - return li.getMap().values(); + return lazyInitializer.getMap().values(); } @Override @SuppressWarnings("unchecked") public void putAll(Map map) { - li.getMap().putAll(map); + lazyInitializer.getMap().putAll(map); } @Override public Set entrySet() { - return li.getMap().entrySet(); + return lazyInitializer.getMap().entrySet(); } @Override public Set keySet() { - return li.getMap().keySet(); + return lazyInitializer.getMap().keySet(); } @Override public Object get(Object key) { - return li.getMap().get(key); + return lazyInitializer.getMap().get(key); } @Override public Object remove(Object key) { - return li.getMap().remove(key); + return lazyInitializer.getMap().remove(key); } @Override @SuppressWarnings("unchecked") public Object put(Object key, Object value) { - return li.getMap().put(key, value); + return lazyInitializer.getMap().put(key, value); } @Serial @@ -101,30 +101,30 @@ public Object writeReplace() { * If the target has already been loaded somewhere, just not set on the proxy, * then use it to initialize the proxy so that we will serialize that instead of the proxy. */ - li.initializeWithoutLoadIfPossible(); + lazyInitializer.initializeWithoutLoadIfPossible(); - if ( li.isUninitialized() ) { + if ( lazyInitializer.isUninitialized() ) { if ( replacement == null ) { - li.prepareForPossibleLoadingOutsideTransaction(); + lazyInitializer.prepareForPossibleLoadingOutsideTransaction(); replacement = serializableProxy(); } return replacement; } else { - return li.getImplementation(); + return lazyInitializer.getImplementation(); } } private Object serializableProxy() { return new SerializableMapProxy( - li.getEntityName(), - li.getInternalIdentifier(), - li.isReadOnlySettingAvailable() - ? Boolean.valueOf( li.isReadOnly() ) - : li.isReadOnlyBeforeAttachedToSession(), - li.getSessionFactoryUuid(), - li.getSessionFactoryName(), - li.isAllowLoadOutsideTransaction() + lazyInitializer.getEntityName(), + lazyInitializer.getInternalIdentifier(), + lazyInitializer.isReadOnlySettingAvailable() + ? Boolean.valueOf( lazyInitializer.isReadOnly() ) + : lazyInitializer.isReadOnlyBeforeAttachedToSession(), + lazyInitializer.getSessionFactoryUuid(), + lazyInitializer.getSessionFactoryName(), + lazyInitializer.isAllowLoadOutsideTransaction() ); } diff --git a/hibernate-core/src/main/java/org/hibernate/proxy/pojo/BasicLazyInitializer.java b/hibernate-core/src/main/java/org/hibernate/proxy/pojo/BasicLazyInitializer.java index 1f8960e14a4c..6d3c435be276 100644 --- a/hibernate-core/src/main/java/org/hibernate/proxy/pojo/BasicLazyInitializer.java +++ b/hibernate-core/src/main/java/org/hibernate/proxy/pojo/BasicLazyInitializer.java @@ -105,7 +105,6 @@ private Object getReplacement() { else { return getTarget(); } - } @Override @@ -118,16 +117,12 @@ public Class getImplementationClass() { if ( !isUninitialized() ) { return getImplementation().getClass(); } + else if ( getSession() == null ) { + throw new LazyInitializationException( "could not retrieve real entity class [" + + getEntityName() + "#" + getInternalIdentifier() + "] - no Session" ); + } else { - final var session = getSession(); - if ( session == null ) { - throw new LazyInitializationException( "could not retrieve real entity class [" - + getEntityName() + "#" + getInternalIdentifier() + "] - no Session" ); - } - final var entityDescriptor = - session.getFactory().getMappingMetamodel() - .getEntityDescriptor( getEntityName() ); - return entityDescriptor.hasSubclasses() + return getEntityDescriptor().hasSubclasses() ? getImplementation().getClass() : persistentClass; } diff --git a/hibernate-core/src/main/java/org/hibernate/proxy/pojo/bytebuddy/ByteBuddyInterceptor.java b/hibernate-core/src/main/java/org/hibernate/proxy/pojo/bytebuddy/ByteBuddyInterceptor.java index 9110f0a858ad..5f09d4c11472 100644 --- a/hibernate-core/src/main/java/org/hibernate/proxy/pojo/bytebuddy/ByteBuddyInterceptor.java +++ b/hibernate-core/src/main/java/org/hibernate/proxy/pojo/bytebuddy/ByteBuddyInterceptor.java @@ -16,8 +16,11 @@ import static org.hibernate.internal.CoreLogging.messageLogger; import static org.hibernate.internal.util.ReflectHelper.isPublic; -public class ByteBuddyInterceptor extends BasicLazyInitializer implements ProxyConfiguration.Interceptor { - private static final CoreMessageLogger LOG = messageLogger( ByteBuddyInterceptor.class ); +public class ByteBuddyInterceptor + extends BasicLazyInitializer + implements ProxyConfiguration.Interceptor { + + private static final CoreMessageLogger log = messageLogger( ByteBuddyInterceptor.class ); private final Class[] interfaces; @@ -63,7 +66,7 @@ public Object intercept(Object proxy, Method method, Object[] args) throws Throw return proxy; } else { - LOG.narrowingProxy( returnValueClass ); + log.narrowingProxy( returnValueClass ); } } return returnValue; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java index 5d5abf49f4ec..1165dd832ed7 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java @@ -185,7 +185,7 @@ */ public class SqmCriteriaNodeBuilder implements NodeBuilder, Serializable { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( SqmCriteriaNodeBuilder.class ); + private static final CoreMessageLogger log = CoreLogging.messageLogger( SqmCriteriaNodeBuilder.class ); private final String uuid; private final String name; @@ -3083,14 +3083,14 @@ public SqmPredicate exists(Subquery subQuery) { */ @Serial private Object readResolve() throws InvalidObjectException { - LOG.trace( "Resolving serialized SqmCriteriaNodeBuilder" ); + log.trace( "Resolving serialized SqmCriteriaNodeBuilder" ); return locateSessionFactoryOnDeserialization( uuid, name ).getCriteriaBuilder(); } private static SessionFactory locateSessionFactoryOnDeserialization(String uuid, String name) throws InvalidObjectException{ final SessionFactory uuidResult = SessionFactoryRegistry.INSTANCE.getSessionFactory( uuid ); if ( uuidResult != null ) { - LOG.tracef( "Resolved SessionFactory by UUID [%s]", uuid ); + log.tracef( "Resolved SessionFactory by UUID [%s]", uuid ); return uuidResult; } @@ -3099,7 +3099,7 @@ private static SessionFactory locateSessionFactoryOnDeserialization(String uuid, if ( name != null ) { final SessionFactory namedResult = SessionFactoryRegistry.INSTANCE.getNamedSessionFactory( name ); if ( namedResult != null ) { - LOG.tracef( "Resolved SessionFactory by name [%s]", name ); + log.tracef( "Resolved SessionFactory by name [%s]", name ); return namedResult; } } diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/internal/PatternRenderer.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/internal/PatternRenderer.java index 506fd0e80428..8f286af5afd9 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/internal/PatternRenderer.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/internal/PatternRenderer.java @@ -31,7 +31,8 @@ * @author Steve Ebersole */ public class PatternRenderer { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( PatternRenderer.class ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( PatternRenderer.class ); private final String[] chunks; private final int[] paramIndexes; @@ -187,7 +188,7 @@ private void render( SqlAstTranslator translator) { final int numberOfArguments = args.size(); if ( numberOfArguments < maxParamIndex ) { - LOG.missingArguments( maxParamIndex, numberOfArguments ); + log.missingArguments( maxParamIndex, numberOfArguments ); } final boolean caseWrapper = filter != null && !filterClauseSupported( translator ); diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaLogging.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaLogging.java index a931a90d20b8..2ca751e2c497 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaLogging.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaLogging.java @@ -35,7 +35,7 @@ public interface JtaLogging extends BasicLogger { String LOGGER_NAME = SubSystemLogging.BASE + ".jta"; - JtaLogging JTA_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), JtaLogging.class, LOGGER_NAME); + JtaLogging JTA_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), JtaLogging.class, LOGGER_NAME ); int NAMESPACE = 90007000; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/ResultsHelper.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/ResultsHelper.java index 349f7074b62e..e0438c211064 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/ResultsHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/ResultsHelper.java @@ -29,7 +29,7 @@ */ public class ResultsHelper { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( ResultsHelper.class ); + private static final CoreMessageLogger log = CoreLogging.messageLogger( ResultsHelper.class ); public static RowReader createRowReader( SessionFactoryImplementor sessionFactory, @@ -72,9 +72,9 @@ public static void finalizeCollectionLoading( statistics.loadCollection( collectionDescriptor.getRole() ); } - if ( LOG.isTraceEnabled() ) { - LOG.trace( "Collection fully initialized: " - + collectionInfoString( collectionDescriptor, collection, key, session ) ); + if ( log.isTraceEnabled() ) { + log.trace( "Collection fully initialized: " + + collectionInfoString( collectionDescriptor, collection, key, session ) ); } // todo (6.0) : there is other logic still needing to be implemented here. caching, etc @@ -136,15 +136,15 @@ private static void addCollectionToCache( Object key) { final var session = persistenceContext.getSession(); - if ( LOG.isTraceEnabled() ) { - LOG.trace( "Caching collection: " - + collectionInfoString( collectionDescriptor, collection, key, session ) ); + if ( log.isTraceEnabled() ) { + log.trace( "Caching collection: " + + collectionInfoString( collectionDescriptor, collection, key, session ) ); } if ( session.getLoadQueryInfluencers().hasEnabledFilters() && collectionDescriptor.isAffectedByEnabledFilters( session ) ) { // some filters affecting the collection are enabled on the session, so do not do the put into the cache. - LOG.debug( "Refusing to add to cache due to enabled filters" ); + log.debug( "Refusing to add to cache due to enabled filters" ); // todo : add the notion of enabled filters to the cache key to differentiate filtered collections from non-filtered; // DefaultInitializeCollectionEventHandler.initializeCollectionFromCache() (which makes sure to not read from // cache with enabled filters). @@ -157,7 +157,7 @@ private static void addCollectionToCache( final Object collectionOwner = getCollectionOwner( persistenceContext, collectionDescriptor, collection, key, session ); if ( collectionOwner == null ) { - LOG.debug( "Unable to resolve owner of loading collection for second level caching. Refusing to add to cache."); + log.debug( "Unable to resolve owner of loading collection for second level caching. Refusing to add to cache."); return; } version = persistenceContext.getEntry( collectionOwner ).getVersion(); 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 f2d3c9e8292a..273fc0c6119b 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 @@ -42,9 +42,8 @@ * @author Steve Ebersole */ public class DeferredResultSetAccess extends AbstractResultSetAccess { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( - DeferredResultSetAccess.class - ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( DeferredResultSetAccess.class ); private final JdbcOperationQuerySelect jdbcSelect; private final JdbcParameterBindings jdbcParameterBindings; @@ -137,7 +136,7 @@ private void handleFollowOnLocking(ExecutionContext executionContext, LockOption final LockMode lockMode = determineFollowOnLockMode( lockOptions ); if ( lockMode != LockMode.UPGRADE_SKIPLOCKED ) { if ( lockOptions.getLockMode() != LockMode.NONE ) { - LOG.usingFollowOnLocking(); + log.usingFollowOnLocking(); } final LockOptions lockOptionsToUse = new LockOptions( @@ -266,7 +265,7 @@ private void executeQuery() { final SharedSessionContractImplementor session = executionContext.getSession(); try { - LOG.tracef( "Executing query to retrieve ResultSet: %s", finalSql ); + log.tracef( "Executing query to retrieve ResultSet: %s", finalSql ); // prepare the query preparedStatement = statementCreator.createStatement( executionContext, finalSql ); diff --git a/hibernate-core/src/main/java/org/hibernate/stat/internal/AbstractCacheableDataStatistics.java b/hibernate-core/src/main/java/org/hibernate/stat/internal/AbstractCacheableDataStatistics.java index 5ca77cb0cb4a..ec3c0fa6affe 100644 --- a/hibernate-core/src/main/java/org/hibernate/stat/internal/AbstractCacheableDataStatistics.java +++ b/hibernate-core/src/main/java/org/hibernate/stat/internal/AbstractCacheableDataStatistics.java @@ -114,17 +114,13 @@ public void incrementCacheRemoveCount() { NullnessUtil.castNonNull( cacheRemoveCount ).increment(); } - protected void appendCacheStats(StringBuilder buf) { - buf.append( ",cacheRegion=" ).append( cacheRegionName ); - - if ( cacheRegionName == null ) { - return; + protected void appendCacheStats(StringBuilder text) { + text.append( ",cacheRegion=" ).append( cacheRegionName ); + if ( cacheRegionName != null ) { + text.append( ",cacheHitCount=" ).append( getCacheHitCount() ) + .append( ",cacheMissCount=" ).append( getCacheMissCount() ) + .append( ",cachePutCount=" ).append( getCachePutCount() ) + .append( ",cacheRemoveCount=" ).append( getCacheRemoveCount() ); } - - buf.append( ",cacheHitCount=" ).append( getCacheHitCount() ) - .append( ",cacheMissCount=" ).append( getCacheMissCount() ) - .append( ",cachePutCount=" ).append( getCachePutCount() ) - .append( ",cacheRemoveCount=" ).append( getCacheRemoveCount() ); - } } diff --git a/hibernate-core/src/main/java/org/hibernate/stat/internal/CacheRegionStatisticsImpl.java b/hibernate-core/src/main/java/org/hibernate/stat/internal/CacheRegionStatisticsImpl.java index f76ab27262a4..e39fc0fd8d04 100644 --- a/hibernate-core/src/main/java/org/hibernate/stat/internal/CacheRegionStatisticsImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/stat/internal/CacheRegionStatisticsImpl.java @@ -93,16 +93,15 @@ public void incrementRemoveCount() { @Override public String toString() { - String buf = "CacheRegionStatistics" + - "[region=" + region.getName() + - ",hitCount=" + this.hitCount + - ",missCount=" + this.missCount + - ",putCount=" + this.putCount + - ",removeCount=" + this.removeCount + - ",elementCountInMemory=" + this.getElementCountInMemory() + - ",elementCountOnDisk=" + this.getElementCountOnDisk() + - ",sizeInMemory=" + this.getSizeInMemory() + - ']'; - return buf; + return "CacheRegionStatistics" + + "[region=" + region.getName() + + ",hitCount=" + hitCount + + ",missCount=" + missCount + + ",putCount=" + putCount + + ",removeCount=" + removeCount + + ",elementCountInMemory=" + getElementCountInMemory() + + ",elementCountOnDisk=" + getElementCountOnDisk() + + ",sizeInMemory=" + getSizeInMemory() + + ']'; } } diff --git a/hibernate-core/src/main/java/org/hibernate/stat/internal/CollectionStatisticsImpl.java b/hibernate-core/src/main/java/org/hibernate/stat/internal/CollectionStatisticsImpl.java index 9ec6f949e737..2d8236d48003 100644 --- a/hibernate-core/src/main/java/org/hibernate/stat/internal/CollectionStatisticsImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/stat/internal/CollectionStatisticsImpl.java @@ -75,7 +75,7 @@ void incrementRemoveCount() { } public String toString() { - final StringBuilder buffer = new StringBuilder() + final var text = new StringBuilder() .append( "CollectionStatistics" ) .append( "[collectionRole=" ).append( collectionRole ) .append( ",loadCount=" ).append( this.loadCount ) @@ -83,7 +83,7 @@ public String toString() { .append( ",recreateCount=" ).append( this.recreateCount ) .append( ",removeCount=" ).append( this.removeCount ) .append( ",updateCount=" ).append( this.updateCount ); - appendCacheStats( buffer ); - return buffer.append(']').toString(); + appendCacheStats( text ); + return text.append(']').toString(); } } diff --git a/hibernate-core/src/main/java/org/hibernate/stat/internal/EntityStatisticsImpl.java b/hibernate-core/src/main/java/org/hibernate/stat/internal/EntityStatisticsImpl.java index 7ff2284d3a6b..a61fae46d312 100644 --- a/hibernate-core/src/main/java/org/hibernate/stat/internal/EntityStatisticsImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/stat/internal/EntityStatisticsImpl.java @@ -27,11 +27,10 @@ public class EntityStatisticsImpl extends AbstractCacheableDataStatistics implem private final LongAdder optimisticFailureCount = new LongAdder(); EntityStatisticsImpl(EntityPersister rootEntityDescriptor) { - super( - () -> rootEntityDescriptor.getCacheAccessStrategy() != null - ? rootEntityDescriptor.getCacheAccessStrategy().getRegion() - : null - ); + super( () -> { + final var cache = rootEntityDescriptor.getCacheAccessStrategy(); + return cache != null ? cache.getRegion() : null; + } ); this.rootEntityName = rootEntityDescriptor.getRootEntityName(); } @@ -92,7 +91,7 @@ void incrementOptimisticFailureCount() { } public String toString() { - final StringBuilder buffer = new StringBuilder() + final var text = new StringBuilder() .append( "EntityStatistics" ) .append( "[rootEntityName=" ).append( rootEntityName ) .append( ",loadCount=" ).append( this.loadCount ) @@ -102,7 +101,7 @@ public String toString() { .append( ",deleteCount=" ).append( this.deleteCount ) .append( ",fetchCount=" ).append( this.fetchCount ) .append( ",optimisticLockFailureCount=" ).append( this.optimisticFailureCount ); - appendCacheStats( buffer ); - return buffer.append( ']' ).toString(); + appendCacheStats( text ); + return text.append( ']' ).toString(); } } diff --git a/hibernate-core/src/main/java/org/hibernate/stat/internal/NaturalIdStatisticsImpl.java b/hibernate-core/src/main/java/org/hibernate/stat/internal/NaturalIdStatisticsImpl.java index 0c4a30635b01..b2735e0a2982 100644 --- a/hibernate-core/src/main/java/org/hibernate/stat/internal/NaturalIdStatisticsImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/stat/internal/NaturalIdStatisticsImpl.java @@ -30,15 +30,14 @@ public class NaturalIdStatisticsImpl extends AbstractCacheableDataStatistics imp private final Lock writeLock; NaturalIdStatisticsImpl(EntityPersister rootEntityDescriptor) { - super( - () -> rootEntityDescriptor.getNaturalIdCacheAccessStrategy() != null - ? rootEntityDescriptor.getNaturalIdCacheAccessStrategy().getRegion() - : null - ); - this.rootEntityName = rootEntityDescriptor.getRootEntityName(); + super( () -> { + final var cache = rootEntityDescriptor.getNaturalIdCacheAccessStrategy(); + return cache != null ? cache.getRegion() : null; + } ); + rootEntityName = rootEntityDescriptor.getRootEntityName(); final ReadWriteLock lock = new ReentrantReadWriteLock(); - this.readLock = lock.readLock(); - this.writeLock = lock.writeLock(); + readLock = lock.readLock(); + writeLock = lock.writeLock(); } /** @@ -46,7 +45,7 @@ public class NaturalIdStatisticsImpl extends AbstractCacheableDataStatistics imp */ @Override public long getExecutionCount() { - return this.executionCount.get(); + return executionCount.get(); } /** @@ -57,16 +56,16 @@ public long getExecutionAvgTime() { // We write lock here to be sure that we always calculate the average time // with all updates from the executed applied: executionCount and totalExecutionTime // both used in the calculation - this.writeLock.lock(); + writeLock.lock(); try { long avgExecutionTime = 0; if ( this.executionCount.get() > 0 ) { - avgExecutionTime = this.totalExecutionTime.get() / this.executionCount.get(); + avgExecutionTime = totalExecutionTime.get() / executionCount.get(); } return avgExecutionTime; } finally { - this.writeLock.unlock(); + writeLock.unlock(); } } @@ -75,7 +74,7 @@ public long getExecutionAvgTime() { */ @Override public long getExecutionMaxTime() { - return this.executionMaxTime.get(); + return executionMaxTime.get(); } /** @@ -83,39 +82,43 @@ public long getExecutionMaxTime() { */ @Override public long getExecutionMinTime() { - return this.executionMinTime.get(); + return executionMinTime.get(); } void queryExecuted(long time) { // read lock is enough, concurrent updates are supported by the underlying type AtomicLong // this only guards executed(long, long) to be called, when another thread is executing getExecutionAvgTime() - this.readLock.lock(); + readLock.lock(); try { - // Less chances for a context switch + // Less chance for a context switch //noinspection StatementWithEmptyBody - for ( long old = this.executionMinTime.get(); time < old && !this.executionMinTime.compareAndSet( old, time ); old = this.executionMinTime.get() ) { + for ( long old = executionMinTime.get(); + time < old && !executionMinTime.compareAndSet( old, time ); + old = executionMinTime.get() ) { } //noinspection StatementWithEmptyBody - for ( long old = this.executionMaxTime.get(); time > old && !this.executionMaxTime.compareAndSet( old, time ); old = this.executionMaxTime.get() ) { + for ( long old = executionMaxTime.get(); + time > old && !executionMaxTime.compareAndSet( old, time ); + old = executionMaxTime.get() ) { } - this.executionCount.getAndIncrement(); - this.totalExecutionTime.addAndGet( time ); + executionCount.getAndIncrement(); + totalExecutionTime.addAndGet( time ); } finally { - this.readLock.unlock(); + readLock.unlock(); } } @Override public String toString() { - final StringBuilder buf = new StringBuilder() + final var text = new StringBuilder() .append( "NaturalIdCacheStatistics" ) .append( "[rootEntityName=" ).append( rootEntityName ) .append( ",executionCount=" ).append( this.executionCount ) .append( ",executionAvgTime=" ).append( this.getExecutionAvgTime() ) .append( ",executionMinTime=" ).append( this.executionMinTime ) .append( ",executionMaxTime=" ).append( this.executionMaxTime ); - appendCacheStats( buf ); - return buf.append( ']' ).toString(); + appendCacheStats( text ); + return text.append( ']' ).toString(); } } diff --git a/hibernate-core/src/main/java/org/hibernate/stat/internal/QueryStatisticsImpl.java b/hibernate-core/src/main/java/org/hibernate/stat/internal/QueryStatisticsImpl.java index afa1c08068b1..38941a8211cd 100644 --- a/hibernate-core/src/main/java/org/hibernate/stat/internal/QueryStatisticsImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/stat/internal/QueryStatisticsImpl.java @@ -207,17 +207,17 @@ void incrementPlanCacheMissCount() { public String toString() { return "QueryStatistics" - + "[query=" + query - + ",cacheHitCount=" + this.cacheHitCount - + ",cacheMissCount=" + this.cacheMissCount - + ",cachePutCount=" + this.cachePutCount - + ",planCacheHitCount=" + this.planCacheHitCount - + ",planCacheMissCount=" + this.planCacheMissCount - + ",executionCount=" + this.executionCount - + ",executionRowCount=" + this.executionRowCount - + ",executionAvgTime=" + this.getExecutionAvgTime() - + ",executionMaxTime=" + this.executionMaxTime - + ",executionMinTime=" + this.executionMinTime - + ']'; + + "[query=" + query + + ",cacheHitCount=" + cacheHitCount + + ",cacheMissCount=" + cacheMissCount + + ",cachePutCount=" + cachePutCount + + ",planCacheHitCount=" + planCacheHitCount + + ",planCacheMissCount=" + planCacheMissCount + + ",executionCount=" + executionCount + + ",executionRowCount=" + executionRowCount + + ",executionAvgTime=" + getExecutionAvgTime() + + ",executionMaxTime=" + executionMaxTime + + ",executionMinTime=" + executionMinTime + + ']'; } } diff --git a/hibernate-core/src/main/java/org/hibernate/stat/internal/SessionStatisticsImpl.java b/hibernate-core/src/main/java/org/hibernate/stat/internal/SessionStatisticsImpl.java index a038004fb74a..a0ef1670f876 100644 --- a/hibernate-core/src/main/java/org/hibernate/stat/internal/SessionStatisticsImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/stat/internal/SessionStatisticsImpl.java @@ -38,10 +38,10 @@ public Set getCollectionKeys() { } public String toString() { - return "SessionStatistics[" + - "entity count=" + getEntityCount() + - ",collection count=" + getCollectionCount() + - ']'; + return "SessionStatistics[" + + "entity count=" + getEntityCount() + + ",collection count=" + getCollectionCount() + + ']'; } } diff --git a/hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsImpl.java b/hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsImpl.java index 4c8d773bd850..e2b3abbfad31 100644 --- a/hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsImpl.java @@ -736,11 +736,10 @@ public void queryExecuted(String hql, int rows, long time) { boolean isLongestQuery; //noinspection StatementWithEmptyBody for ( long old = queryExecutionMaxTime.get(); - ( isLongestQuery = time > old ) && ( ! queryExecutionMaxTime.compareAndSet( old, time ) ); + ( isLongestQuery = time > old ) && !queryExecutionMaxTime.compareAndSet( old, time ); old = queryExecutionMaxTime.get() ) { // nothing to do here given the odd loop structure... } - if ( isLongestQuery ) { queryExecutionMaxTimeQueryString = hql; } @@ -1018,17 +1017,14 @@ private NaturalIdStatisticsImpl instantiateNaturalStatistics(final String entity private CacheRegionStatisticsImpl instantiateCacheRegionStatistics(final String regionName) { final Region region = cache.getRegion( regionName ); - if ( region == null ) { throw new IllegalArgumentException( "Unknown cache region : " + regionName ); } - if ( region instanceof QueryResultsRegion ) { throw new IllegalArgumentException( "Region name [" + regionName + "] referred to a query result region, not a domain data region" ); } - return new CacheRegionStatisticsImpl( region ); } @@ -1038,18 +1034,14 @@ private CacheRegionStatisticsImpl instantiateCacheRegionStatsForQueryResults(fin private @Nullable CacheRegionStatisticsImpl createCacheRegionStatistics(final String regionName) { Region region = cache.getRegion( regionName ); - if ( region == null ) { - if ( !queryCacheEnabled ) { return null; } - // this is the pre-5.3 behavior. and since this is a pre-5.3 method it should behave consistently // NOTE that this method is deprecated region = cache.getQueryResultsCache( regionName ).getRegion(); } - return new CacheRegionStatisticsImpl( region ); } diff --git a/hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsInitiator.java b/hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsInitiator.java index 3ad678d60c8d..e3ee0c59d54b 100644 --- a/hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsInitiator.java +++ b/hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsInitiator.java @@ -7,6 +7,7 @@ import org.hibernate.HibernateException; import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import org.hibernate.engine.config.spi.ConfigurationService; +import org.hibernate.internal.CoreLogging; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.service.spi.ServiceRegistryImplementor; import org.hibernate.service.spi.SessionFactoryServiceInitiator; @@ -14,11 +15,9 @@ import org.hibernate.stat.spi.StatisticsFactory; import org.hibernate.stat.spi.StatisticsImplementor; -import org.jboss.logging.Logger; import org.checkerframework.checker.nullness.qual.Nullable; -import java.lang.invoke.MethodHandles; import static org.hibernate.cfg.StatisticsSettings.STATS_BUILDER; @@ -26,7 +25,8 @@ * @author Steve Ebersole */ public class StatisticsInitiator implements SessionFactoryServiceInitiator { - private static final CoreMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, StatisticsInitiator.class.getName() ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( StatisticsInitiator.class ); public static final StatisticsInitiator INSTANCE = new StatisticsInitiator(); @@ -40,10 +40,10 @@ public StatisticsImplementor initiateService(SessionFactoryServiceInitiatorConte final Object configValue = context.getServiceRegistry().requireService( ConfigurationService.class ) .getSettings().get( STATS_BUILDER ); - final StatisticsFactory statisticsFactory = statisticsFactory( configValue, context.getServiceRegistry() ); - final StatisticsImplementor statistics = statisticsFactory.buildStatistics( context.getSessionFactory() ); + final var statisticsFactory = statisticsFactory( configValue, context.getServiceRegistry() ); + final var statistics = statisticsFactory.buildStatistics( context.getSessionFactory() ); final boolean enabled = context.getSessionFactoryOptions().isStatisticsEnabled(); - LOG.statisticsInitialized(); + log.statisticsInitialized(); statistics.setStatisticsEnabled( enabled ); return statistics; } @@ -58,7 +58,7 @@ else if ( configValue instanceof StatisticsFactory factory ) { } else { // assume it names the factory class - final ClassLoaderService classLoaderService = registry.requireService( ClassLoaderService.class ); + final var classLoaderService = registry.requireService( ClassLoaderService.class ); try { return (StatisticsFactory) classLoaderService.classForName( configValue.toString() ).newInstance(); } diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/AbstractInformationExtractorImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/AbstractInformationExtractorImpl.java index 3c97c755b8d5..188494b64003 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/AbstractInformationExtractorImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/AbstractInformationExtractorImpl.java @@ -48,7 +48,8 @@ import static org.hibernate.internal.util.config.ConfigurationHelper.getBoolean; public abstract class AbstractInformationExtractorImpl implements InformationExtractor { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( AbstractInformationExtractorImpl.class ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( AbstractInformationExtractorImpl.class ); private final String[] tableTypes; @@ -304,7 +305,7 @@ public boolean schemaExists(Identifier catalog, Identifier schema) { final String catalogName = catalog == null ? "" : catalog.getCanonicalName(); final String schemaName = schema == null ? "" : schema.getCanonicalName(); - LOG.debugf( + log.debugf( "Multiple schemas found with that name [%s.%s]", catalogName, schemaName @@ -801,7 +802,7 @@ private TableInformation extractTableInformation( tableName.isQuoted() ); if ( tableName.equals( identifier ) ) { if ( found ) { - LOG.multipleTablesFound( tableName.render() ); + log.multipleTablesFound( tableName.render() ); throw new SchemaExtractionException( String.format( Locale.ENGLISH, @@ -820,7 +821,7 @@ private TableInformation extractTableInformation( } } if ( !found ) { - LOG.tableNotFound( tableName.render() ); + log.tableNotFound( tableName.render() ); } return tableInformation; } @@ -1069,7 +1070,7 @@ public Iterable getIndexes(TableInformation tableInformation) tableInformation.getColumn( columnIdentifier ); if ( columnInformation == null ) { // See HHH-10191: this may happen when dealing with Oracle/PostgreSQL function indexes - LOG.logCannotLocateIndexColumnInformation( + log.logCannotLocateIndexColumnInformation( columnIdentifier.getText(), indexIdentifier.getText() ); diff --git a/hibernate-core/src/main/java/org/hibernate/tuple/entity/EntityMetamodel.java b/hibernate-core/src/main/java/org/hibernate/tuple/entity/EntityMetamodel.java index 76e20bdcd486..e40cbb0b96e3 100644 --- a/hibernate-core/src/main/java/org/hibernate/tuple/entity/EntityMetamodel.java +++ b/hibernate-core/src/main/java/org/hibernate/tuple/entity/EntityMetamodel.java @@ -75,7 +75,8 @@ */ @Deprecated( since = "6", forRemoval = true ) public class EntityMetamodel implements Serializable { - private static final CoreMessageLogger LOG = messageLogger( EntityMetamodel.class ); + + private static final CoreMessageLogger log = messageLogger( EntityMetamodel.class ); public static final int NO_VERSION_INDX = -66; @@ -398,7 +399,7 @@ else if ( !allowMutation ) { versionPropertyIndex = tempVersionProperty; hasLazyProperties = hasLazy; if ( hasLazyProperties ) { - LOG.lazyPropertyFetchingAvailable( name ); + log.lazyPropertyFetchingAvailable( name ); } lazy = isLazy( persistentClass, bytecodeEnhancementMetadata ); @@ -467,7 +468,7 @@ private static boolean isAbstract(PersistentClass persistentClass) { if ( !isAbstract && persistentClass.hasPojoRepresentation() && isAbstractClass( persistentClass.getMappedClass() ) ) { - LOG.entityMappedAsNonAbstract( persistentClass.getEntityName() ); + log.entityMappedAsNonAbstract( persistentClass.getEntityName() ); } return isAbstract; } diff --git a/hibernate-core/src/main/java/org/hibernate/type/BasicTypeRegistry.java b/hibernate-core/src/main/java/org/hibernate/type/BasicTypeRegistry.java index 5138ecd4befc..0f3151465a5d 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/BasicTypeRegistry.java +++ b/hibernate-core/src/main/java/org/hibernate/type/BasicTypeRegistry.java @@ -41,7 +41,8 @@ * @author Steve Ebersole */ public class BasicTypeRegistry implements Serializable { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( BasicTypeRegistry.class ); + + private static final CoreMessageLogger log = CoreLogging.messageLogger( BasicTypeRegistry.class ); private final TypeConfiguration typeConfiguration; @@ -315,7 +316,7 @@ public void register(BasicType type, String... keys) { // explicit registration keys if ( isEmpty( keys ) ) { - LOG.typeDefinedNoRegistrationKeys( type ); + log.typeDefinedNoRegistrationKeys( type ); } else { applyRegistrationKeys( type, keys ); @@ -326,7 +327,7 @@ private void applyOrOverwriteEntry(BasicType type) { final var jdbcType = type.getJdbcType(); final var existing = registryForJdbcType( jdbcType ).put( type.getMappedJavaType(), type ); if ( existing != null ) { - LOG.tracef( + log.tracef( "BasicTypeRegistry registration overwritten (%s + %s); previous =`%s`", jdbcType.getFriendlyName(), type.getJavaTypeDescriptor(), @@ -388,7 +389,7 @@ public void addPrimeEntry(BasicType type, String legacyTypeClassName, String[ // explicit registration keys if ( registrationKeys == null || registrationKeys.length == 0 ) { - LOG.typeDefinedNoRegistrationKeys( type ); + log.typeDefinedNoRegistrationKeys( type ); } else { applyRegistrationKeys( type, registrationKeys ); @@ -411,7 +412,7 @@ public void addPrimeEntry(BasicTypeReference type, String legacyTypeClassName // explicit registration keys if ( registrationKeys == null || registrationKeys.length == 0 ) { - LOG.typeDefinedNoRegistrationKeys( type ); + log.typeDefinedNoRegistrationKeys( type ); } else { applyRegistrationKeys( type, registrationKeys ); @@ -422,7 +423,7 @@ private void primeRegistryEntry(BasicType type) { final var jdbcType = type.getJdbcType(); final var existing = registryForJdbcType( jdbcType ).get( type.getMappedJavaType() ); if ( existing != null ) { - LOG.tracef( + log.tracef( "Skipping registration of BasicType (%s + %s); still priming. existing = %s", jdbcType.getFriendlyName(), type.getJavaTypeDescriptor(), diff --git a/hibernate-core/src/main/java/org/hibernate/type/CollectionType.java b/hibernate-core/src/main/java/org/hibernate/type/CollectionType.java index 30100401a94f..2a67175a4836 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/CollectionType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/CollectionType.java @@ -5,7 +5,6 @@ package org.hibernate.type; import java.io.Serializable; -import java.lang.invoke.MethodHandles; import java.sql.PreparedStatement; import java.sql.SQLException; import java.util.ArrayList; @@ -31,6 +30,7 @@ import org.hibernate.engine.spi.PersistenceContext; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.internal.CoreLogging; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.util.MarkerObject; import org.hibernate.metamodel.CollectionClassification; @@ -41,7 +41,6 @@ import org.hibernate.proxy.LazyInitializer; import org.hibernate.sql.results.graph.collection.LoadingCollectionEntry; -import org.jboss.logging.Logger; import org.checkerframework.checker.nullness.qual.Nullable; @@ -59,7 +58,7 @@ */ public abstract class CollectionType extends AbstractType implements AssociationType { - private static final CoreMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, CollectionType.class.getName() ); + private static final CoreMessageLogger log = CoreLogging.messageLogger( CollectionType.class ); @Internal public static final Object UNFETCHED_COLLECTION = new MarkerObject( "UNFETCHED COLLECTION" ); @@ -722,7 +721,7 @@ private Object replaceUninitializedOriginal( else { // original is a detached copy of the collection; // it contains queued operations, which will be ignored - LOG.ignoreQueuedOperationsOnMerge( collectionInfoString( getRole(), collection.getKey() ) ); + log.ignoreQueuedOperationsOnMerge( collectionInfoString( getRole(), collection.getKey() ) ); } } return target; @@ -831,8 +830,8 @@ else if ( overridingEager != null ? overridingEager : !persister.isLazy() ) { if ( hasHolder() ) { persistenceContext.addCollectionHolder( collection ); } - if ( LOG.isTraceEnabled() ) { - LOG.trace( "Created collection wrapper: " + if ( log.isTraceEnabled() ) { + log.trace( "Created collection wrapper: " + collectionInfoString( persister, collection, key, session ) ); } return collection; diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/JdbcTypeNameMapper.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/JdbcTypeNameMapper.java index a37d66d1d420..de963fbc32f5 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/JdbcTypeNameMapper.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/JdbcTypeNameMapper.java @@ -22,7 +22,8 @@ * @author Steve Ebersole */ public final class JdbcTypeNameMapper { - private static final CoreMessageLogger LOG = messageLogger( JdbcTypeNameMapper.class ); + + private static final CoreMessageLogger log = messageLogger( JdbcTypeNameMapper.class ); private static final Map JDBC_TYPE_MAP = buildJdbcTypeMap( Types.class ); private static final Map SQL_TYPE_MAP = buildJdbcTypeMap( SqlTypes.class ); @@ -35,7 +36,7 @@ private static Map buildJdbcTypeMap(Class typesClass) { final int code = field.getInt( null ); final String old = map.put( code, field.getName() ); if ( old != null ) { - LOG.JavaSqlTypesMappedSameCodeMultipleTimes( code, old, field.getName() ); + log.JavaSqlTypesMappedSameCodeMultipleTimes( code, old, field.getName() ); } } catch ( IllegalAccessException e ) { diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DataHelper.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DataHelper.java index d53260ce0bd1..fe77ea980336 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DataHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DataHelper.java @@ -9,7 +9,6 @@ import java.io.InputStream; import java.io.Reader; import java.io.StringReader; -import java.lang.invoke.MethodHandles; import java.sql.Clob; import java.sql.SQLException; import java.sql.SQLFeatureNotSupportedException; @@ -18,9 +17,9 @@ import org.hibernate.Internal; import org.hibernate.engine.jdbc.BinaryStream; import org.hibernate.engine.jdbc.internal.ArrayBackedBinaryStream; +import org.hibernate.internal.CoreLogging; import org.hibernate.internal.CoreMessageLogger; -import org.jboss.logging.Logger; /** * A helper for dealing with {@code BLOB} and {@code CLOB} data @@ -35,7 +34,7 @@ private DataHelper() { /** The size of the buffer we will use to deserialize larger streams */ private static final int BUFFER_SIZE = 1024 * 4; - private static final CoreMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, DataHelper.class.getName() ); + private static final CoreMessageLogger log = CoreLogging.messageLogger( DataHelper.class ); /** * Extract the contents of the given reader/stream as a string. @@ -80,7 +79,7 @@ public static String extractString(Reader reader, int lengthHint) { reader.close(); } catch (IOException e) { - LOG.unableToCloseStream( e ); + log.unableToCloseStream( e ); } } return stringBuilder.toString(); @@ -175,13 +174,13 @@ public static byte[] extractBytes(InputStream inputStream) { inputStream.close(); } catch ( IOException e ) { - LOG.unableToCloseInputStream( e ); + log.unableToCloseInputStream( e ); } try { outputStream.close(); } catch ( IOException e ) { - LOG.unableToCloseOutputStream( e ); + log.unableToCloseOutputStream( e ); } } return outputStream.toByteArray(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/multisession/MultipleSessionCollectionWarningTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/multisession/MultipleSessionCollectionWarningTest.java index 47c41762d933..3c3c5f8f5ac9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/multisession/MultipleSessionCollectionWarningTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/multisession/MultipleSessionCollectionWarningTest.java @@ -18,8 +18,6 @@ import org.hibernate.collection.spi.PersistentSet; import org.hibernate.collection.spi.PersistentCollection; import org.hibernate.engine.spi.CollectionEntry; -import org.hibernate.internal.CoreLogging; -import org.hibernate.internal.CoreMessageLogger; import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; @@ -60,7 +58,6 @@ } ) public class MultipleSessionCollectionWarningTest { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( AbstractPersistentCollection.class ); @Test @JiraKey(value = "HHH-9518") diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/DatabaseExporter.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/DatabaseExporter.java index 48cf7d8f267b..cad450da09e3 100644 --- a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/DatabaseExporter.java +++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/DatabaseExporter.java @@ -24,7 +24,7 @@ */ @Deprecated class DatabaseExporter implements Exporter { - private static final CoreMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, DatabaseExporter.class.getName() ); + private static final CoreMessageLogger log = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, DatabaseExporter.class.getName() ); private final ConnectionHelper connectionHelper; private final SqlExceptionHelper sqlExceptionHelper; @@ -56,7 +56,7 @@ public void export(String string) throws Exception { } } catch( SQLException e ) { - LOG.unableToLogSqlWarnings( e ); + log.unableToLogSqlWarnings( e ); } } diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java index e6aea405079b..b8f1d9dbfdfb 100644 --- a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java +++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java @@ -57,7 +57,7 @@ * @author Steve Ebersole */ public class SchemaExport { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( SchemaExport.class ); + private static final CoreMessageLogger log = CoreLogging.messageLogger( SchemaExport.class ); public enum Type { CREATE( Action.CREATE ), @@ -242,18 +242,18 @@ public void execute(EnumSet targetTypes, Action action, Metadata met public void execute(EnumSet targetTypes, Action action, Metadata metadata, ServiceRegistry serviceRegistry) { if ( action == Action.NONE ) { - LOG.debug( "Skipping SchemaExport as Action.NONE was passed" ); + log.debug( "Skipping SchemaExport as Action.NONE was passed" ); return; } if ( targetTypes.isEmpty() ) { - LOG.debug( "Skipping SchemaExport as no targets were specified" ); + log.debug( "Skipping SchemaExport as no targets were specified" ); return; } exceptions.clear(); - LOG.runningHbm2ddlSchemaExport(); + log.runningHbm2ddlSchemaExport(); final TargetDescriptor targetDescriptor = buildTargetDescriptor( targetTypes, @@ -382,7 +382,7 @@ public static void main(String[] args) { execute( commandLineArgs ); } catch (Exception e) { - LOG.unableToCreateSchema( e ); + log.unableToCreateSchema( e ); } } @@ -595,7 +595,7 @@ else if ( arg.startsWith( "--physical-naming=" ) ) { } else { if ( drop || create ) { - LOG.warn( "--drop or --create was used; prefer --action=none|create|drop|drop-and-create instead" ); + log.warn( "--drop or --create was used; prefer --action=none|create|drop|drop-and-create instead" ); } parsedArgs.action = Action.parseCommandLineOption( actionText ); } @@ -605,7 +605,7 @@ else if ( arg.startsWith( "--physical-naming=" ) ) { } else { if ( !script || !export ) { - LOG.warn( "--text or --quiet was used; prefer --target=none|(stdout|database|script)*" ); + log.warn( "--text or --quiet was used; prefer --target=none|(stdout|database|script)*" ); } parsedArgs.targetTypes = TargetTypeHelper.parseCommandLineOptions( targetText ); } diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdate.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdate.java index 4d6d054310bf..0cc2a0e8fc66 100644 --- a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdate.java +++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdate.java @@ -47,7 +47,7 @@ * @author Steve Ebersole */ public class SchemaUpdate { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( SchemaUpdate.class ); + private static final CoreMessageLogger log = CoreLogging.messageLogger( SchemaUpdate.class ); private final List exceptions = new ArrayList<>(); @@ -64,12 +64,12 @@ public void execute(EnumSet targetTypes, Metadata metadata) { public void execute(EnumSet targetTypes, Metadata metadata, ServiceRegistry serviceRegistry) { if ( targetTypes.isEmpty() ) { - LOG.debug( "Skipping SchemaExport as no targets were specified" ); + log.debug( "Skipping SchemaExport as no targets were specified" ); return; } exceptions.clear(); - LOG.runningHbm2ddlSchemaUpdate(); + log.runningHbm2ddlSchemaUpdate(); Map config = new HashMap<>( serviceRegistry.requireService( ConfigurationService.class ).getSettings() ); @@ -164,7 +164,7 @@ public static void main(String[] args) { } } catch (Exception e) { - LOG.unableToRunSchemaUpdate( e ); + log.unableToRunSchemaUpdate( e ); } } @@ -290,7 +290,7 @@ else if ( arg.startsWith( "--physical-naming=" ) ) { } else { if ( !script || !doUpdate ) { - LOG.warn( "--text or --quiet was used; prefer --target=none|(stdout|database|script)*" ); + log.warn( "--text or --quiet was used; prefer --target=none|(stdout|database|script)*" ); } parsedArgs.targetTypes = TargetTypeHelper.parseCommandLineOptions( targetText ); } diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaValidator.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaValidator.java index 8dfbee3fa506..fd0726ba9eea 100644 --- a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaValidator.java +++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaValidator.java @@ -41,14 +41,14 @@ * @author Christoph Sturm */ public class SchemaValidator { - private static final CoreMessageLogger LOG = CoreLogging.messageLogger( SchemaValidator.class ); + private static final CoreMessageLogger log = CoreLogging.messageLogger( SchemaValidator.class ); public void validate(Metadata metadata) { validate( metadata, ( (MetadataImplementor) metadata ).getMetadataBuildingOptions().getServiceRegistry() ); } public void validate(Metadata metadata, ServiceRegistry serviceRegistry) { - LOG.runningSchemaValidator(); + log.runningSchemaValidator(); Map config = new HashMap<>( serviceRegistry.requireService( ConfigurationService.class ).getSettings() ); @@ -77,7 +77,7 @@ public static void main(String[] args) { } } catch (Exception e) { - LOG.unableToRunSchemaUpdate( e ); + log.unableToRunSchemaUpdate( e ); } }