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..f63954c99928 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
@@ -28,6 +28,7 @@
public class HANALegacyServerConfiguration {
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;
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..5a7b8db11ae3 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(
MethodHandles.lookup(),
CoreMessageLogger.class,
org.hibernate.community.dialect.HSQLLegacyDialect.class.getName()
);
+
private final UniqueDelegate uniqueDelegate = new CreateTableUniqueDelegate( this );
private final HSQLIdentityColumnSupport identityColumnSupport;
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-core/src/main/java/org/hibernate/action/internal/UnresolvedEntityInsertActions.java b/hibernate-core/src/main/java/org/hibernate/action/internal/UnresolvedEntityInsertActions.java
index 5e9a125ab709..b8e31415e99b 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,6 +41,7 @@
* @author Gail Badner
*/
public class UnresolvedEntityInsertActions {
+
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( UnresolvedEntityInsertActions.class );
private static final int INIT_SIZE = 5;
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..fd0e77fac933 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/MetadataSources.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/MetadataSources.java
@@ -66,6 +66,7 @@
* @since 5.0
*/
public class MetadataSources implements Serializable {
+
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( MetadataSources.class );
private final ServiceRegistry serviceRegistry;
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/ArchiveHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/ArchiveHelper.java
index f118fdedd8d4..bf98fbba24a8 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/ArchiveHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/ArchiveHelper.java
@@ -23,7 +23,7 @@
* @author Steve Ebersole
*/
public class ArchiveHelper {
- private static final Logger log = Logger.getLogger( ArchiveHelper.class );
+ private static final Logger LOG = Logger.getLogger( ArchiveHelper.class );
/**
* Get the JAR URL of the JAR containing the given entry.
@@ -91,7 +91,7 @@ else if ( "zip".equals( protocol )
"Unable to determine JAR Url from " + url + ". Cause: " + e.getMessage()
);
}
- log.tracef( "JAR URL from URL Entry: %s >> %s", url, jarUrl );
+ LOG.tracef( "JAR URL from URL Entry: %s >> %s", url, jarUrl );
return jarUrl;
}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/StandardArchiveDescriptorFactory.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/StandardArchiveDescriptorFactory.java
index 5c7580ce0090..0b009fb7b629 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/StandardArchiveDescriptorFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/StandardArchiveDescriptorFactory.java
@@ -23,7 +23,7 @@
* @author Steve Ebersole
*/
public class StandardArchiveDescriptorFactory implements ArchiveDescriptorFactory, JarFileEntryUrlAdjuster {
- private static final Logger log = Logger.getLogger( StandardArchiveDescriptorFactory.class );
+ private static final Logger LOG = Logger.getLogger( StandardArchiveDescriptorFactory.class );
/**
* Singleton access
@@ -129,8 +129,8 @@ public URL adjustJarFileEntryUrl(URL url, URL rootUrl) {
}
catch (MalformedURLException e) {
// allow to pass through to return the original URL
- if ( log.isDebugEnabled() ) {
- log.debugf(
+ if ( LOG.isDebugEnabled() ) {
+ LOG.debugf(
e,
"Unable to adjust relative URL [%s] relative to root URL [%s]",
filePart,
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..956e11a04b96 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) {
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..bc29f95ce606 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";
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..9605b22cf749 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.
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/internal/ConfigLoader.java b/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/internal/ConfigLoader.java
index 58b9615ad4d2..0c72fc7770c1 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/internal/ConfigLoader.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/internal/ConfigLoader.java
@@ -28,7 +28,7 @@
* @author Steve Ebersole
*/
public class ConfigLoader {
- private static final Logger log = Logger.getLogger( ConfigLoader.class );
+ private static final Logger LOG = Logger.getLogger( ConfigLoader.class );
private final BootstrapServiceRegistry bootstrapServiceRegistry;
@@ -64,7 +64,7 @@ public LoadedConfig loadConfigXmlResource(String cfgXmlResourceName) {
stream.close();
}
catch (IOException e) {
- log.debug( "Unable to close cfg.xml resource stream", e );
+ LOG.debug( "Unable to close cfg.xml resource stream", e );
}
}
}
@@ -101,7 +101,7 @@ public LoadedConfig loadConfigXmlUrl(URL url) {
stream.close();
}
catch (IOException e) {
- log.debug( "Unable to close cfg.xml URL stream", e );
+ LOG.debug( "Unable to close cfg.xml URL stream", e );
}
}
}
@@ -130,7 +130,7 @@ public Properties loadProperties(String resourceName) {
stream.close();
}
catch (IOException e) {
- log.debug( "Unable to close properties file stream [" + resourceName + "]", e );
+ LOG.debug( "Unable to close properties file stream [" + resourceName + "]", e );
}
}
}
@@ -154,7 +154,7 @@ public Properties loadProperties(File file) {
stream.close();
}
catch (IOException e) {
- log.debug( "Unable to close properties file stream [" + file.getAbsolutePath() + "]", e );
+ LOG.debug( "Unable to close properties file stream [" + file.getAbsolutePath() + "]", e );
}
}
}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/internal/JaxbCfgProcessor.java b/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/internal/JaxbCfgProcessor.java
index a1485c3d0657..67d793da0647 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/internal/JaxbCfgProcessor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/internal/JaxbCfgProcessor.java
@@ -45,7 +45,7 @@
* @author Steve Ebersole
*/
public class JaxbCfgProcessor {
- private static final Logger log = Logger.getLogger( JaxbCfgProcessor.class );
+ private static final Logger LOG = Logger.getLogger( JaxbCfgProcessor.class );
public static final String HIBERNATE_CONFIGURATION_URI = "http://www.hibernate.org/xsd/orm/cfg";
@@ -110,7 +110,7 @@ private JaxbCfgHibernateConfiguration unmarshal(XMLEventReader staxEventReader,
if ( !isNamespaced( event.asStartElement() ) ) {
// if the elements are not namespaced, wrap the reader in a reader which will namespace them as pulled.
- log.debug( "cfg.xml document did not define namespaces; wrapping in custom event reader to introduce namespace information" );
+ LOG.debug( "cfg.xml document did not define namespaces; wrapping in custom event reader to introduce namespace information" );
staxEventReader = new NamespaceAddingEventReader( staxEventReader, HIBERNATE_CONFIGURATION_URI );
}
@@ -169,7 +169,7 @@ private Schema resolveLocalSchema(String schemaName, String schemaLanguage) {
schemaStream.close();
}
catch ( IOException e ) {
- log.debugf( "Problem closing schema stream [%s]", e.toString() );
+ LOG.debugf( "Problem closing schema stream [%s]", e.toString() );
}
}
}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/spi/LoadedConfig.java b/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/spi/LoadedConfig.java
index d46b258c3c4b..c64c88a032aa 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/spi/LoadedConfig.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/spi/LoadedConfig.java
@@ -32,7 +32,7 @@
* representation can be maintained through calls to {@link #merge}.
*/
public class LoadedConfig {
- private static final Logger log = Logger.getLogger( LoadedConfig.class );
+ private static final Logger LOG = Logger.getLogger( LoadedConfig.class );
private String sessionFactoryName;
@@ -107,7 +107,7 @@ public static LoadedConfig consume(JaxbCfgHibernateConfiguration jaxbCfg) {
for ( JaxbCfgEventListenerType listener : listenerGroup.getListener() ) {
if ( listener.getType() != null ) {
- log.debugf( "Listener [%s] defined as part of a group also defined event type", listener.getClazz() );
+ LOG.debugf( "Listener [%s] defined as part of a group also defined event type", listener.getClazz() );
}
cfg.addEventListener( eventType, listener.getClazz() );
}
@@ -194,7 +194,7 @@ public void addEventListener(EventType eventType, String listenerClass) {
public void merge(LoadedConfig incoming) {
if ( sessionFactoryName != null ) {
if ( incoming.getSessionFactoryName() != null ) {
- log.debugf(
+ LOG.debugf(
"More than one cfg.xml file attempted to supply SessionFactory name: [%s], [%s]. Keeping initially discovered one [%s]",
getSessionFactoryName(),
incoming.getSessionFactoryName(),
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/BootstrapContextImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/BootstrapContextImpl.java
index ac3197496680..c6cde91de063 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/BootstrapContextImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/BootstrapContextImpl.java
@@ -50,7 +50,7 @@
* @author Andrea Boriero
*/
public class BootstrapContextImpl implements BootstrapContext {
- private static final Logger log = Logger.getLogger( BootstrapContextImpl.class );
+ private static final Logger LOG = Logger.getLogger( BootstrapContextImpl.class );
private final StandardServiceRegistry serviceRegistry;
private final MetadataBuildingOptions metadataBuildingOptions;
@@ -308,40 +308,40 @@ public void addAttributeConverterDescriptor(ConverterDescriptor descriptor)
}
void injectJpaTempClassLoader(ClassLoader classLoader) {
- if ( log.isTraceEnabled() && classLoader != getJpaTempClassLoader() ) {
- log.tracef( "Injecting JPA temp ClassLoader [%s] into BootstrapContext; was [%s]",
+ if ( LOG.isTraceEnabled() && classLoader != getJpaTempClassLoader() ) {
+ LOG.tracef( "Injecting JPA temp ClassLoader [%s] into BootstrapContext; was [%s]",
classLoader, getJpaTempClassLoader() );
}
this.classLoaderAccess.injectTempClassLoader( classLoader );
}
void injectScanOptions(ScanOptions scanOptions) {
- if ( log.isTraceEnabled() && scanOptions != this.scanOptions ) {
- log.tracef( "Injecting ScanOptions [%s] into BootstrapContext; was [%s]",
+ if ( LOG.isTraceEnabled() && scanOptions != this.scanOptions ) {
+ LOG.tracef( "Injecting ScanOptions [%s] into BootstrapContext; was [%s]",
scanOptions, this.scanOptions );
}
this.scanOptions = scanOptions;
}
void injectScanEnvironment(ScanEnvironment scanEnvironment) {
- if ( log.isTraceEnabled() && scanEnvironment != this.scanEnvironment ) {
- log.tracef( "Injecting ScanEnvironment [%s] into BootstrapContext; was [%s]",
+ if ( LOG.isTraceEnabled() && scanEnvironment != this.scanEnvironment ) {
+ LOG.tracef( "Injecting ScanEnvironment [%s] into BootstrapContext; was [%s]",
scanEnvironment, this.scanEnvironment );
}
this.scanEnvironment = scanEnvironment;
}
void injectScanner(Scanner scanner) {
- if ( log.isTraceEnabled() && scanner != this.scannerSetting ) {
- log.tracef( "Injecting Scanner [%s] into BootstrapContext; was [%s]",
+ if ( LOG.isTraceEnabled() && scanner != this.scannerSetting ) {
+ LOG.tracef( "Injecting Scanner [%s] into BootstrapContext; was [%s]",
scanner, scannerSetting );
}
this.scannerSetting = scanner;
}
void injectArchiveDescriptorFactory(ArchiveDescriptorFactory factory) {
- if ( log.isTraceEnabled() && factory != archiveDescriptorFactory ) {
- log.tracef( "Injecting ArchiveDescriptorFactory [%s] into BootstrapContext; was [%s]",
+ if ( LOG.isTraceEnabled() && factory != archiveDescriptorFactory ) {
+ LOG.tracef( "Injecting ArchiveDescriptorFactory [%s] into BootstrapContext; was [%s]",
factory, archiveDescriptorFactory );
}
this.archiveDescriptorFactory = factory;
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/ClassLoaderAccessImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/ClassLoaderAccessImpl.java
index 5716a0302717..f18206cd11a1 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/ClassLoaderAccessImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/ClassLoaderAccessImpl.java
@@ -19,7 +19,7 @@
* @author Steve Ebersole
*/
public class ClassLoaderAccessImpl implements ClassLoaderAccess {
- private static final Logger log = Logger.getLogger( ClassLoaderAccessImpl.class );
+ private static final Logger LOG = Logger.getLogger( ClassLoaderAccessImpl.class );
private final ClassLoaderService classLoaderService;
private ClassLoader jpaTempClassLoader;
@@ -56,14 +56,14 @@ public Class classForName(String name) {
else {
// Could not determine that the given class is safe to load with live ClassLoader
if ( jpaTempClassLoader == null ) {
- log.tracef(
+ LOG.tracef(
"No temp ClassLoader provided; using live ClassLoader to load potentially unsafe class: %s",
name
);
return classLoaderService.classForName( name );
}
else {
-// log.tracef(
+// LOG.tracef(
// "Temp ClassLoader was provided, so we will use that: %s",
// name
// );
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/InFlightMetadataCollectorImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/InFlightMetadataCollectorImpl.java
index e81e6a83ba28..5310a68ddab5 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/InFlightMetadataCollectorImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/InFlightMetadataCollectorImpl.java
@@ -134,7 +134,7 @@
*/
public class InFlightMetadataCollectorImpl
implements InFlightMetadataCollector, ConverterRegistry, GeneratorSettings {
- private static final CoreMessageLogger log = CoreLogging.messageLogger( InFlightMetadataCollectorImpl.class );
+ private static final CoreMessageLogger LOG = CoreLogging.messageLogger( InFlightMetadataCollectorImpl.class );
private final BootstrapContext bootstrapContext;
private final MetadataBuildingOptions options;
@@ -639,7 +639,7 @@ public void addFetchProfile(FetchProfile profile) {
}
final FetchProfile old = fetchProfileMap.put( profile.getName(), profile );
if ( old != null ) {
- log.warn( "Duplicated fetch profile with same name [" + profile.getName() + "] found." );
+ LOG.warn( "Duplicated fetch profile with same name [" + profile.getName() + "] found." );
}
}
@@ -680,7 +680,7 @@ else if ( !generator.getName().isEmpty()
+ AvailableSettings.JPA_ID_GENERATOR_GLOBAL_SCOPE_COMPLIANCE + " to false " );
}
else {
- log.duplicateGeneratorName( old.getName() );
+ LOG.duplicateGeneratorName( old.getName() );
}
}
}
@@ -902,10 +902,10 @@ public void addImport(String importName, String className) {
if ( importName == null || className == null ) {
throw new IllegalArgumentException( "Import name or entity name is null" );
}
- log.tracev( "Import: {0} -> {1}", importName, className);
+ LOG.tracev( "Import: {0} -> {1}", importName, className);
final String old = imports.put( importName, className);
if ( old != null ) {
- log.debugf( "Import name [%s] overrode previous [{%s}]", importName, old );
+ LOG.debugf( "Import name [%s] overrode previous [{%s}]", importName, old );
}
}
@@ -1953,7 +1953,7 @@ protected void secondPassCompileForeignKeys(Table table, Set done, M
private void processPropertyReferences() {
if ( delayedPropertyReferenceHandlers != null ) {
- log.trace( "Processing association property references" );
+ LOG.trace( "Processing association property references" );
for ( DelayedPropertyReferenceHandler delayedPropertyReferenceHandler : delayedPropertyReferenceHandlers ) {
delayedPropertyReferenceHandler.process( this );
@@ -2107,7 +2107,7 @@ private void handleIdentifierValueBinding(
// by tools. We want to hold off requiring classes being present until we
// try to build the SF. Here, just building the Metadata, it is "ok" for an
// exception to occur, the same exception will happen later as we build the SF.
- log.debug( "Ignoring exception thrown when trying to build IdentifierGenerator as part of Metadata building", e );
+ LOG.debug( "Ignoring exception thrown when trying to build IdentifierGenerator as part of Metadata building", e );
}
}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java
index b7de12ad8b59..4aff48338a63 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java
@@ -100,7 +100,7 @@
* @author Steve Ebersole
*/
public class MetadataBuilderImpl implements MetadataBuilderImplementor, TypeContributions {
- private static final CoreMessageLogger log = CoreLogging.messageLogger( MetadataBuilderImpl.class );
+ private static final CoreMessageLogger LOG = CoreLogging.messageLogger( MetadataBuilderImpl.class );
private final MetadataSources sources;
private final BootstrapContextImpl bootstrapContext;
@@ -118,7 +118,7 @@ else if ( serviceRegistry instanceof StandardServiceRegistry standardServiceRegi
return standardServiceRegistry;
}
else if ( serviceRegistry instanceof BootstrapServiceRegistry bootstrapServiceRegistry ) {
- log.debug(
+ LOG.debug(
"ServiceRegistry passed to MetadataBuilder was a BootstrapServiceRegistry; this likely won't end well " +
"if attempt is made to build SessionFactory"
);
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/TypeDefinitionRegistryStandardImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/TypeDefinitionRegistryStandardImpl.java
index e96768c6bfc5..9297d14ac4b8 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/TypeDefinitionRegistryStandardImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/TypeDefinitionRegistryStandardImpl.java
@@ -22,7 +22,7 @@
* @author Chris Cranford
*/
public class TypeDefinitionRegistryStandardImpl implements TypeDefinitionRegistry {
- private static final Logger log = Logger.getLogger( TypeDefinitionRegistryStandardImpl.class );
+ private static final Logger LOG = Logger.getLogger( TypeDefinitionRegistryStandardImpl.class );
private final TypeDefinitionRegistry parent;
private final Map typeDefinitionMap = new HashMap<>();
@@ -95,7 +95,7 @@ private void register(String name, TypeDefinition typeDefinition, DuplicationStr
final TypeDefinition existing = typeDefinitionMap.put( name, typeDefinition );
if ( existing != null && existing != typeDefinition ) {
if ( duplicationStrategy == DuplicationStrategy.OVERWRITE ) {
- log.debugf( "Overwrote existing registration [%s] for type definition.", name );
+ LOG.debugf( "Overwrote existing registration [%s] for type definition.", name );
}
else {
throw new IllegalArgumentException(
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/AbstractBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/AbstractBinder.java
index 6b2cc82f699e..472f6492dd3e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/AbstractBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/AbstractBinder.java
@@ -32,7 +32,7 @@
* @author Steve Ebersole
*/
public abstract class AbstractBinder implements Binder {
- private static final Logger log = Logger.getLogger( AbstractBinder.class );
+ private static final Logger LOG = Logger.getLogger( AbstractBinder.class );
private final LocalXmlResourceResolver xmlResourceResolver;
@@ -53,7 +53,7 @@ public Binding bind(InputStream stream, Origin origin) {
eventReader.close();
}
catch (XMLStreamException e) {
- log.debug( "Unable to close StAX reader", e );
+ LOG.debug( "Unable to close StAX reader", e );
}
}
}
@@ -98,7 +98,7 @@ private Binding doBind(XMLEventReader eventReader, Origin origi
eventReader.close();
}
catch (Exception e) {
- log.debug( "Unable to close StAX reader", e );
+ LOG.debug( "Unable to close StAX reader", e );
}
}
}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/CacheableFileXmlSource.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/CacheableFileXmlSource.java
index 15109c4cb83b..35e83e4eb546 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/CacheableFileXmlSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/CacheableFileXmlSource.java
@@ -30,7 +30,7 @@
* @author Steve Ebersole
*/
public class CacheableFileXmlSource {
- private static final CoreMessageLogger log = CoreLogging.messageLogger( CacheableFileXmlSource.class );
+ private static final CoreMessageLogger LOG = CoreLogging.messageLogger( CacheableFileXmlSource.class );
public static Binding fromCacheableFile(
File xmlFile,
@@ -74,17 +74,17 @@ public static Binding fromCacheableFile
return new Binding<>( readSerFile( serFile ), origin );
}
catch ( SerializationException e ) {
- log.unableToDeserializeCache( serFile.getName(), e );
+ LOG.unableToDeserializeCache( serFile.getName(), e );
}
catch ( FileNotFoundException e ) {
- log.cachedFileNotFound( serFile.getName(), e );
+ LOG.cachedFileNotFound( serFile.getName(), e );
}
}
else {
- log.cachedFileObsolete( serFile );
+ LOG.cachedFileObsolete( serFile );
}
- log.readingMappingsFromFile( xmlFile.getPath() );
+ LOG.readingMappingsFromFile( xmlFile.getPath() );
final Binding binding = FileXmlSource.fromFile( xmlFile, binder );
writeSerFile( binding.getRoot(), xmlFile, serFile );
@@ -125,7 +125,7 @@ public static File determineCachedFile(File xmlFile, File serDirectory) {
}
private static T readSerFile(File serFile) throws SerializationException, FileNotFoundException {
- log.readingCachedMappings( serFile );
+ LOG.readingCachedMappings( serFile );
return SerializationHelper.deserialize( new FileInputStream( serFile ) );
}
@@ -134,17 +134,17 @@ private static void writeSerFile(
File xmlFile,
File serFile) {
try ( FileOutputStream fos = new FileOutputStream( serFile ) ) {
- if ( log.isTraceEnabled() ) {
- log.tracef( "Writing cache file for: %s to: %s", xmlFile.getAbsolutePath(), serFile.getAbsolutePath() );
+ if ( LOG.isTraceEnabled() ) {
+ LOG.tracef( "Writing cache file for: %s to: %s", xmlFile.getAbsolutePath(), serFile.getAbsolutePath() );
}
SerializationHelper.serialize( jaxbModel, fos );
boolean success = serFile.setLastModified( System.currentTimeMillis() );
if ( !success ) {
- log.warn( "Could not update cacheable hbm.xml bin file timestamp" );
+ LOG.warn( "Could not update cacheable hbm.xml bin file timestamp" );
}
}
catch ( Exception e ) {
- log.unableToWriteCachedFile( serFile.getAbsolutePath(), e.getMessage() );
+ LOG.unableToWriteCachedFile( serFile.getAbsolutePath(), e.getMessage() );
}
}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/MappingBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/MappingBinder.java
index 78ef6bc753ec..86fada8b4732 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/MappingBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/MappingBinder.java
@@ -45,7 +45,7 @@
* @author Steve Ebersole
*/
public class MappingBinder extends AbstractBinder {
- private static final Logger log = Logger.getLogger( MappingBinder.class );
+ private static final Logger LOG = Logger.getLogger( MappingBinder.class );
private final XMLEventFactory xmlEventFactory = XMLEventFactory.newInstance();
@@ -163,8 +163,8 @@ protected Binding doBind(
Origin origin) {
final String rootElementLocalName = rootElementStartEvent.getName().getLocalPart();
if ( "hibernate-mapping".equals( rootElementLocalName ) ) {
- if ( log.isTraceEnabled() ) {
- log.tracef( "Performing JAXB binding of hbm.xml document: %s", origin.toString() );
+ if ( LOG.isTraceEnabled() ) {
+ LOG.tracef( "Performing JAXB binding of hbm.xml document: %s", origin.toString() );
}
final XMLEventReader hbmReader = new HbmEventReader( staxEventReader, xmlEventFactory );
@@ -181,7 +181,7 @@ protected Binding doBind(
else {
assert "entity-mappings".equals( rootElementLocalName );
try {
- log.tracef( "Performing JAXB binding of orm.xml document: %s", origin.toString() );
+ LOG.tracef( "Performing JAXB binding of orm.xml document: %s", origin.toString() );
final XMLEventReader reader = new MappingEventReader( staxEventReader, xmlEventFactory );
final JaxbEntityMappingsImpl bindingRoot = jaxb(
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalSchemaLocator.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalSchemaLocator.java
index e1c51b23022c..2e64663c309c 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalSchemaLocator.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalSchemaLocator.java
@@ -22,7 +22,7 @@
* @author Steve Ebersole
*/
public class LocalSchemaLocator {
- private static final Logger log = Logger.getLogger( LocalSchemaLocator.class );
+ private static final Logger LOG = Logger.getLogger( LocalSchemaLocator.class );
private LocalSchemaLocator() {
// Disallow direct instantiation
@@ -62,7 +62,7 @@ public static Schema resolveLocalSchema(URL schemaUrl) {
schemaStream.close();
}
catch ( IOException e ) {
- log.debugf( "Problem closing schema stream - %s", e.toString() );
+ LOG.debugf( "Problem closing schema stream - %s", e.toString() );
}
}
}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalXmlResourceResolver.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalXmlResourceResolver.java
index 80ddd3ab9acc..03f5b713a7b3 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalXmlResourceResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalXmlResourceResolver.java
@@ -22,7 +22,7 @@
* @author Steve Ebersole
*/
public class LocalXmlResourceResolver implements javax.xml.stream.XMLResolver {
- private static final Logger log = Logger.getLogger( LocalXmlResourceResolver.class );
+ private static final Logger LOG = Logger.getLogger( LocalXmlResourceResolver.class );
public static final String CLASSPATH_EXTENSION_URL_BASE = "classpath://";
@@ -34,10 +34,10 @@ public LocalXmlResourceResolver(ResourceStreamLocator resourceStreamLocator) {
@Override
public Object resolveEntity(String publicID, String systemID, String baseURI, String namespace) throws XMLStreamException {
- log.tracef( "In resolveEntity(%s, %s, %s, %s)", publicID, systemID, baseURI, namespace );
+ LOG.tracef( "In resolveEntity(%s, %s, %s, %s)", publicID, systemID, baseURI, namespace );
if ( namespace != null ) {
- log.tracef( "Interpreting namespace: %s", namespace );
+ LOG.tracef( "Interpreting namespace: %s", namespace );
if ( MappingXsdSupport.latestDescriptor().getNamespaceUri().matches( namespace ) ) {
return openUrlStream( MappingXsdSupport.latestDescriptor() );
}
@@ -84,7 +84,7 @@ else if ( ConfigXsdSupport.cfgXsd().getNamespaceUri().matches( namespace ) ) {
}
if ( publicID != null || systemID != null ) {
- log.tracef( "Checking public/system identifiers `%s`/`%s` as DTD references", publicID, systemID );
+ LOG.tracef( "Checking public/system identifiers `%s`/`%s` as DTD references", publicID, systemID );
if ( MAPPING_DTD.matches( publicID, systemID ) ) {
return openUrlStream( MAPPING_DTD.localSchemaUrl );
@@ -116,15 +116,15 @@ else if ( ConfigXsdSupport.cfgXsd().getNamespaceUri().matches( namespace ) ) {
if ( systemID != null ) {
// technically, "classpath://..." identifiers should only be declared as SYSTEM identifiers
if ( systemID.startsWith( CLASSPATH_EXTENSION_URL_BASE ) ) {
- log.tracef( "Recognized 'classpath:' identifier; attempting to resolve on classpath [%s]", systemID );
+ LOG.tracef( "Recognized 'classpath:' identifier; attempting to resolve on classpath [%s]", systemID );
final String path = systemID.substring( CLASSPATH_EXTENSION_URL_BASE.length() );
// todo : for this to truly work consistently, we need access to ClassLoaderService
final InputStream stream = resolveInLocalNamespace( path );
if ( stream == null ) {
- log.tracef( "Unable to resolve [%s] on classpath", systemID );
+ LOG.tracef( "Unable to resolve [%s] on classpath", systemID );
}
else {
- log.tracef( "Resolved [%s] on classpath", systemID );
+ LOG.tracef( "Resolved [%s] on classpath", systemID );
}
return stream;
}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AttributeConverterManager.java b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AttributeConverterManager.java
index 51c6d2f03571..f655469634b2 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AttributeConverterManager.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AttributeConverterManager.java
@@ -38,7 +38,7 @@
* @author Steve Ebersole
*/
public class AttributeConverterManager implements ConverterAutoApplyHandler {
- private static final Logger log = Logger.getLogger( AttributeConverterManager.class );
+ private static final Logger LOG = Logger.getLogger( AttributeConverterManager.class );
private Map, ConverterDescriptor> attributeConverterDescriptorsByClass;
private Map, RegisteredConversion> registeredConversionsByDomainType;
@@ -48,8 +48,8 @@ public RegisteredConversion findRegisteredConversion(Class domainType) {
}
public void addConverter(ConverterDescriptor descriptor) {
- if ( log.isTraceEnabled() ) {
- log.tracef( "Registering AttributeConverter '%s'",
+ if ( LOG.isTraceEnabled() ) {
+ LOG.tracef( "Registering AttributeConverter '%s'",
descriptor.getAttributeConverterClass().getName() );
}
@@ -58,8 +58,8 @@ public void addConverter(ConverterDescriptor descriptor) {
final RegisteredConversion registeredConversion = registeredConversionsByDomainType.get( domainType );
if ( registeredConversion != null ) {
// we can skip registering the converter, the RegisteredConversion will always take precedence
- if ( log.isDebugEnabled() ) {
- log.debugf( "Skipping registration of discovered AttributeConverter '%s' for auto-apply",
+ if ( LOG.isDebugEnabled() ) {
+ LOG.debugf( "Skipping registration of discovered AttributeConverter '%s' for auto-apply",
descriptor.getAttributeConverterClass().getName() );
}
return;
@@ -102,8 +102,8 @@ public void addRegistration(RegisteredConversion conversion, BootstrapContext co
+ conversion.getConverterType().getName() + "'" );
}
else {
- if ( log.isDebugEnabled() ) {
- log.debugf( "Skipping duplicate '@ConverterRegistration' for '%s'",
+ if ( LOG.isDebugEnabled() ) {
+ LOG.debugf( "Skipping duplicate '@ConverterRegistration' for '%s'",
conversion.getConverterType().getName() );
}
}
@@ -113,8 +113,8 @@ public void addRegistration(RegisteredConversion conversion, BootstrapContext co
// if so, remove it. The conversion being registered will always take precedence
if ( attributeConverterDescriptorsByClass != null ) {
final var removed = attributeConverterDescriptorsByClass.remove( conversion.getConverterType() );
- if ( removed != null && log.isDebugEnabled() ) {
- log.debugf( "Removed potentially auto-applicable converter '%s' due to @ConverterRegistration",
+ if ( removed != null && LOG.isDebugEnabled() ) {
+ LOG.debugf( "Removed potentially auto-applicable converter '%s' due to @ConverterRegistration",
removed.getAttributeConverterClass().getName() );
}
}
@@ -227,8 +227,8 @@ private List> getMatches(
ConverterDescriptor> matcher) {
final List> matches = new ArrayList<>();
for ( ConverterDescriptor descriptor : converterDescriptors() ) {
- if ( log.isTraceEnabled() ) {
- log.tracef(
+ if ( LOG.isTraceEnabled() ) {
+ LOG.tracef(
"Checking auto-apply AttributeConverter [%s] (domain-type=%s) for match against %s : %s.%s (type=%s)",
descriptor.getAttributeConverterClass().getName(),
descriptor.getDomainValueResolvedType().getSignature(),
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..2f60ed03e3f7 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,6 +63,7 @@
* @author Hardy Ferentschik
*/
public final class AnnotationBinder {
+
private static final CoreMessageLogger LOG = messageLogger( AnnotationBinder.class );
private AnnotationBinder() {}
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..5ec83c0e747a 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,6 +130,7 @@
* @author Emmanuel Bernard
*/
public abstract class CollectionBinder {
+
private static final CoreMessageLogger LOG = messageLogger( CollectionBinder.class );
private static final List> INFERRED_CLASS_PRIORITY = List.of(
@@ -1143,15 +1144,15 @@ 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)" );
+ + 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)" );
+ + qualify( propertyHolder.getPath(), propertyName )
+ + "' is 'mappedBy' another entity and should not specify an '@OrderColumn'"
+ + " (use '@OrderBy' instead)" );
}
}
else {
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..0e1b1681bca8 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,6 +46,7 @@
* @author Steve Ebersole
*/
public class CollectionPropertyHolder extends AbstractPropertyHolder {
+
private static final CoreMessageLogger LOG = messageLogger( CollectionPropertyHolder.class );
private final Collection collection;
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..0562b4e67830 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,6 +81,7 @@
* instances of the mapping model object {@link Component}.
*/
public class EmbeddableBinder {
+
private static final CoreMessageLogger LOG = messageLogger( EmbeddableBinder.class );
static PropertyBinder createCompositeBinder(
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..892b919bc022 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
@@ -134,6 +134,7 @@
public class EntityBinder {
private static final CoreMessageLogger LOG = messageLogger( EntityBinder.class );
+
private static final String NATURAL_ID_CACHE_SUFFIX = "##NaturalId";
private final MetadataBuildingContext context;
@@ -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() );
}
}
@@ -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..c20d7175da47 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,6 +35,7 @@
* @author Gavin King
*/
public class FilterDefBinder {
+
private static final CoreMessageLogger LOG = messageLogger( FilterDefBinder.class );
public static void bindFilterDefs(AnnotationTarget annotatedElement, MetadataBuildingContext context) {
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..8bb912077dfb 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,6 +64,7 @@
* @author Emmanuel Bernard
*/
public class ToOneBinder {
+
private static final CoreMessageLogger LOG = messageLogger( ToOneBinder.class );
static void bindManyToOne(
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/Namespace.java b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/Namespace.java
index 4161a0827b7c..88b52de18285 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/Namespace.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/Namespace.java
@@ -41,7 +41,7 @@
* @author Steve Ebersole
*/
public class Namespace {
- private static final CoreMessageLogger log = CoreLogging.messageLogger( Namespace.class );
+ private static final CoreMessageLogger LOG = CoreLogging.messageLogger( Namespace.class );
private final PhysicalNamingStrategy physicalNamingStrategy;
private final JdbcEnvironment jdbcEnvironment;
@@ -58,7 +58,7 @@ public Namespace(PhysicalNamingStrategy physicalNamingStrategy, JdbcEnvironment
this.name = name;
this.physicalName = physicalName( name, physicalNamingStrategy, jdbcEnvironment );
- log.tracef( "Created database namespace [logicalName=%s, physicalName=%s]", name, physicalName );
+ LOG.tracef( "Created database namespace [logicalName=%s, physicalName=%s]", name, physicalName );
}
private static Name physicalName(Name name, PhysicalNamingStrategy physicalNaming, JdbcEnvironment environment) {
@@ -96,7 +96,7 @@ public Table locateTable(Identifier logicalTableName) {
public void registerTable(Identifier logicalName, Table table) {
final Table previous = tables.put( logicalName, table );
if ( previous != null ) {
- log.debugf(
+ LOG.debugf(
"Replacing Table registration(%s) : %s -> %s",
logicalName,
previous,
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/AnnotationMetadataSourceProcessorImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/AnnotationMetadataSourceProcessorImpl.java
index 8b20e82d9277..efcc702e29e2 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/AnnotationMetadataSourceProcessorImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/AnnotationMetadataSourceProcessorImpl.java
@@ -38,7 +38,7 @@
* @author Steve Ebersole
*/
public class AnnotationMetadataSourceProcessorImpl implements MetadataSourceProcessor {
- private static final Logger log = Logger.getLogger( AnnotationMetadataSourceProcessorImpl.class );
+ private static final Logger LOG = Logger.getLogger( AnnotationMetadataSourceProcessorImpl.class );
// NOTE : we de-categorize the classes into a single collection (xClasses) here to work with the
// existing "binder" infrastructure.
@@ -189,7 +189,7 @@ public void processEntityHierarchies(Set processedEntityNames) {
for ( ClassDetails clazz : orderedClasses ) {
if ( processedEntityNames.contains( clazz.getName() ) ) {
- log.debugf( "Skipping annotated class processing of entity [%s], as it has already been processed", clazz );
+ LOG.debugf( "Skipping annotated class processing of entity [%s], as it has already been processed", clazz );
}
else {
if ( !clazz.getName().endsWith( ".package-info" ) ) {
@@ -215,7 +215,7 @@ private List orderAndFillHierarchy(LinkedHashSet ori
}
private void insertMappedSuperclasses(LinkedHashSet original, LinkedHashSet copy) {
- final boolean traceEnabled = log.isTraceEnabled();
+ final boolean traceEnabled = LOG.isTraceEnabled();
for ( ClassDetails clazz : original ) {
if ( clazz.isInterface() ) {
@@ -226,7 +226,7 @@ private void insertMappedSuperclasses(LinkedHashSet original, Link
if ( clazz.hasDirectAnnotationUsage( MappedSuperclass.class ) ) {
if ( traceEnabled ) {
- log.tracef(
+ LOG.tracef(
"Skipping explicit MappedSuperclass %s, the class will be discovered analyzing the implementing class",
clazz
);
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/EntityHierarchyBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/EntityHierarchyBuilder.java
index 7ac264841f99..fb6590a04bb2 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/EntityHierarchyBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/EntityHierarchyBuilder.java
@@ -39,7 +39,7 @@
* @author Steve Ebersole
*/
public class EntityHierarchyBuilder {
- private static final Logger log = Logger.getLogger( EntityHierarchyBuilder.class );
+ private static final Logger LOG = Logger.getLogger( EntityHierarchyBuilder.class );
private final List entityHierarchyList = new ArrayList<>();
@@ -58,10 +58,10 @@ public EntityHierarchyBuilder() {
*/
public List buildHierarchies() throws HibernateException {
if ( toBeLinkedQueue != null && !toBeLinkedQueue.isEmpty() ) {
- if ( log.isDebugEnabled() ) {
+ if ( LOG.isDebugEnabled() ) {
for ( var waitingListEntry : toBeLinkedQueue.entrySet() ) {
for ( ExtendsQueueEntry waitingEntry : waitingListEntry.getValue() ) {
- log.debugf(
+ LOG.debugf(
"Entity supertype named as extends [%s] for subclass [%s:%s] not found",
waitingListEntry.getKey(),
waitingEntry.sourceMappingDocument.getOrigin(),
@@ -84,7 +84,7 @@ public List buildHierarchies() throws HibernateExcept
* @param mappingDocument The {@code hbm.xml} document to index
*/
public void indexMappingDocument(MappingDocument mappingDocument) {
- log.tracef( "Indexing mapping document [%s] for purpose of building entity hierarchy ordering", mappingDocument.getOrigin() );
+ LOG.tracef( "Indexing mapping document [%s] for purpose of building entity hierarchy ordering", mappingDocument.getOrigin() );
final JaxbHbmHibernateMapping mappingBinding = mappingDocument.getDocumentRoot();
// iterate all root class definitions at the hibernate-mapping level
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FetchProfileBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FetchProfileBinder.java
index b8240d41c4ee..75f2f68df88d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FetchProfileBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FetchProfileBinder.java
@@ -17,7 +17,7 @@
* @author Steve Ebersole
*/
public class FetchProfileBinder {
- private static final Logger log = Logger.getLogger( FetchProfileBinder.class );
+ private static final Logger LOG = Logger.getLogger( FetchProfileBinder.class );
/**
* Handling for a {@code } declaration.
@@ -50,7 +50,7 @@ public static void processFetchProfile(
String containingEntityName) {
FetchProfile profile = context.getMetadataCollector().getFetchProfile( fetchProfileBinding.getName() );
if ( profile == null ) {
- log.tracef( "Creating FetchProfile: %s", fetchProfileBinding.getName() );
+ LOG.tracef( "Creating FetchProfile: %s", fetchProfileBinding.getName() );
profile = new FetchProfile( fetchProfileBinding.getName(), MetadataSource.HBM );
context.getMetadataCollector().addFetchProfile( profile );
}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FilterDefinitionBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FilterDefinitionBinder.java
index e5a3ed45fade..7e3f5527e943 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FilterDefinitionBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FilterDefinitionBinder.java
@@ -24,7 +24,7 @@
* @author Steve Ebersole
*/
class FilterDefinitionBinder {
- private static final Logger log = Logger.getLogger( FilterDefinitionBinder.class );
+ private static final Logger LOG = Logger.getLogger( FilterDefinitionBinder.class );
/**
* Handling for a {@code } declaration.
@@ -43,8 +43,8 @@ static void processFilterDefinition(
if ( content instanceof String string ) {
final String contentString = string.trim();
if ( isNotEmpty( contentString ) ) {
- if ( condition != null && log.isDebugEnabled() ) {
- log.debugf(
+ if ( condition != null && LOG.isDebugEnabled() ) {
+ LOG.debugf(
"filter-def [name=%s, origin=%s] defined multiple conditions, accepting arbitrary one",
jaxbFilterDefinitionMapping.getName(),
context.getOrigin().toString()
@@ -87,6 +87,6 @@ else if ( content instanceof JAXBElement ) {
)
);
- log.tracef( "Processed filter definition: %s", jaxbFilterDefinitionMapping.getName() );
+ LOG.tracef( "Processed filter definition: %s", jaxbFilterDefinitionMapping.getName() );
}
}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/HbmMetadataSourceProcessorImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/HbmMetadataSourceProcessorImpl.java
index 1a8bc0ff8a91..44fd697dc306 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/HbmMetadataSourceProcessorImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/HbmMetadataSourceProcessorImpl.java
@@ -24,7 +24,7 @@
* @author Steve Ebersole
*/
public class HbmMetadataSourceProcessorImpl implements MetadataSourceProcessor {
- private static final Logger log = Logger.getLogger( HbmMetadataSourceProcessorImpl.class );
+ private static final Logger LOG = Logger.getLogger( HbmMetadataSourceProcessorImpl.class );
private final Collection mappingDocuments;
@@ -127,8 +127,8 @@ public void processEntityHierarchies(Set processedEntityNames) {
hierarchy_loop : for ( EntityHierarchySourceImpl entityHierarchy : entityHierarchies ) {
for ( String entityName : entityHierarchy.getContainedEntityNames() ) {
if ( processedEntityNames.contains( entityName ) ) {
- if ( log.isDebugEnabled() ) {
- log.debugf(
+ if ( LOG.isDebugEnabled() ) {
+ LOG.debugf(
"Skipping HBM processing of entity hierarchy [%s], as at least one entity [%s] has been processed",
entityHierarchy.getRoot().getEntityNamingSource().getEntityName(),
entityName
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/IdentifierGeneratorDefinitionBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/IdentifierGeneratorDefinitionBinder.java
index 2108ceef88ee..1ba24a845ef9 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/IdentifierGeneratorDefinitionBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/IdentifierGeneratorDefinitionBinder.java
@@ -13,12 +13,12 @@
* @author Steve Ebersole
*/
public class IdentifierGeneratorDefinitionBinder {
- private static final Logger log = Logger.getLogger( IdentifierGeneratorDefinitionBinder.class );
+ private static final Logger LOG = Logger.getLogger( IdentifierGeneratorDefinitionBinder.class );
public static void processIdentifierGeneratorDefinition(
HbmLocalMetadataBuildingContext context,
JaxbHbmIdentifierGeneratorDefinitionType identifierGenerator) {
- log.tracef( "Processing : %s", identifierGenerator.getName() );
+ LOG.tracef( "Processing : %s", identifierGenerator.getName() );
context.getMetadataCollector().addIdentifierGenerator(
new IdentifierGeneratorDefinition(
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/MappingDocument.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/MappingDocument.java
index 479bebd3307c..3cb9938c2ae2 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/MappingDocument.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/MappingDocument.java
@@ -40,7 +40,7 @@
* @author Steve Ebersole
*/
public class MappingDocument implements HbmLocalMetadataBuildingContext, MetadataSourceProcessor {
- private static final Logger log = Logger.getLogger( MappingDocument.class );
+ private static final Logger LOG = Logger.getLogger( MappingDocument.class );
private final JaxbHbmHibernateMapping documentRoot;
private final Origin origin;
@@ -186,7 +186,7 @@ public void processQueryRenames() {
? StringHelper.unqualify( name )
: renameBinding.getRename();
getMetadataCollector().addImport( rename, name );
- log.tracef( "Import (query rename): %s -> %s", rename, name );
+ LOG.tracef( "Import (query rename): %s -> %s", rename, name );
}
}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ModelBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ModelBinder.java
index d53c452a2b8c..9a9c288a874f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ModelBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ModelBinder.java
@@ -120,7 +120,7 @@
* @author Steve Ebersole
*/
public class ModelBinder {
- private static final CoreMessageLogger log = CoreLogging.messageLogger( ModelBinder.class );
+ private static final CoreMessageLogger LOG = CoreLogging.messageLogger( ModelBinder.class );
private final MetadataBuildingContext metadataBuildingContext;
@@ -178,8 +178,8 @@ private void bindRootEntity(EntityHierarchySourceImpl hierarchySource, RootClass
);
rootEntityDescriptor.setTable( primaryTable );
- if ( log.isTraceEnabled() ) {
- log.tracef( "Mapping class: %s -> %s",
+ if ( LOG.isTraceEnabled() ) {
+ LOG.tracef( "Mapping class: %s -> %s",
rootEntityDescriptor.getEntityName(),
primaryTable.getName() );
}
@@ -460,8 +460,8 @@ private void bindJoinedSubclassEntity(
);
entityDescriptor.setTable( primaryTable );
- if ( log.isTraceEnabled() ) {
- log.tracef( "Mapping joined-subclass: %s -> %s",
+ if ( LOG.isTraceEnabled() ) {
+ LOG.tracef( "Mapping joined-subclass: %s -> %s",
entityDescriptor.getEntityName(),
primaryTable.getName() );
}
@@ -530,8 +530,8 @@ private void bindUnionSubclassEntity(
);
entityDescriptor.setTable( primaryTable );
- if ( log.isTraceEnabled() ) {
- log.tracef( "Mapping union-subclass: %s -> %s",
+ if ( LOG.isTraceEnabled() ) {
+ LOG.tracef( "Mapping union-subclass: %s -> %s",
entityDescriptor.getEntityName(),
primaryTable.getName() );
}
@@ -1444,8 +1444,8 @@ private void bindSecondaryTable(
secondaryTableJoin.setInverse( secondaryTableSource.isInverse() );
secondaryTableJoin.setOptional( secondaryTableSource.isOptional() );
- if ( log.isTraceEnabled() ) {
- log.tracef(
+ if ( LOG.isTraceEnabled() ) {
+ LOG.tracef(
"Mapping entity secondary-table: %s -> %s",
persistentClass.getEntityName(),
secondaryTable.getName()
@@ -1712,7 +1712,7 @@ private void handlePropertyReference(
);
}
else {
- log.tracef(
+ LOG.tracef(
"Property [%s.%s] referenced by property-ref [%s] was available - no need for delayed handling",
referencedEntityName,
referencedPropertyName,
@@ -1726,7 +1726,7 @@ private void handlePropertyReference(
private void registerDelayedPropertyReferenceHandler(
DelayedPropertyReferenceHandlerImpl handler,
MetadataBuildingContext buildingContext) {
- log.tracef(
+ LOG.tracef(
"Property [%s.%s] referenced by property-ref [%s] was not yet available - creating delayed handler",
handler.referencedEntityName,
handler.referencedPropertyName,
@@ -2117,7 +2117,7 @@ private BasicType resolveExplicitlyNamedAnyDiscriminatorType(
return (BasicType) typeInstance;
}
catch (ClassLoadingException e) {
- log.debugf( "Unable to load explicit any-discriminator type name as Java Class - %s", typeName );
+ LOG.debugf( "Unable to load explicit any-discriminator type name as Java Class - %s", typeName );
}
throw new org.hibernate.MappingException(
@@ -2211,8 +2211,8 @@ private void bindProperty(
property.setMetaAttributes( propertySource.getToolingHintContext().getMetaAttributeMap() );
- if ( log.isTraceEnabled() ) {
- log.trace( "Mapped property: " + propertySource.getName() + " -> [" + columns( property.getValue() ) + "]" );
+ if ( LOG.isTraceEnabled() ) {
+ LOG.trace( "Mapped property: " + propertySource.getName() + " -> [" + columns( property.getValue() ) + "]" );
}
}
@@ -2256,7 +2256,7 @@ private static void handleGenerationTiming(
// generated properties can *never* be insertable...
if ( property.isInsertable() && timing.includesInsert() ) {
- log.tracef(
+ LOG.tracef(
"Property [%s] specified %s generation, setting insertable to false: %s",
propertySource.getName(),
timing.name(),
@@ -2267,7 +2267,7 @@ private static void handleGenerationTiming(
// properties generated on update can never be updatable...
if ( property.isUpdatable() && timing.includesUpdate() ) {
- log.tracef(
+ LOG.tracef(
"Property [%s] specified ALWAYS generation, setting updateable to false: %s",
propertySource.getName(),
mappingDocument.getOrigin()
@@ -2325,23 +2325,23 @@ private void bindComponent(
// todo : better define the conditions in this if/else
if ( isDynamic ) {
// dynamic is represented as a Map
- log.tracef( "Binding dynamic component [%s]", role );
+ LOG.tracef( "Binding dynamic component [%s]", role );
componentBinding.setDynamic( true );
}
else if ( isVirtual ) {
// virtual (what used to be called embedded) is just a conceptual composition...
// for example
if ( componentBinding.getOwner().hasPojoRepresentation() ) {
- log.tracef( "Binding virtual component [%s] to owner class [%s]", role, componentBinding.getOwner().getClassName() );
+ LOG.tracef( "Binding virtual component [%s] to owner class [%s]", role, componentBinding.getOwner().getClassName() );
componentBinding.setComponentClassName( componentBinding.getOwner().getClassName() );
}
else {
- log.tracef( "Binding virtual component [%s] as dynamic", role );
+ LOG.tracef( "Binding virtual component [%s] as dynamic", role );
componentBinding.setDynamic( true );
}
}
else {
- log.tracef( "Binding component [%s]", role );
+ LOG.tracef( "Binding component [%s]", role );
if ( isNotEmpty( explicitComponentClassName ) ) {
try {
final Class componentClass =
@@ -2359,20 +2359,20 @@ else if ( isVirtual ) {
}
}
catch (ClassLoadingException ex) {
- log.debugf( ex, "Could load component class [%s]", explicitComponentClassName );
+ LOG.debugf( ex, "Could load component class [%s]", explicitComponentClassName );
}
- log.tracef( "Binding component [%s] to explicitly specified class", role, explicitComponentClassName );
+ LOG.tracef( "Binding component [%s] to explicitly specified class", role, explicitComponentClassName );
componentBinding.setComponentClassName( explicitComponentClassName );
}
else if ( componentBinding.getOwner().hasPojoRepresentation() ) {
- log.tracef( "Attempting to determine component class by reflection %s", role );
+ LOG.tracef( "Attempting to determine component class by reflection %s", role );
final Class reflectedComponentClass =
isNotEmpty( containingClassName ) && isNotEmpty( propertyName )
? reflectedPropertyClass( sourceDocument, containingClassName, propertyName )
: null;
if ( reflectedComponentClass == null ) {
- log.debugf(
+ LOG.debugf(
"Unable to determine component class name via reflection, and explicit " +
"class name not given; role=[%s]",
role
@@ -2787,7 +2787,7 @@ public DelayedPropertyReferenceHandlerImpl(
}
public void process(InFlightMetadataCollector metadataCollector) {
- log.tracef(
+ LOG.tracef(
"Performing delayed property-ref handling [%s, %s, %s]",
referencedEntityName,
referencedPropertyName,
@@ -2866,19 +2866,19 @@ public void doSecondPass(Map persistentClasses) {
collectionBinding.createAllKeys();
- if ( log.isTraceEnabled() ) {
+ if ( LOG.isTraceEnabled() ) {
final Collection collectionBinding = getCollectionBinding();
- log.tracef( "Mapped collection: %s", getPluralAttributeSource().getAttributeRole().getFullPath() );
- log.tracef( " + table -> %s", collectionBinding.getTable().getName() );
- log.tracef( " + key -> %s", columns( collectionBinding.getKey() ) );
+ LOG.tracef( "Mapped collection: %s", getPluralAttributeSource().getAttributeRole().getFullPath() );
+ LOG.tracef( " + table -> %s", collectionBinding.getTable().getName() );
+ LOG.tracef( " + key -> %s", columns( collectionBinding.getKey() ) );
if ( collectionBinding.isIndexed() ) {
- log.tracef( " + index -> %s", columns( ( (IndexedCollection) collectionBinding).getIndex() ) );
+ LOG.tracef( " + index -> %s", columns( ( (IndexedCollection) collectionBinding).getIndex() ) );
}
if ( collectionBinding.isOneToMany() ) {
- log.tracef( " + one-to-many -> %s", ( (OneToMany) collectionBinding.getElement() ).getReferencedEntityName() );
+ LOG.tracef( " + one-to-many -> %s", ( (OneToMany) collectionBinding.getElement() ).getReferencedEntityName() );
}
else {
- log.tracef( " + element -> %s", columns( collectionBinding.getElement() ) );
+ LOG.tracef( " + element -> %s", columns( collectionBinding.getElement() ) );
}
}
}
@@ -2933,8 +2933,8 @@ private void bindCollectionTable() {
final Table collectionTable = collectionBinding.getCollectionTable();
- if ( log.isTraceEnabled() ) {
- log.tracef( "Mapping collection: %s -> %s",
+ if ( LOG.isTraceEnabled() ) {
+ LOG.tracef( "Mapping collection: %s -> %s",
collectionBinding.getRole(),
collectionTable.getName() );
}
@@ -3004,8 +3004,8 @@ protected void createBackReferences() {
backref.setValue( collectionBinding.getKey() );
referenced.addProperty( backref );
- if ( log.isTraceEnabled() ) {
- log.tracef(
+ if ( LOG.isTraceEnabled() ) {
+ LOG.tracef(
"Added virtual backref property [%s] : %s",
backref.getName(),
pluralAttributeSource.getAttributeRole().getFullPath()
@@ -3098,8 +3098,8 @@ protected void bindCollectionIndex() {
protected void bindCollectionElement() {
final PluralAttributeElementSource pluralElementSource = getPluralAttributeSource().getElementSource();
- if ( log.isTraceEnabled() ) {
- log.tracef(
+ if ( LOG.isTraceEnabled() ) {
+ LOG.tracef(
"Binding [%s] element type for a [%s]",
pluralElementSource.getNature(),
getPluralAttributeSource().getNature()
@@ -3240,8 +3240,8 @@ else if ( pluralElementSource instanceof PluralAttributeElementSourceManyToMany
for ( FilterSource filterSource : elementSource.getFilterSources() ) {
if ( filterSource.getName() == null ) {
- if ( log.isTraceEnabled() ) {
- log.tracef(
+ if ( LOG.isTraceEnabled() ) {
+ LOG.tracef(
"Encountered filter with no name associated with many-to-many [%s]; skipping",
getPluralAttributeSource().getAttributeRole().getFullPath()
);
@@ -3261,8 +3261,8 @@ else if ( pluralElementSource instanceof PluralAttributeElementSourceManyToMany
);
}
- if ( log.isTraceEnabled() ) {
- log.tracef(
+ if ( LOG.isTraceEnabled() ) {
+ LOG.tracef(
"Applying many-to-many filter [%s] as [%s] to collection [%s]",
filterSource.getName(),
filterSource.getCondition(),
@@ -3857,7 +3857,7 @@ public void addAttributeBinding(Property attributeBinding) {
@Override
public void process() {
- log.tracef( "Binding natural-id UniqueKey for entity: %s", entityBinding.getEntityName() );
+ LOG.tracef( "Binding natural-id UniqueKey for entity: %s", entityBinding.getEntityName() );
final List columnNames = new ArrayList<>();
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/TypeDefinitionBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/TypeDefinitionBinder.java
index ed52b61e7464..f159dcdc8e62 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/TypeDefinitionBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/TypeDefinitionBinder.java
@@ -13,7 +13,7 @@
* @author Steve Ebersole
*/
public class TypeDefinitionBinder {
- private static final Logger log = Logger.getLogger( TypeDefinitionBinder.class );
+ private static final Logger LOG = Logger.getLogger( TypeDefinitionBinder.class );
/**
* Handling for a {@code } declaration
@@ -33,8 +33,8 @@ public static void processTypeDefinition(
ConfigParameterHelper.extractConfigParameters( typeDefinitionBinding )
);
- if ( log.isTraceEnabled() ) {
- log.tracef(
+ if ( LOG.isTraceEnabled() ) {
+ LOG.tracef(
"Processed type-definition : %s -> %s",
definition.getName(),
definition.getTypeImplementorClass().getName()
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/AggregatedServiceLoader.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/AggregatedServiceLoader.java
index 32a55a717613..eccb9b71ee79 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/AggregatedServiceLoader.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/AggregatedServiceLoader.java
@@ -24,7 +24,7 @@
*/
abstract class AggregatedServiceLoader {
- private static final CoreMessageLogger log = CoreLogging.messageLogger( AggregatedServiceLoader.class );
+ private static final CoreMessageLogger LOG = CoreLogging.messageLogger( AggregatedServiceLoader.class );
static AggregatedServiceLoader create(AggregatedClassLoader aggregatedClassLoader,
Class serviceContract) {
@@ -151,7 +151,7 @@ private boolean hasNextIgnoringServiceConfigurationError(Iterator iterator) {
return iterator.hasNext();
}
catch (ServiceConfigurationError e) {
- log.ignoringServiceConfigurationError( serviceContract.getName(), e );
+ LOG.ignoringServiceConfigurationError( serviceContract.getName(), e );
}
}
}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/ClassLoaderServiceImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/ClassLoaderServiceImpl.java
index 4d31b869a172..3e63c3ffa903 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/ClassLoaderServiceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/ClassLoaderServiceImpl.java
@@ -31,7 +31,7 @@
*/
public class ClassLoaderServiceImpl implements ClassLoaderService {
- private static final CoreMessageLogger log = CoreLogging.messageLogger( ClassLoaderServiceImpl.class );
+ private static final CoreMessageLogger LOG = CoreLogging.messageLogger( ClassLoaderServiceImpl.class );
private static final String CLASS_PATH_SCHEME = "classpath://";
@@ -133,7 +133,7 @@ public URL locateResource(String name) {
public InputStream locateResourceStream(String name) {
// first we try name as a URL
try {
- log.tracef( "trying via [new URL(\"%s\")]", name );
+ LOG.tracef( "trying via [new URL(\"%s\")]", name );
return new URL( name ).openStream();
}
catch (Exception ignore) {
@@ -144,7 +144,7 @@ public InputStream locateResourceStream(String name) {
name = stripClasspathScheme( name );
try {
- log.tracef( "trying via [ClassLoader.getResourceAsStream(\"%s\")]", name );
+ LOG.tracef( "trying via [ClassLoader.getResourceAsStream(\"%s\")]", name );
final InputStream stream = getAggregatedClassLoader().getResourceAsStream( name );
if ( stream != null ) {
return stream;
@@ -157,14 +157,14 @@ public InputStream locateResourceStream(String name) {
if ( stripped != null ) {
try {
- log.tracef( "trying via [new URL(\"%s\")]", stripped );
+ LOG.tracef( "trying via [new URL(\"%s\")]", stripped );
return new URL( stripped ).openStream();
}
catch (Exception ignore) {
}
try {
- log.tracef( "trying via [ClassLoader.getResourceAsStream(\"%s\")]", stripped );
+ LOG.tracef( "trying via [ClassLoader.getResourceAsStream(\"%s\")]", stripped );
final InputStream stream = getAggregatedClassLoader().getResourceAsStream( stripped );
if ( stream != null ) {
return stream;
@@ -222,11 +222,11 @@ public Package packageForNameOrNull(String packageName) {
.getPackage();
}
catch (ClassNotFoundException e) {
- log.packageNotFound( packageName );
+ LOG.packageNotFound( packageName );
return null;
}
catch (LinkageError e) {
- log.linkageError( packageName, e );
+ LOG.linkageError( packageName, e );
return null;
}
}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/StrategySelectorBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/StrategySelectorBuilder.java
index 84ed7df99401..0f604e0f33e5 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/StrategySelectorBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/StrategySelectorBuilder.java
@@ -60,7 +60,7 @@
* @author Steve Ebersole
*/
public class StrategySelectorBuilder {
- private static final Logger log = Logger.getLogger( StrategySelectorBuilder.class );
+ private static final Logger LOG = Logger.getLogger( StrategySelectorBuilder.class );
private final List> explicitStrategyRegistrations = new ArrayList<>();
@@ -87,8 +87,8 @@ public void addExplicitStrategyRegistration(Class strategy, Class void addExplicitStrategyRegistration(StrategyRegistration strategyRegistration) {
if ( !strategyRegistration.getStrategyRole().isInterface() ) {
// not good form...
- if ( log.isTraceEnabled() ) {
- log.tracef( "Registering non-interface strategy : %s", strategyRegistration.getStrategyRole().getName() );
+ if ( LOG.isTraceEnabled() ) {
+ LOG.tracef( "Registering non-interface strategy : %s", strategyRegistration.getStrategyRole().getName() );
}
}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/StrategySelectorImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/StrategySelectorImpl.java
index c4e35764e14a..df0b77682b88 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/StrategySelectorImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/StrategySelectorImpl.java
@@ -32,7 +32,7 @@
* @author Steve Ebersole
*/
public class StrategySelectorImpl implements StrategySelector {
- private static final Logger log = Logger.getLogger( StrategySelectorImpl.class );
+ private static final Logger LOG = Logger.getLogger( StrategySelectorImpl.class );
private static final StrategyCreator STANDARD_STRATEGY_CREATOR = StrategySelectorImpl::create;
@@ -201,9 +201,9 @@ private void contributeImplementation(Class strategy, Class
for ( String name : names ) {
final Class old = namedStrategyImplementorMap.put( name, implementation );
- if ( log.isTraceEnabled() ) {
+ if ( LOG.isTraceEnabled() ) {
if ( old == null ) {
- log.tracef(
+ LOG.tracef(
"Strategy selector for %s: '%s' -> %s",
strategy.getSimpleName(),
name,
@@ -211,7 +211,7 @@ private void contributeImplementation(Class strategy, Class
);
}
else {
- log.tracef(
+ LOG.tracef(
"Strategy selector for %s: '%s' -> %s (replacing %s)",
strategy.getSimpleName(),
name,
@@ -226,7 +226,7 @@ private void contributeImplementation(Class strategy, Class
private void removeImplementation(Class strategy, Class implementation) {
final Map> namedStrategyImplementorMap = namedStrategyImplementorByStrategyMap.get( strategy );
if ( namedStrategyImplementorMap == null ) {
- log.debug( "Named strategy map did not exist on call to unregister" );
+ LOG.debug( "Named strategy map did not exist on call to unregister" );
return;
}
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/BiDirectionalAssociationHandler.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/BiDirectionalAssociationHandler.java
index 6bf697630176..03592a44ff4e 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/BiDirectionalAssociationHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/BiDirectionalAssociationHandler.java
@@ -40,7 +40,7 @@
final class BiDirectionalAssociationHandler implements Implementation {
- private static final CoreMessageLogger log = CoreLogging.messageLogger( BiDirectionalAssociationHandler.class );
+ private static final CoreMessageLogger LOG = CoreLogging.messageLogger( BiDirectionalAssociationHandler.class );
static Implementation wrap(
TypeDescription managedCtClass,
@@ -64,8 +64,8 @@ static Implementation wrap(
bidirectionalAttributeName = mappedBy;
}
if ( bidirectionalAttributeName == null || bidirectionalAttributeName.isEmpty() ) {
- if ( log.isInfoEnabled() ) {
- log.infof(
+ if ( LOG.isInfoEnabled() ) {
+ LOG.infof(
"Bidirectional association not managed for field [%s#%s]: Could not find target field in [%s]",
managedCtClass.getName(),
persistentField.getName(),
@@ -120,8 +120,8 @@ static Implementation wrap(
if ( persistentField.hasAnnotation( ManyToMany.class ) ) {
if ( persistentField.getType().asErasure().isAssignableTo( Map.class ) || targetType.isAssignableTo( Map.class ) ) {
- if ( log.isInfoEnabled() ) {
- log.infof(
+ if ( LOG.isInfoEnabled() ) {
+ LOG.infof(
"Bidirectional association not managed for field [%s#%s]: @ManyToMany in java.util.Map attribute not supported ",
managedCtClass.getName(),
persistentField.getName()
@@ -167,8 +167,8 @@ public static TypeDescription getTargetEntityClass(TypeDescription managedCtClas
}
if ( targetClass == null ) {
- if ( log.isInfoEnabled() ) {
- log.infof(
+ if ( LOG.isInfoEnabled() ) {
+ LOG.infof(
"Bidirectional association not managed for field [%s#%s]: Could not find target type",
managedCtClass.getName(),
persistentField.getName()
@@ -253,8 +253,8 @@ private static String getMappedByManyToMany(AnnotatedFieldDescription target, Ty
if ( context.isPersistentField( annotatedF )
&& target.getName().equals( getMappedBy( annotatedF, entityType( annotatedF.getType() ), context ) )
&& target.getDeclaringType().asErasure().isAssignableTo( entityType( annotatedF.getType() ) ) ) {
- if ( log.isTraceEnabled() ) {
- log.tracef(
+ if ( LOG.isTraceEnabled() ) {
+ LOG.tracef(
"mappedBy association for field [%s#%s] is [%s#%s]",
target.getDeclaringType().asErasure().getName(),
target.getName(),
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerImpl.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerImpl.java
index 14255d008a20..7c7fe759419d 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerImpl.java
@@ -69,7 +69,7 @@
import static org.hibernate.bytecode.enhance.internal.bytebuddy.FeatureMismatchException.Feature.DIRTY_CHECK;
public class EnhancerImpl implements Enhancer {
- private static final CoreMessageLogger log = CoreLogging.messageLogger( Enhancer.class );
+ private static final CoreMessageLogger LOG = CoreLogging.messageLogger( Enhancer.class );
protected final ByteBuddyEnhancementContext enhancementContext;
private final ByteBuddyState byteBuddyState;
@@ -172,19 +172,19 @@ private DynamicType.Builder doEnhance(Supplier> builde
verifyReEnhancement( managedCtClass, infoAnnotation.load(), enhancementContext );
}
// verification succeeded (or not done) - we can simply skip the enhancement
- log.tracef( "Skipping enhancement of [%s]: it's already annotated with @EnhancementInfo", managedCtClass.getName() );
+ LOG.tracef( "Skipping enhancement of [%s]: it's already annotated with @EnhancementInfo", managedCtClass.getName() );
return null;
}
// can't effectively enhance interfaces
if ( managedCtClass.isInterface() ) {
- log.tracef( "Skipping enhancement of [%s]: it's an interface", managedCtClass.getName() );
+ LOG.tracef( "Skipping enhancement of [%s]: it's an interface", managedCtClass.getName() );
return null;
}
// can't effectively enhance records
if ( managedCtClass.isRecord() ) {
- log.tracef( "Skipping enhancement of [%s]: it's a record", managedCtClass.getName() );
+ LOG.tracef( "Skipping enhancement of [%s]: it's a record", managedCtClass.getName() );
return null;
}
@@ -194,7 +194,7 @@ private DynamicType.Builder doEnhance(Supplier> builde
return null;
}
- log.tracef( "Enhancing [%s] as Entity", managedCtClass.getName() );
+ LOG.tracef( "Enhancing [%s] as Entity", managedCtClass.getName() );
DynamicType.Builder builder = builderSupplier.get();
builder = builder
.implement( constants.INTERFACES_for_ManagedEntity )
@@ -374,7 +374,7 @@ else if ( enhancementContext.isCompositeClass( managedCtClass ) ) {
return null;
}
- log.tracef( "Enhancing [%s] as Composite", managedCtClass.getName() );
+ LOG.tracef( "Enhancing [%s] as Composite", managedCtClass.getName() );
DynamicType.Builder builder = builderSupplier.get();
builder = builder.implement( constants.INTERFACES_for_ManagedComposite );
@@ -412,18 +412,18 @@ else if ( enhancementContext.isMappedSuperclassClass( managedCtClass ) ) {
return null;
}
- log.tracef( "Enhancing [%s] as MappedSuperclass", managedCtClass.getName() );
+ LOG.tracef( "Enhancing [%s] as MappedSuperclass", managedCtClass.getName() );
DynamicType.Builder builder = builderSupplier.get();
builder = builder.implement( constants.INTERFACES_for_ManagedMappedSuperclass );
return createTransformer( managedCtClass ).applyTo( builder );
}
else if ( enhancementContext.doExtendedEnhancement() ) {
- log.tracef( "Extended enhancement of [%s]", managedCtClass.getName() );
+ LOG.tracef( "Extended enhancement of [%s]", managedCtClass.getName() );
return createTransformer( managedCtClass ).applyExtended( builderSupplier.get() );
}
else {
- log.tracef( "Skipping enhancement of [%s]: not entity or composite", managedCtClass.getName() );
+ LOG.tracef( "Skipping enhancement of [%s]: not entity or composite", managedCtClass.getName() );
return null;
}
}
@@ -436,7 +436,7 @@ private void verifyReEnhancement(
final String enhancementVersion = existingInfo.version();
if ( "ignore".equals( enhancementVersion ) ) {
// for testing
- log.debugf( "Skipping re-enhancement version check for %s due to `ignore`", managedCtClass.getName() );
+ LOG.debugf( "Skipping re-enhancement version check for %s due to `ignore`", managedCtClass.getName() );
}
else if ( !Version.getVersionString().equals( enhancementVersion ) ) {
throw new VersionMismatchException( managedCtClass, enhancementVersion, Version.getVersionString() );
@@ -607,7 +607,7 @@ private static boolean checkUnsupportedAttributeNaming(TypeDescription managedCt
// We shouldn't even be in this method if using LEGACY, see top of this method.
return switch ( strategy ) {
case SKIP -> {
- log.debugf(
+ LOG.debugf(
"Skipping enhancement of [%s] because no field named [%s] could be found for property accessor method [%s]."
+ " To fix this, make sure all property accessor methods have a matching field.",
managedCtClass.getName(),
@@ -666,7 +666,7 @@ private boolean alreadyEnhanced(TypeDescription managedCtClass) {
private DynamicType.Builder addInterceptorHandling(DynamicType.Builder builder, TypeDescription managedCtClass) {
// interceptor handling is only needed if class has lazy-loadable attributes
if ( enhancementContext.hasLazyLoadableAttributes( managedCtClass ) ) {
- log.tracef( "Weaving in PersistentAttributeInterceptable implementation on [%s]", managedCtClass.getName() );
+ LOG.tracef( "Weaving in PersistentAttributeInterceptable implementation on [%s]", managedCtClass.getName() );
builder = builder.implement( constants.INTERFACES_for_PersistentAttributeInterceptable );
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/FieldAccessEnhancer.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/FieldAccessEnhancer.java
index 6f03d2b44ae0..6ff6f0848322 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/FieldAccessEnhancer.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/FieldAccessEnhancer.java
@@ -33,7 +33,7 @@
final class FieldAccessEnhancer implements AsmVisitorWrapper.ForDeclaredMethods.MethodVisitorWrapper {
- private static final CoreMessageLogger log = CoreLogging.messageLogger( FieldAccessEnhancer.class );
+ private static final CoreMessageLogger LOG = CoreLogging.messageLogger( FieldAccessEnhancer.class );
private final TypeDescription managedCtClass;
@@ -76,7 +76,7 @@ public void visitFieldInsn(int opcode, String owner, String name, String desc) {
&& !field.hasAnnotation( Id.class )
&& !field.getName().equals( "this$0" ) ) {
- log.tracef(
+ LOG.tracef(
"Extended enhancement: Transforming access to field [%s#%s] from method [%s#%s()]",
declaredOwnerType.getName(),
field.getName(),
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/PersistentAttributeTransformer.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/PersistentAttributeTransformer.java
index 7ec0b142d897..10d572a09fe2 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/PersistentAttributeTransformer.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/PersistentAttributeTransformer.java
@@ -43,7 +43,7 @@
final class PersistentAttributeTransformer implements AsmVisitorWrapper.ForDeclaredMethods.MethodVisitorWrapper {
- private static final CoreMessageLogger log = CoreLogging.messageLogger( PersistentAttributeTransformer.class );
+ private static final CoreMessageLogger LOG = CoreLogging.messageLogger( PersistentAttributeTransformer.class );
private static final Junction NOT_HIBERNATE_GENERATED = not( nameStartsWith( "$$_hibernate_" ) );
private static final ModifierContributor.ForField REMOVE_PRIVATE_FINAL_MODIFIER = new ModifierContributor.ForField() {
@@ -130,8 +130,8 @@ public static PersistentAttributeTransformer collectPersistentFields(
}
AnnotatedFieldDescription[] orderedFields = enhancementContext.order( persistentFieldList.toArray( new AnnotatedFieldDescription[0] ) );
- if ( log.isTraceEnabled() ) {
- log.tracef(
+ if ( LOG.isTraceEnabled() ) {
+ LOG.tracef(
"Persistent fields for entity %s: %s",
managedCtClass.getName(),
Arrays.toString( orderedFields )
@@ -158,7 +158,7 @@ else if ( !enhancementContext.isMappedSuperclassClass( managedCtSuperclass.asEra
return collectInheritPersistentFields( managedCtSuperclass, enhancementContext );
}
- log.tracef( "Found @MappedSuperclass %s to collectPersistenceFields", managedCtSuperclass );
+ LOG.tracef( "Found @MappedSuperclass %s to collectPersistenceFields", managedCtSuperclass );
List persistentFieldList = new ArrayList<>();
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..fc3e0f5e3ab5 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,6 +55,7 @@
import org.checkerframework.checker.nullness.qual.Nullable;
public class BytecodeProviderImpl implements BytecodeProvider {
+
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( BytecodeProviderImpl.class );
private static final String INSTANTIATOR_PROXY_NAMING_SUFFIX = "$HibernateInstantiator";
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..5728d8ad10b0 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,6 +42,7 @@
*/
public class CollectionCacheInvalidator
implements Integrator, PostInsertEventListener, PostDeleteEventListener, PostUpdateEventListener {
+
private static final Logger LOG = Logger.getLogger( CollectionCacheInvalidator.class.getName() );
/**
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..093e2fc606be 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,6 +49,7 @@
* @author Gail Badner
*/
public class EnabledCaching implements CacheImplementor, DomainDataRegionBuildingContext {
+
private static final SecondLevelCacheLogger LOG = SecondLevelCacheLogger.L2CACHE_LOGGER;
private final SessionFactoryImplementor sessionFactory;
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..bef05c90747d 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,6 +29,7 @@
* @author Brett Meyer
*/
public class RegionFactoryInitiator implements StandardServiceInitiator {
+
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( RegionFactoryInitiator.class );
/**
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/EntityReadOnlyAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/EntityReadOnlyAccess.java
index 110e10cc9e3d..1bb483cfb63d 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/EntityReadOnlyAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/EntityReadOnlyAccess.java
@@ -62,7 +62,7 @@ public boolean update(
Object value,
Object currentVersion,
Object previousVersion) {
-// log.debugf( "Illegal attempt to update item cached as read-only [%s]", key );
+// LOG.debugf( "Illegal attempt to update item cached as read-only [%s]", key );
throw new UnsupportedOperationException( "Can't update read-only object" );
}
@@ -74,7 +74,7 @@ public boolean afterUpdate(
Object currentVersion,
Object previousVersion,
SoftLock lock) {
-// log.debugf( "Illegal attempt to update item cached as read-only [%s]", key );
+// LOG.debugf( "Illegal attempt to update item cached as read-only [%s]", key );
throw new UnsupportedOperationException( "Can't write to a read-only object" );
}
}
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java b/hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java
index 0af085a7c064..eb28dd6f240c 100644
--- a/hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java
+++ b/hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java
@@ -142,7 +142,7 @@
* @see org.hibernate.jpa.HibernatePersistenceConfiguration
*/
public class Configuration {
- private static final CoreMessageLogger log = CoreLogging.messageLogger( Configuration.class );
+ private static final CoreMessageLogger LOG = CoreLogging.messageLogger( Configuration.class );
private final BootstrapServiceRegistry bootstrapServiceRegistry;
private final MetadataSources metadataSources;
@@ -1024,7 +1024,7 @@ public Configuration setColumnOrderingStrategy(ColumnOrderingStrategy columnOrde
* @throws HibernateException usually indicates an invalid configuration or invalid mapping information
*/
public SessionFactory buildSessionFactory(ServiceRegistry serviceRegistry) throws HibernateException {
- log.trace( "Building session factory using provided StandardServiceRegistry" );
+ LOG.trace( "Building session factory using provided StandardServiceRegistry" );
final MetadataBuilder metadataBuilder =
metadataSources.getMetadataBuilder( (StandardServiceRegistry) serviceRegistry );
@@ -1127,7 +1127,7 @@ public SessionFactory buildSessionFactory(ServiceRegistry serviceRegistry) throw
* @throws HibernateException usually indicates an invalid configuration or invalid mapping information
*/
public SessionFactory buildSessionFactory() throws HibernateException {
- log.trace( "Building session factory using internal StandardServiceRegistryBuilder" );
+ LOG.trace( "Building session factory using internal StandardServiceRegistryBuilder" );
standardServiceRegistryBuilder.applySettings( properties );
var serviceRegistry = standardServiceRegistryBuilder.build();
try {
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..0560029277be 100644
--- a/hibernate-core/src/main/java/org/hibernate/cfg/Environment.java
+++ b/hibernate-core/src/main/java/org/hibernate/cfg/Environment.java
@@ -131,6 +131,7 @@
*/
@Internal
public final class Environment implements AvailableSettings {
+
private static final CoreMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, Environment.class.getName());
private static final Properties GLOBAL_PROPERTIES;
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..21ad34e33b29 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,6 +56,7 @@
* @author Gavin King
*/
public abstract class AbstractPersistentCollection implements Serializable, PersistentCollection {
+
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( AbstractPersistentCollection.class );
private transient SharedSessionContractImplementor session;
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..15be51b9f15b 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,6 +37,7 @@
@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 );
protected Object array;
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..26b00726bb1c 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<>();
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..2be5a0dd37a2 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,
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..02e06bae82b7 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);
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..f0bbfc85761e 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/HANAServerConfiguration.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/HANAServerConfiguration.java
@@ -26,6 +26,7 @@
public class HANAServerConfiguration {
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;
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..6f6ab6941c03 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;
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..86b5fbd80a06 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;
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..a103e324f5bb 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;
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/temptable/TemporaryTableHelper.java b/hibernate-core/src/main/java/org/hibernate/dialect/temptable/TemporaryTableHelper.java
index bff3a62d126c..119978b7de4a 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/temptable/TemporaryTableHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/temptable/TemporaryTableHelper.java
@@ -27,7 +27,7 @@
* @author Steve Ebersole
*/
public class TemporaryTableHelper {
- private final static CoreMessageLogger log = CoreLogging.messageLogger( TemporaryTableHelper.class );
+ private final static CoreMessageLogger LOG = CoreLogging.messageLogger( TemporaryTableHelper.class );
public static final String SESSION_ID_COLUMN_NAME = "hib_sess_id";
@@ -72,7 +72,7 @@ public Boolean execute(Connection connection) {
return Boolean.TRUE;
}
catch (SQLException e) {
- log.debugf(
+ LOG.debugf(
"Unable to create temporary table [%s]; `%s` failed : %s",
temporaryTable.getQualifiedTableName(),
creationCommand,
@@ -81,7 +81,7 @@ public Boolean execute(Connection connection) {
}
}
catch( Exception e ) {
- log.debugf( "Error creating temporary table(s) : %s", e.getMessage() );
+ LOG.debugf( "Error creating temporary table(s) : %s", e.getMessage() );
}
return Boolean.FALSE;
}
@@ -128,7 +128,7 @@ public void execute(Connection connection) {
jdbcServices.getSqlExceptionHelper().handleAndClearWarnings( statement, WARNING_HANDLER );
}
catch (SQLException e) {
- log.debugf(
+ LOG.debugf(
"Unable to drop temporary table [%s]; `%s` failed : %s",
temporaryTable.getQualifiedTableName(),
dropCommand,
@@ -137,7 +137,7 @@ public void execute(Connection connection) {
}
}
catch( Exception e ) {
- log.debugf( "Error dropping temporary table(s) : %s", e.getMessage() );
+ LOG.debugf( "Error dropping temporary table(s) : %s", e.getMessage() );
}
}
}
@@ -163,7 +163,7 @@ public static void cleanTemporaryTableRows(
jdbcCoordinator.getResultSetReturn().executeUpdate( preparedStatement, sql );
}
catch( Throwable t ) {
- log.unableToCleanupTemporaryIdTable(t);
+ LOG.unableToCleanupTemporaryIdTable(t);
}
finally {
if ( preparedStatement != null ) {
@@ -186,17 +186,17 @@ public static void cleanTemporaryTableRows(
private static final SqlExceptionHelper.WarningHandler WARNING_HANDLER =
new SqlExceptionHelper.WarningHandlerLoggingSupport() {
public boolean doProcess() {
- return log.isDebugEnabled();
+ return LOG.isDebugEnabled();
}
public void prepare(SQLWarning warning) {
- log.warningsCreatingTempTable( warning );
+ LOG.warningsCreatingTempTable( warning );
}
@Override
protected void logWarning(String description, String message) {
- log.debug( description );
- log.debug( message );
+ LOG.debug( description );
+ LOG.debug( message );
}
};
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 fcb5783c6f9d..d0f5368a9933 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;
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..b3c5b35b9b44 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,6 +46,7 @@
* @see CascadingAction
*/
public final class Cascade {
+
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( Cascade.class );
private Cascade() {
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..999448e4b5e5 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 );
/**
* 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 ) );
+ 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 ) );
+ 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,35 +152,42 @@ 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
+ // 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, entry.getCurrentKey(), session ) );
+ + 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 );
-
+ private static void logReachedCollection(
+ PersistentCollection collection,
+ SessionImplementor session,
+ CollectionPersister persister,
+ CollectionEntry collectionEntry) {
if ( LOG.isTraceEnabled() ) {
if ( collection.wasInitialized() ) {
LOG.tracef(
@@ -189,13 +195,13 @@ public static void processReachableCollection(
collectionInfoString(
persister,
collection,
- entry.getCurrentKey(),
+ collectionEntry.getCurrentKey(),
session
),
collectionInfoString(
- entry.getLoadedPersister(),
+ collectionEntry.getLoadedPersister(),
collection,
- entry.getLoadedKey(),
+ collectionEntry.getLoadedKey(),
session
)
);
@@ -206,20 +212,18 @@ public static void processReachableCollection(
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,13 +264,13 @@ 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() ) {
+ collectionEntry.setDoremove( true );
+ if ( collectionEntry.isDorecreate() ) {
LOG.trace( "Forcing collection initialization" );
collection.forceInitialization();
}
@@ -275,7 +278,7 @@ private static void prepareCollectionForUpdate(
}
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/EntityEntryContext.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/EntityEntryContext.java
index 1c941110d475..00523d9d2cfd 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/internal/EntityEntryContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/EntityEntryContext.java
@@ -46,7 +46,7 @@
* @author Steve Ebersole
*/
public class EntityEntryContext {
- private static final CoreMessageLogger log = CoreLogging.messageLogger( EntityEntryContext.class );
+ private static final CoreMessageLogger LOG = CoreLogging.messageLogger( EntityEntryContext.class );
private final transient PersistenceContext persistenceContext;
@@ -226,7 +226,7 @@ private void checkNotAssociatedWithOtherPersistenceContextIfMutable(ManagedEntit
}
else {
// otherPersistenceContext is associated with a closed PersistenceContext
- log.stalePersistenceContextInEntityEntry( entityEntry.toString() );
+ LOG.stalePersistenceContextInEntityEntry( entityEntry.toString() );
}
}
@@ -441,7 +441,7 @@ private static void downgradeLockOnManagedEntity(final ManagedEntity node) {
* @throws IOException Indicates an IO exception accessing the given stream
*/
public void serialize(ObjectOutputStream oos) throws IOException {
- log.tracef( "Starting serialization of [%s] EntityEntry entries", count );
+ LOG.tracef( "Starting serialization of [%s] EntityEntry entries", count );
oos.writeInt( count );
if ( count == 0 ) {
return;
@@ -475,7 +475,7 @@ public void serialize(ObjectOutputStream oos) throws IOException {
public static EntityEntryContext deserialize(ObjectInputStream ois, StatefulPersistenceContext rtn)
throws IOException, ClassNotFoundException {
final int count = ois.readInt();
- log.tracef( "Starting deserialization of [%s] EntityEntry entries", count );
+ LOG.tracef( "Starting deserialization of [%s] EntityEntry entries", count );
final var context = new EntityEntryContext( rtn );
context.count = count;
@@ -555,7 +555,7 @@ private static EntityEntry deserializeEntityEntry(
entry = (EntityEntry) deserializeMethod.invoke( null, ois, persistenceContext );
}
catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) {
- log.errorf( "Enable to deserialize [%s]", entityEntryClassName );
+ LOG.errorf( "Enable to deserialize [%s]", entityEntryClassName );
}
return entry;
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..676f6b5aeb29 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,6 +35,7 @@
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 final StatefulPersistenceContext persistenceContext;
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..b589171250fb 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;
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/StatisticalLoggingSessionEventListener.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/StatisticalLoggingSessionEventListener.java
index cbb55598c604..fbab0cd8df25 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/internal/StatisticalLoggingSessionEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/StatisticalLoggingSessionEventListener.java
@@ -15,7 +15,7 @@
* @author Steve Ebersole
*/
public class StatisticalLoggingSessionEventListener implements SessionEventListener {
- private static final CoreMessageLogger log = messageLogger( "org.hibernate.session.metrics" );
+ private static final CoreMessageLogger LOG = messageLogger( "org.hibernate.session.metrics" );
/**
* Used by SettingsFactory (in conjunction with stats being enabled) to determine whether to apply this listener
@@ -23,7 +23,7 @@ public class StatisticalLoggingSessionEventListener implements SessionEventListe
* @return {@code true} if logging is enabled for this listener.
*/
public static boolean isLoggingEnabled() {
- return log.isDebugEnabled();
+ return LOG.isDebugEnabled();
}
// cumulative state ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -276,7 +276,7 @@ public void partialFlushEnd(int numberOfEntities, int numberOfCollections) {
@Override
public void end() {
if ( isLoggingEnabled() ) {
- log.sessionMetrics(
+ LOG.sessionMetrics(
jdbcConnectionAcquisitionTime,
jdbcConnectionAcquisitionCount,
jdbcConnectionReleaseTime,
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..9c5dd44f8ff1 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,6 +54,7 @@
* @author Brett Meyer
*/
public class ConnectionProviderInitiator implements StandardServiceInitiator {
+
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( ConnectionProviderInitiator.class );
/**
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/cursor/internal/StandardRefCursorSupport.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/cursor/internal/StandardRefCursorSupport.java
index 35e425d04e90..87c2ab99a7e2 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/cursor/internal/StandardRefCursorSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/cursor/internal/StandardRefCursorSupport.java
@@ -22,7 +22,7 @@
* @author Steve Ebersole
*/
public class StandardRefCursorSupport implements RefCursorSupport {
- private static final Logger log = Logger.getLogger( StandardRefCursorSupport.class );
+ private static final Logger LOG = Logger.getLogger( StandardRefCursorSupport.class );
private final JdbcServices jdbcServices;
@@ -92,7 +92,7 @@ public static boolean supportsRefCursors(DatabaseMetaData meta) {
}
catch (Exception throwable) {
//If the driver is not compatible with the Java 8 contract, the method might not exit.
- log.debug( "Unexpected error trying to gauge level of JDBC REF_CURSOR support: " + throwable.getMessage() );
+ LOG.debug( "Unexpected error trying to gauge level of JDBC REF_CURSOR support: " + throwable.getMessage() );
return false;
}
}
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..85c3a3b26d56 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,6 +23,7 @@
* @author Steve Ebersole
*/
public class DialectResolverSet implements DialectResolver {
+
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( DialectResolverSet.class );
private final List resolvers;
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentImpl.java
index 7a56ee26a06c..701db9081acf 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentImpl.java
@@ -42,7 +42,7 @@
* @author Steve Ebersole
*/
public class JdbcEnvironmentImpl implements JdbcEnvironment {
- private static final Logger log = Logger.getLogger( JdbcEnvironmentImpl.class );
+ private static final Logger LOG = Logger.getLogger( JdbcEnvironmentImpl.class );
private final Dialect dialect;
@@ -120,7 +120,7 @@ private static IdentifierHelper identifierHelper(Dialect dialect, IdentifierHelp
}
catch (SQLException sqle) {
// should never ever happen
- log.debug( "There was a problem accessing DatabaseMetaData in building the JdbcEnvironment", sqle );
+ LOG.debug( "There was a problem accessing DatabaseMetaData in building the JdbcEnvironment", sqle );
}
return builder.build();
}
@@ -210,7 +210,7 @@ private IdentifierHelper identifierHelper(DatabaseMetaData databaseMetaData, Dia
}
catch (SQLException sqle) {
// should never ever happen
- log.debug( "There was a problem accessing DatabaseMetaData in building the JdbcEnvironment", sqle );
+ LOG.debug( "There was a problem accessing DatabaseMetaData in building the JdbcEnvironment", sqle );
}
return identifierHelperBuilder.build();
}
@@ -311,7 +311,7 @@ private IdentifierHelper identifierHelper(
}
catch (SQLException sqle) {
// should never ever happen
- log.debug( "There was a problem accessing DatabaseMetaData in building the JdbcEnvironment", sqle );
+ LOG.debug( "There was a problem accessing DatabaseMetaData in building the JdbcEnvironment", sqle );
}
return builder.build();
}
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..43aa8a394041 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();
@@ -389,7 +385,7 @@ public JdbcEnvironmentImpl execute(Connection connection) {
);
}
catch (SQLException e) {
- log.unableToObtainConnectionMetadata( e );
+ LOG.unableToObtainConnectionMetadata( e );
}
// accessing the JDBC metadata failed
@@ -420,7 +416,7 @@ private int databaseMicroVersion(DatabaseMetaData metadata) throws SQLException
);
}
catch ( Exception e ) {
- log.unableToObtainConnectionToQueryMetadata( e );
+ LOG.unableToObtainConnectionToQueryMetadata( e );
}
finally {
//noinspection resource
@@ -431,7 +427,7 @@ private int databaseMicroVersion(DatabaseMetaData metadata) throws SQLException
}
private static void logDatabaseAndDriver(DatabaseMetaData dbmd) throws SQLException {
- if ( log.isDebugEnabled() ) {
+ if ( LOG.isDebugEnabled() ) {
JDBC_MESSAGE_LOGGER.logDatabaseInfo(
dbmd.getDatabaseProductName(),
dbmd.getDatabaseProductVersion(),
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/IdentifierHelperBuilder.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/IdentifierHelperBuilder.java
index 30cb887f34a5..8859b811f06b 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/IdentifierHelperBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/IdentifierHelperBuilder.java
@@ -26,7 +26,7 @@
* @author Steve Ebersole
*/
public class IdentifierHelperBuilder {
- private static final Logger log = Logger.getLogger( IdentifierHelperBuilder.class );
+ private static final Logger LOG = Logger.getLogger( IdentifierHelperBuilder.class );
private final JdbcEnvironment jdbcEnvironment;
@@ -77,12 +77,12 @@ public void applyIdentifierCasing(DatabaseMetaData metaData) throws SQLException
);
if ( unquotedAffirmatives == 0 ) {
- log.trace( "JDBC driver metadata reported database stores unquoted identifiers in neither upper, lower nor mixed case" );
+ LOG.trace( "JDBC driver metadata reported database stores unquoted identifiers in neither upper, lower nor mixed case" );
}
else {
// NOTE: still "dodgy" if more than one is true
if ( unquotedAffirmatives > 1 ) {
- log.trace( "JDBC driver metadata reported database stores unquoted identifiers in more than one case" );
+ LOG.trace( "JDBC driver metadata reported database stores unquoted identifiers in more than one case" );
}
if ( metaData.storesUpperCaseIdentifiers() ) {
@@ -103,12 +103,12 @@ else if ( metaData.storesLowerCaseIdentifiers() ) {
);
if ( quotedAffirmatives == 0 ) {
- log.trace( "JDBC driver metadata reported database stores quoted identifiers in neither upper, lower nor mixed case" );
+ LOG.trace( "JDBC driver metadata reported database stores quoted identifiers in neither upper, lower nor mixed case" );
}
else {
// NOTE: still "dodgy" if more than one is true
if ( quotedAffirmatives > 1 ) {
- log.trace( "JDBC driver metadata reported database stores quoted identifiers in more than one case" );
+ LOG.trace( "JDBC driver metadata reported database stores quoted identifiers in more than one case" );
}
if ( metaData.storesMixedCaseQuotedIdentifiers() ) {
@@ -202,7 +202,7 @@ public void setReservedWords(Set words) {
public IdentifierHelper build() {
if ( unquotedCaseStrategy == quotedCaseStrategy ) {
- log.debugf(
+ LOG.debugf(
"IdentifierCaseStrategy for both quoted and unquoted identifiers was set " +
"to the same strategy [%s]; that will likely lead to problems in schema update " +
"and validation if using quoted identifiers",
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..dd19b72a2e5e 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;
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..c16b052be5e4 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;
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..1f587dd630cb 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,6 +41,7 @@
* @author Steve Ebersole
*/
public class FetchProfile {
+
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( FetchProfile.class );
private final String name;
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..02b302d55b4f 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,6 +67,7 @@
* @author Anton Marsden
*/
public class ActionQueue {
+
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( ActionQueue.class );
private final SessionImplementor session;
@@ -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..a51c3abc1c7d 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,6 +38,7 @@
* @author Guenther Demetz
*/
public class BatchFetchQueue {
+
private static final Logger LOG = CoreLogging.logger( BatchFetchQueue.class );
private final PersistenceContext context;
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadeStyles.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadeStyles.java
index 77a234b19cf2..764ee8a20d40 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadeStyles.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadeStyles.java
@@ -17,7 +17,7 @@
*/
public final class CascadeStyles {
- private static final Logger log = Logger.getLogger( CascadeStyles.class );
+ private static final Logger LOG = Logger.getLogger( CascadeStyles.class );
/**
* Disallow instantiation
@@ -254,10 +254,10 @@ public static CascadeStyle getCascadeStyle(String cascade) {
}
public static void registerCascadeStyle(String name, BaseCascadeStyle cascadeStyle) {
- log.tracef( "Registering external cascade style [%s : %s]", name, cascadeStyle );
+ LOG.tracef( "Registering external cascade style [%s : %s]", name, cascadeStyle );
final CascadeStyle old = STYLES.put( name, cascadeStyle );
if ( old != null ) {
- log.debugf(
+ LOG.debugf(
"External cascade style registration [%s : %s] overrode base registration [%s]",
name,
cascadeStyle,
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..ee74c318c2ea 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
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..b4d457efc85e 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,6 +29,7 @@
* @author Gavin King
*/
public final class CollectionEntry implements Serializable {
+
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( CollectionEntry.class );
//ATTRIBUTES MAINTAINED BETWEEN FLUSH CYCLES
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/EffectiveEntityGraph.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/EffectiveEntityGraph.java
index 279d2de89202..998456c14327 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/EffectiveEntityGraph.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/EffectiveEntityGraph.java
@@ -28,7 +28,7 @@
* @author Steve Ebersole
*/
public class EffectiveEntityGraph implements AppliedGraph, Serializable {
- private static final Logger log = Logger.getLogger( EffectiveEntityGraph.class );
+ private static final Logger LOG = Logger.getLogger( EffectiveEntityGraph.class );
private final boolean allowOverwrite;
@@ -79,7 +79,7 @@ public void applyGraph(RootGraphImplementor graph, @Nullable GraphSemantic se
throw new IllegalArgumentException( "Graph semantic cannot be null" );
}
verifyWriteability();
- log.tracef( "Setting effective graph state [%s] : %s", semantic.name(), graph );
+ LOG.tracef( "Setting effective graph state [%s] : %s", semantic.name(), graph );
this.semantic = semantic;
this.graph = graph;
}
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..9d60d50bd245 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,6 +21,7 @@
* @author Gavin King
*/
public class IdentifierValue implements UnsavedValueStrategy {
+
private static final Logger LOG = CoreLogging.logger( IdentifierValue.class );
private final @Nullable Object 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..3d354171658b 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,6 +21,7 @@
* @author Gavin King
*/
public class VersionValue implements UnsavedValueStrategy {
+
private static final Logger LOG = CoreLogging.logger( VersionValue.class );
private final @Nullable Object 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..b5cb3ffbf7bb 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,6 +24,7 @@
* @author Steve Ebersole
*/
public class TransactionImpl implements TransactionImplementor {
+
private static final Logger LOG = CoreLogging.logger( TransactionImpl.class );
private final TransactionCoordinator transactionCoordinator;
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..197e0dc5991d 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() {
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JtaPlatformResolverInitiator.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JtaPlatformResolverInitiator.java
index 6183b07bc42b..0b27512fe3fd 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JtaPlatformResolverInitiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JtaPlatformResolverInitiator.java
@@ -20,7 +20,7 @@
public class JtaPlatformResolverInitiator implements StandardServiceInitiator {
public static final JtaPlatformResolverInitiator INSTANCE = new JtaPlatformResolverInitiator();
- private static final Logger log = Logger.getLogger( JtaPlatformResolverInitiator.class );
+ private static final Logger LOG = Logger.getLogger( JtaPlatformResolverInitiator.class );
@Override
public JtaPlatformResolver initiateService(Map configurationValues, ServiceRegistryImplementor registry) {
@@ -29,7 +29,7 @@ public JtaPlatformResolver initiateService(Map configurationValu
registry.requireService( StrategySelector.class )
.resolveStrategy( JtaPlatformResolver.class, setting );
if ( resolver == null ) {
- log.tracef( "No JtaPlatformResolver was specified, using default [%s]", StandardJtaPlatformResolver.class.getName() );
+ LOG.tracef( "No JtaPlatformResolver was specified, using default [%s]", StandardJtaPlatformResolver.class.getName() );
return StandardJtaPlatformResolver.INSTANCE;
}
return resolver;
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/StandardJtaPlatformResolver.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/StandardJtaPlatformResolver.java
index 499b6c319fba..7bc0796eec6c 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/StandardJtaPlatformResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/StandardJtaPlatformResolver.java
@@ -21,7 +21,7 @@
public class StandardJtaPlatformResolver implements JtaPlatformResolver {
public static final StandardJtaPlatformResolver INSTANCE = new StandardJtaPlatformResolver();
- private static final Logger log = Logger.getLogger( StandardJtaPlatformResolver.class );
+ private static final Logger LOG = Logger.getLogger( StandardJtaPlatformResolver.class );
@Override
public JtaPlatform resolveJtaPlatform(Map configurationValues, ServiceRegistryImplementor registry) {
@@ -30,7 +30,7 @@ public JtaPlatform resolveJtaPlatform(Map configurationValues, ServiceRegis
// Initially look for a JtaPlatformProvider
for ( JtaPlatformProvider provider : classLoaderService.loadJavaServices( JtaPlatformProvider.class ) ) {
final JtaPlatform providedPlatform = provider.getProvidedJtaPlatform();
- log.tracef( "Located JtaPlatformProvider [%s] provided JtaPlatform : %s", provider, providedPlatform );
+ LOG.tracef( "Located JtaPlatformProvider [%s] provided JtaPlatform : %s", provider, providedPlatform );
if ( providedPlatform!= null ) {
return providedPlatform;
}
@@ -88,7 +88,7 @@ public JtaPlatform resolveJtaPlatform(Map configurationValues, ServiceRegis
}
// Finally, return the default...
- log.tracef( "Could not resolve JtaPlatform, using default [%s]", NoJtaPlatform.class.getName() );
+ LOG.tracef( "Could not resolve JtaPlatform, using default [%s]", NoJtaPlatform.class.getName() );
return NoJtaPlatform.INSTANCE;
}
}
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..9586c06fdc32 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
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..aebdff29d647 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,6 +47,7 @@
* @author Steve Ebersole.
*/
public abstract class AbstractSaveEventListener implements CallbackRegistryConsumer {
+
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( AbstractSaveEventListener.class );
private CallbackRegistry callbackRegistry;
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..97a7020ba310 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.
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..254af1db2424 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,6 +52,7 @@
* @author Steve Ebersole
*/
public class DefaultDeleteEventListener implements DeleteEventListener, CallbackRegistryConsumer {
+
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( DefaultDeleteEventListener.class );
private CallbackRegistry callbackRegistry;
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..ab88959335bc 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,6 +29,7 @@
* @author Steve Ebersole
*/
public class DefaultEvictEventListener implements EvictEventListener {
+
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( DefaultEvictEventListener.class );
/**
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..89ea8145c47f 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,6 +51,7 @@
* @author Gavin King
*/
public class DefaultFlushEntityEventListener implements FlushEntityEventListener, CallbackRegistryConsumer {
+
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( DefaultFlushEntityEventListener.class );
private CallbackRegistry callbackRegistry;
@@ -655,7 +656,7 @@ private void logDirtyProperties(EntityEntry entry, int[] dirtyProperties) {
dirtyPropertyNames[i] = allPropertyNames[dirtyProperties[i]];
}
LOG.trace( "Found dirty properties [" + infoString( persister.getEntityName(), entry.getId() )
- + "] : "+ Arrays.toString( dirtyPropertyNames ) );
+ + "] : " + 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..57e66c264453 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,6 +23,7 @@
* @author Gavin King
*/
public class DefaultInitializeCollectionEventListener implements InitializeCollectionEventListener {
+
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( DefaultInitializeCollectionEventListener.class );
/**
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..f231b536056e 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.
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..d472826e9eea 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,6 +55,7 @@
public class DefaultMergeEventListener
extends AbstractSaveEventListener
implements MergeEventListener {
+
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( DefaultMergeEventListener.class );
@Override
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..67f9697a4bb0 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,6 +33,7 @@
public class DefaultPersistEventListener
extends AbstractSaveEventListener
implements PersistEventListener, CallbackRegistryConsumer {
+
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( DefaultPersistEventListener.class );
@Override
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..20ef1f5c27a9 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,6 +38,7 @@
* @author Steve Ebersole
*/
public class DefaultRefreshEventListener implements RefreshEventListener {
+
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( DefaultRefreshEventListener.class );
@Override
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..3da17b2e9014 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,6 +37,7 @@
public class DefaultReplicateEventListener
extends AbstractSaveEventListener
implements ReplicateEventListener {
+
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( DefaultReplicateEventListener.class );
/**
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..5b72c1d71a7c 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,6 +29,7 @@
public class EntityCopyObserverFactoryInitiator implements StandardServiceInitiator {
public static final EntityCopyObserverFactoryInitiator INSTANCE = new EntityCopyObserverFactoryInitiator();
+
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( EntityCopyObserverFactoryInitiator.class );
@Override
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..81b285fe6dda 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,6 +23,7 @@
* @author Gavin King
*/
public class EvictVisitor extends AbstractVisitor {
+
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( EvictVisitor.class );
private final Object owner;
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..f3cc7522727a 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,6 +21,7 @@
* @author Gavin King
*/
public abstract class ReattachVisitor extends ProxyVisitor {
+
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( ReattachVisitor.class );
private final Object ownerIdentifier;
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..26df88192ee4 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,6 +28,7 @@
* @author Gavin King
*/
public class WrapVisitor extends ProxyVisitor {
+
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( WrapVisitor.class );
protected Object entity;
diff --git a/hibernate-core/src/main/java/org/hibernate/event/service/internal/EventListenerGroupImpl.java b/hibernate-core/src/main/java/org/hibernate/event/service/internal/EventListenerGroupImpl.java
index b4087db491d2..f901aea300de 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/service/internal/EventListenerGroupImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/service/internal/EventListenerGroupImpl.java
@@ -42,7 +42,7 @@
*/
class EventListenerGroupImpl implements EventListenerGroup {
- private static final Logger log = Logger.getLogger( EventListenerGroupImpl.class );
+ private static final Logger LOG = Logger.getLogger( EventListenerGroupImpl.class );
private static final DuplicationStrategy DEFAULT_DUPLICATION_STRATEGY =
new DuplicationStrategy() {
@@ -296,7 +296,7 @@ private void handleListenerAddition(T listener, Consumer additionHandler) {
final T[] listenersWrite = createListenerArrayForWrite( size );
arraycopy( listenersRead, 0, listenersWrite, 0, size );
- final boolean traceEnabled = log.isTraceEnabled();
+ final boolean traceEnabled = LOG.isTraceEnabled();
for ( DuplicationStrategy strategy : duplicationStrategies ) {
@@ -308,13 +308,13 @@ private void handleListenerAddition(T listener, Consumer additionHandler) {
for ( int i = 0; i < size; i++ ) {
final T existingListener = listenersRead[i];
if ( traceEnabled ) {
- log.tracef( "Checking incoming listener [`%s`] for match against existing listener [`%s`]",
+ LOG.tracef( "Checking incoming listener [`%s`] for match against existing listener [`%s`]",
listener, existingListener );
}
if ( strategy.areMatch( listener, existingListener ) ) {
if ( traceEnabled ) {
- log.tracef( "Found listener match between `%s` and `%s`",
+ LOG.tracef( "Found listener match between `%s` and `%s`",
listener, existingListener );
}
@@ -324,13 +324,13 @@ private void handleListenerAddition(T listener, Consumer additionHandler) {
throw new EventListenerRegistrationException( "Duplicate event listener found" );
case KEEP_ORIGINAL:
if ( traceEnabled ) {
- log.tracef( "Skipping listener registration (%s) : `%s`",
+ LOG.tracef( "Skipping listener registration (%s) : `%s`",
action, listener );
}
return;
case REPLACE_ORIGINAL:
if ( traceEnabled ) {
- log.tracef( "Replacing listener registration (%s) : `%s` -> `%s`",
+ LOG.tracef( "Replacing listener registration (%s) : `%s` -> `%s`",
action, existingListener, listener );
}
prepareListener( listener );
diff --git a/hibernate-core/src/main/java/org/hibernate/event/service/internal/PostCommitEventListenerGroupImpl.java b/hibernate-core/src/main/java/org/hibernate/event/service/internal/PostCommitEventListenerGroupImpl.java
index c045cff959ab..e478f5aa4155 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/service/internal/PostCommitEventListenerGroupImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/service/internal/PostCommitEventListenerGroupImpl.java
@@ -22,7 +22,7 @@
* @author Steve Ebersole
*/
class PostCommitEventListenerGroupImpl extends EventListenerGroupImpl {
- private static final CoreMessageLogger log = CoreLogging.messageLogger( PostCommitEventListenerGroupImpl.class );
+ private static final CoreMessageLogger LOG = CoreLogging.messageLogger( PostCommitEventListenerGroupImpl.class );
private final Class extendedListenerContract;
@@ -54,7 +54,7 @@ public void appendListener(T listener) {
private void checkAgainstExtendedContract(T listener) {
if ( !extendedListenerContract.isInstance( listener ) ) {
- log.warnf(
+ LOG.warnf(
"Encountered event listener [%s] for post-commit event [%s] "
+ "which did not implement the corresponding extended "
+ "listener contract [%s]",
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..29eabe4af490 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,6 +60,7 @@
*/
@Internal
public class GeneratedValuesHelper {
+
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( IdentifierGeneratorHelper.class );
/**
@@ -100,7 +101,7 @@ public static GeneratedValues getGeneratedValues(
if ( LOG.isDebugEnabled() ) {
LOG.debug( "Extracted generated values for entity "
- + infoString( persister ) + ": " + ArrayHelper.toString( results ) );
+ + 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..b7b4aab2ea94 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/GUIDGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/GUIDGenerator.java
@@ -24,6 +24,7 @@
*/
@Deprecated(since = "6.0")
public class GUIDGenerator implements IdentifierGenerator {
+
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( GUIDGenerator.class );
private static boolean WARNED;
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..3ccd2b92a45d 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/IdentifierGeneratorHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/IdentifierGeneratorHelper.java
@@ -46,6 +46,7 @@
*/
@Internal
public final class IdentifierGeneratorHelper {
+
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( IdentifierGeneratorHelper.class );
/**
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..f68303f77ea1 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/IncrementGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/IncrementGenerator.java
@@ -47,6 +47,7 @@
* @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 );
/**
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..d76ea5de653e 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/UUIDGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/UUIDGenerator.java
@@ -39,6 +39,7 @@
*/
@Deprecated(since = "6.0")
public class UUIDGenerator implements IdentifierGenerator {
+
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( UUIDGenerator.class );
public static final String UUID_GEN_STRATEGY = "uuid_gen_strategy";
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..e078390d0295 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/UUIDHexGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/UUIDHexGenerator.java
@@ -30,6 +30,7 @@
*/
@Deprecated(since = "6")
public class UUIDHexGenerator extends AbstractUUIDGenerator {
+
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( UUIDHexGenerator.class );
/**
diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/HiLoOptimizer.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/HiLoOptimizer.java
index 3292dd3ba04f..dd4ffa203d4d 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/HiLoOptimizer.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/HiLoOptimizer.java
@@ -59,7 +59,7 @@
* @author Steve Ebersole
*/
public class HiLoOptimizer extends AbstractOptimizer {
- private static final Logger log = Logger.getLogger( HiLoOptimizer.class );
+ private static final Logger LOG = Logger.getLogger( HiLoOptimizer.class );
private static class GenerationState {
private IntegralDataTypeHolder lastSourceValue;
@@ -79,8 +79,8 @@ public HiLoOptimizer(Class returnClass, int incrementSize) {
if ( incrementSize < 1 ) {
throw new HibernateException( "increment size cannot be less than 1" );
}
- if ( log.isTraceEnabled() ) {
- log.tracev( "Creating hilo optimizer with [incrementSize={0}; returnClass={1}]",
+ if ( LOG.isTraceEnabled() ) {
+ LOG.tracev( "Creating hilo optimizer with [incrementSize={0}; returnClass={1}]",
incrementSize, returnClass.getName() );
}
}
diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/LegacyHiLoAlgorithmOptimizer.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/LegacyHiLoAlgorithmOptimizer.java
index 0326e3eae26a..cc5175a1f003 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/LegacyHiLoAlgorithmOptimizer.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/LegacyHiLoAlgorithmOptimizer.java
@@ -27,7 +27,7 @@
* @author Steve Ebersole
*/
public class LegacyHiLoAlgorithmOptimizer extends AbstractOptimizer {
- private static final Logger log = Logger.getLogger( LegacyHiLoAlgorithmOptimizer.class );
+ private static final Logger LOG = Logger.getLogger( LegacyHiLoAlgorithmOptimizer.class );
private final long initialMaxLo;
@@ -51,8 +51,8 @@ public LegacyHiLoAlgorithmOptimizer(Class returnClass, int incrementSize) {
if ( incrementSize < 1 ) {
throw new HibernateException( "increment size cannot be less than 1" );
}
- if ( log.isTraceEnabled() ) {
- log.tracev( "Creating hilo optimizer (legacy) with [incrementSize={0}; returnClass={1}]",
+ if ( LOG.isTraceEnabled() ) {
+ LOG.tracev( "Creating hilo optimizer (legacy) with [incrementSize={0}; returnClass={1}]",
incrementSize, returnClass.getName() );
}
initialMaxLo = incrementSize;
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..d47230f230b0 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 };
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..a8a71bb5c718 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
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..a3572b16658d 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 );
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..4b278bcac48c 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;
@@ -61,8 +57,8 @@ public PooledOptimizer(Class returnClass, int incrementSize) {
if ( incrementSize < 1 ) {
throw new HibernateException( "increment size cannot be less than 1" );
}
- if ( log.isTraceEnabled() ) {
- log.tracev( "Creating pooled optimizer with [incrementSize={0}; returnClass={1}]",
+ if ( LOG.isTraceEnabled() ) {
+ LOG.tracev( "Creating pooled optimizer with [incrementSize={0}; returnClass={1}]",
incrementSize, returnClass.getName() );
}
}
@@ -81,7 +77,7 @@ public Serializable generate(AccessCallback callback) {
// because we would not be able to control this if
// we are using a sequence...
if ( generationState.hiValue.lt( 1 ) ) {
- log.pooledOptimizerReportedInitialValue( generationState.hiValue );
+ LOG.pooledOptimizerReportedInitialValue( generationState.hiValue );
}
// the call to obtain next-value just gave us the initialValue
if ( ( initialValue == -1
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..3651f0a34d05 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<>();
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java b/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java
index ac6a92a7cfa6..cdbbbc215b99 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java
@@ -131,7 +131,7 @@
* @author Steve Ebersole
*/
public abstract class AbstractSharedSessionContract implements SharedSessionContractImplementor {
- private static final CoreMessageLogger log = CoreLogging.messageLogger( SessionImpl.class );
+ private static final CoreMessageLogger LOG = CoreLogging.messageLogger( SessionImpl.class );
private transient SessionFactoryImpl factory;
private transient SessionFactoryOptions factoryOptions;
@@ -256,11 +256,11 @@ protected final void setUpMultitenancy(SessionFactoryImplementor factory, LoadQu
private void logInconsistentOptions(SharedSessionCreationOptions sharedOptions) {
if ( sharedOptions.shouldAutoJoinTransactions() ) {
- log.debug( "Session creation specified 'autoJoinTransactions', which is invalid in conjunction " +
+ LOG.debug( "Session creation specified 'autoJoinTransactions', which is invalid in conjunction " +
"with sharing JDBC connection between sessions; ignoring" );
}
if ( sharedOptions.getPhysicalConnectionHandlingMode() != connectionHandlingMode ) {
- log.debug( "Session creation specified 'PhysicalConnectionHandlingMode' which is invalid in conjunction " +
+ LOG.debug( "Session creation specified 'PhysicalConnectionHandlingMode' which is invalid in conjunction " +
"with sharing JDBC connection between sessions; ignoring" );
}
}
@@ -334,7 +334,7 @@ void beforeTransactionCompletionEvents() {
getInterceptor().beforeTransactionCompletion( getTransactionIfAccessible() );
}
catch (Throwable t) {
- log.exceptionInBeforeTransactionCompletionInterceptor( t );
+ LOG.exceptionInBeforeTransactionCompletionInterceptor( t );
}
}
@@ -350,7 +350,7 @@ void afterTransactionCompletionEvents(boolean successful) {
getInterceptor().afterTransactionCompletion( getTransactionIfAccessible() );
}
catch (Throwable t) {
- log.exceptionInAfterTransactionCompletionInterceptor( t );
+ LOG.exceptionInAfterTransactionCompletionInterceptor( t );
}
}
@@ -1658,8 +1658,8 @@ public SessionAssociationMarkers getSessionAssociationMarkers() {
@Serial
private void writeObject(ObjectOutputStream oos) throws IOException {
- if ( log.isTraceEnabled() ) {
- log.trace( "Serializing " + getClass().getSimpleName() + " [" );
+ if ( LOG.isTraceEnabled() ) {
+ LOG.trace( "Serializing " + getClass().getSimpleName() + " [" );
}
@@ -1693,8 +1693,8 @@ private void writeObject(ObjectOutputStream oos) throws IOException {
@Serial
private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException, SQLException {
- if ( log.isTraceEnabled() ) {
- log.trace( "Deserializing " + getClass().getSimpleName() );
+ if ( LOG.isTraceEnabled() ) {
+ LOG.trace( "Deserializing " + getClass().getSimpleName() );
}
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/ExceptionConverterImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/ExceptionConverterImpl.java
index a513cc85bd40..9ceb35f6ee84 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/ExceptionConverterImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/ExceptionConverterImpl.java
@@ -44,7 +44,7 @@
* @author Andrea Boriero
*/
public class ExceptionConverterImpl implements ExceptionConverter {
- private static final CoreMessageLogger log = CoreLogging.messageLogger( ExceptionConverterImpl.class );
+ private static final CoreMessageLogger LOG = CoreLogging.messageLogger( ExceptionConverterImpl.class );
private final SharedSessionContractImplementor session;
private final boolean isJpaBootstrap;
@@ -134,7 +134,7 @@ else if ( exception instanceof TransientObjectException ) {
}
catch (Exception ne) {
//we do not want the subsequent exception to swallow the original one
- log.unableToMarkForRollbackOnTransientObjectException( ne );
+ LOG.unableToMarkForRollbackOnTransientObjectException( ne );
}
//Spec 3.2.3 Synchronization rules
return new IllegalStateException( exception );
@@ -235,7 +235,7 @@ private void rollbackIfNecessary(PersistenceException persistenceException) {
}
catch (Exception ne) {
//we do not want the subsequent exception to swallow the original one
- log.unableToMarkForRollbackOnPersistenceException( ne );
+ LOG.unableToMarkForRollbackOnPersistenceException( ne );
}
}
}
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..88033469f808 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
@@ -1112,7 +1112,7 @@ private Object resolveTenantIdentifier() {
}
public static class SessionBuilderImpl implements SessionBuilderImplementor, SessionCreationOptions {
- private static final Logger log = CoreLogging.logger( SessionBuilderImpl.class );
+ private static final Logger LOG = CoreLogging.logger( SessionBuilderImpl.class );
private final SessionFactoryImpl sessionFactory;
private Interceptor interceptor;
@@ -1259,7 +1259,7 @@ public List getCustomSessionEventListener() {
@Override
public SessionImpl openSession() {
- log.tracef( "Opening Hibernate Session. tenant=%s", tenantIdentifier );
+ LOG.tracef( "Opening Hibernate Session. tenant=%s", tenantIdentifier );
return new SessionImpl( sessionFactory, this );
}
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java
index 08a3233577e3..af5a2e355d20 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java
@@ -161,7 +161,7 @@ public class SessionImpl
extends AbstractSharedSessionContract
implements Serializable, SharedSessionContractImplementor, JdbcSessionOwner, SessionImplementor, EventSource,
TransactionCoordinatorBuilder.Options, WrapperOptions, LoadAccessContext {
- private static final CoreMessageLogger log = CoreLogging.messageLogger( SessionImpl.class );
+ private static final CoreMessageLogger LOG = CoreLogging.messageLogger( SessionImpl.class );
// Defaults to null which means the properties are the default
// as defined in FastSessionServices#defaultSessionProperties
@@ -227,8 +227,8 @@ public SessionImpl(SessionFactoryImpl factory, SessionCreationOptions options) {
statistics.openSession();
}
- if ( log.isTraceEnabled() ) {
- log.tracef( "Opened Session [%s] at timestamp: %s", getSessionIdentifier(), currentTimeMillis() );
+ if ( LOG.isTraceEnabled() ) {
+ LOG.tracef( "Opened Session [%s] at timestamp: %s", getSessionIdentifier(), currentTimeMillis() );
}
}
finally {
@@ -368,7 +368,7 @@ public void close() {
if ( getSessionFactoryOptions().getJpaCompliance().isJpaClosedComplianceEnabled() ) {
throw new IllegalStateException( "EntityManager was already closed" );
}
- log.trace( "Already closed" );
+ LOG.trace( "Already closed" );
}
else {
closeWithoutOpenChecks();
@@ -376,8 +376,8 @@ public void close() {
}
public void closeWithoutOpenChecks() {
- if ( log.isTraceEnabled() ) {
- log.tracef( "Closing session [%s]", getSessionIdentifier() );
+ if ( LOG.isTraceEnabled() ) {
+ LOG.tracef( "Closing session [%s]", getSessionIdentifier() );
}
final var eventMonitor = getEventMonitor();
@@ -435,7 +435,7 @@ protected boolean shouldCloseJdbcCoordinatorOnClose(boolean isTransactionCoordin
if ( isTransactionCoordinatorShared ) {
final ActionQueue actionQueue = getActionQueue();
if ( actionQueue.hasBeforeTransactionActions() || actionQueue.hasAfterTransactionActions() ) {
- log.warn( "Closing shared session with unprocessed transaction completion actions" );
+ LOG.warn( "Closing shared session with unprocessed transaction completion actions" );
}
}
return !isTransactionCoordinatorShared;
@@ -468,17 +468,17 @@ public boolean isOpen() {
protected void checkSessionFactoryOpen() {
if ( !getFactory().isOpen() ) {
- log.trace( "Forcing-closing session since factory is already closed" );
+ LOG.trace( "Forcing-closing session since factory is already closed" );
setClosed();
}
}
private void managedFlush() {
if ( !isOpenOrWaitingForAutoClose() ) {
- log.trace( "Skipping auto-flush since the session is closed" );
+ LOG.trace( "Skipping auto-flush since the session is closed" );
}
else {
- log.trace( "Automatically flushing session" );
+ LOG.trace( "Automatically flushing session" );
fireFlush();
}
}
@@ -499,7 +499,7 @@ else if ( isClosed() ) {
}
private void managedClose() {
- log.trace( "Automatically closing session" );
+ LOG.trace( "Automatically closing session" );
closeWithoutOpenChecks();
}
@@ -835,7 +835,7 @@ private void fireMerge(final MergeContext mergeContext, final MergeEvent event)
public void delete(String entityName, Object object, boolean isCascadeDeleteEnabled, DeleteContext transientEntities) {
checkOpenOrWaitingForAutoClose();
final boolean removingOrphanBeforeUpdates = persistenceContext.isRemovingOrphanBeforeUpdates();
- final boolean traceEnabled = log.isTraceEnabled();
+ final boolean traceEnabled = LOG.isTraceEnabled();
if ( traceEnabled && removingOrphanBeforeUpdates ) {
logRemoveOrphanBeforeUpdates( "before continuing", entityName, object );
}
@@ -852,7 +852,7 @@ public void delete(String entityName, Object object, boolean isCascadeDeleteEnab
public void removeOrphanBeforeUpdates(String entityName, Object child) {
// TODO: The removeOrphan concept is a temporary "hack" for HHH-6484.
// This should be removed once action/task ordering is improved.
- final boolean traceEnabled = log.isTraceEnabled();
+ final boolean traceEnabled = LOG.isTraceEnabled();
if ( traceEnabled ) {
logRemoveOrphanBeforeUpdates( "begin", entityName, child );
}
@@ -870,9 +870,9 @@ public void removeOrphanBeforeUpdates(String entityName, Object child) {
}
private void logRemoveOrphanBeforeUpdates(String timing, String entityName, Object entity) {
- if ( log.isTraceEnabled() ) {
+ if ( LOG.isTraceEnabled() ) {
final var entityEntry = persistenceContext.getEntry( entity );
- log.tracef(
+ LOG.tracef(
"%s remove orphan before updates: [%s]",
timing,
entityEntry == null ? entityName : infoString( entityName, entityEntry.getId() )
@@ -1011,9 +1011,9 @@ public Object get(String entityName, Object id) {
*/
@Override
public Object immediateLoad(String entityName, Object id) {
- if ( log.isDebugEnabled() ) {
+ if ( LOG.isDebugEnabled() ) {
final var persister = requireEntityPersister( entityName );
- log.tracef( "Initializing proxy: %s", infoString( persister, id, getFactory() ) );
+ LOG.tracef( "Initializing proxy: %s", infoString( persister, id, getFactory() ) );
}
final LoadEvent event = makeLoadEvent( entityName, id, getReadOnlyFromLoadQueryInfluencers(), true );
fireLoadNoChecks( event, IMMEDIATE_LOAD );
@@ -1035,7 +1035,7 @@ public Object internalLoad(String entityName, Object id, boolean eager, boolean
clearedEffectiveGraph = false;
}
else {
- log.trace( "Clearing effective entity graph for subsequent select" );
+ LOG.trace( "Clearing effective entity graph for subsequent select" );
clearedEffectiveGraph = true;
effectiveEntityGraph.clear();
}
@@ -1476,8 +1476,8 @@ public void forceFlush(EntityEntry entityEntry) {
@Override
public void forceFlush(EntityKey key) {
- if ( log.isTraceEnabled() ) {
- log.tracef("Flushing to force deletion of re-saved object: "
+ if ( LOG.isTraceEnabled() ) {
+ LOG.tracef("Flushing to force deletion of re-saved object: "
+ infoString( key.getPersister(), key.getIdentifier(), getFactory() ) );
}
@@ -1845,7 +1845,7 @@ public String toString() {
.append( "SessionImpl(" )
.append( System.identityHashCode( this ) );
if ( !isClosed() ) {
- if ( log.isTraceEnabled() ) {
+ if ( LOG.isTraceEnabled() ) {
string.append( persistenceContext )
.append( ";" )
.append( actionQueue );
@@ -2002,7 +2002,7 @@ public LobHelper getLobHelper() {
@Override
public void beforeTransactionCompletion() {
- log.trace( "SessionImpl#beforeTransactionCompletion()" );
+ LOG.trace( "SessionImpl#beforeTransactionCompletion()" );
flushBeforeTransactionCompletion();
actionQueue.beforeTransactionCompletion();
beforeTransactionCompletionEvents();
@@ -2011,8 +2011,8 @@ public void beforeTransactionCompletion() {
@Override
public void afterTransactionCompletion(boolean successful, boolean delayed) {
- if ( log.isTraceEnabled() ) {
- log.tracef( "SessionImpl#afterTransactionCompletion(successful=%s, delayed=%s)", successful, delayed );
+ if ( LOG.isTraceEnabled() ) {
+ LOG.tracef( "SessionImpl#afterTransactionCompletion(successful=%s, delayed=%s)", successful, delayed );
}
final boolean notClosed = isOpenOrWaitingForAutoClose();
@@ -2437,7 +2437,7 @@ private T find(Class entityClass, Object primaryKey, LockOptions lockOpti
if ( accessTransaction().isActive() && accessTransaction().getRollbackOnly() ) {
// Assume situation HHH-12472 running on WildFly
// Just log the exception and return null
- log.jdbcExceptionThrownWithTransactionRolledBack( e );
+ LOG.jdbcExceptionThrownWithTransactionRolledBack( e );
return null;
}
else {
@@ -2455,8 +2455,8 @@ private T find(Class entityClass, Object primaryKey, LockOptions lockOpti
// Hibernate Reactive calls this
protected static void logIgnoringEntityNotFound(Class entityClass, Object primaryKey) {
- if ( log.isDebugEnabled() ) {
- log.ignoringEntityNotFound(
+ if ( LOG.isDebugEnabled() ) {
+ LOG.ignoringEntityNotFound(
entityClass != null ? entityClass.getName(): null,
primaryKey != null ? primaryKey.toString() : null
);
@@ -2788,12 +2788,12 @@ public void setProperty(String propertyName, Object value) {
checkOpen();
if ( !( value instanceof Serializable ) ) {
- log.warnf( "Property '%s' is not serializable, value won't be set", propertyName );
+ LOG.warnf( "Property '%s' is not serializable, value won't be set", propertyName );
return;
}
if ( propertyName == null ) {
- log.warn( "Property having key null is illegal, value won't be set" );
+ LOG.warn( "Property having key null is illegal, value won't be set" );
return;
}
@@ -3011,8 +3011,8 @@ public Collection getManagedEntities(EntityType entityType) {
*/
@Serial
private void writeObject(ObjectOutputStream oos) throws IOException {
- if ( log.isTraceEnabled() ) {
- log.tracef( "Serializing Session [%s]", getSessionIdentifier() );
+ if ( LOG.isTraceEnabled() ) {
+ LOG.tracef( "Serializing Session [%s]", getSessionIdentifier() );
}
oos.defaultWriteObject();
@@ -3033,8 +3033,8 @@ private void writeObject(ObjectOutputStream oos) throws IOException {
*/
@Serial
private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException, SQLException {
- if ( log.isTraceEnabled() ) {
- log.tracef( "Deserializing Session [%s]", getSessionIdentifier() );
+ if ( LOG.isTraceEnabled() ) {
+ LOG.tracef( "Deserializing Session [%s]", getSessionIdentifier() );
}
ois.defaultReadObject();
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 5aedfb1afd9a..440928675830 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java
@@ -110,6 +110,7 @@
* @author Steve Ebersole
*/
public class StatelessSessionImpl extends AbstractSharedSessionContract implements StatelessSession {
+
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( StatelessSessionImpl.class );
public static final MultiIdLoadOptions MULTI_ID_LOAD_OPTIONS = new MultiLoadOptions();
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..142e39aefb7b 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,6 +25,7 @@
* @author Gavin King
*/
public final class EntityPrinter {
+
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( EntityPrinter.class );
private final SessionFactoryImplementor factory;
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..368d6f407059 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,6 +42,7 @@
* @since 1.0
*/
public final class SerializationHelper {
+
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( SerializationHelper.class );
private SerializationHelper() {
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..44a5637a8ab2 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/";
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..4cda9dc7989f 100644
--- a/hibernate-core/src/main/java/org/hibernate/jdbc/Expectations.java
+++ b/hibernate-core/src/main/java/org/hibernate/jdbc/Expectations.java
@@ -24,6 +24,7 @@
* @author Steve Ebersole
*/
public class Expectations {
+
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( Expectations.class );
static final SqlExceptionHelper sqlExceptionHelper = new SqlExceptionHelper( false );
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/HibernatePersistenceProvider.java b/hibernate-core/src/main/java/org/hibernate/jpa/HibernatePersistenceProvider.java
index d72bf0cdab71..4022a465458d 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/HibernatePersistenceProvider.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/HibernatePersistenceProvider.java
@@ -36,7 +36,7 @@
* @author Brett Meyer
*/
public class HibernatePersistenceProvider implements PersistenceProvider {
- private static final CoreMessageLogger log = CoreLogging.messageLogger( HibernatePersistenceProvider.class );
+ private static final CoreMessageLogger LOG = CoreLogging.messageLogger( HibernatePersistenceProvider.class );
private final PersistenceUtilHelper.MetadataCache cache = new PersistenceUtilHelper.MetadataCache();
@@ -47,10 +47,10 @@ public class HibernatePersistenceProvider implements PersistenceProvider {
*/
@Override
public EntityManagerFactory createEntityManagerFactory(String persistenceUnitName, Map properties) {
- log.tracef( "Starting createEntityManagerFactory for persistenceUnitName %s", persistenceUnitName );
+ LOG.tracef( "Starting createEntityManagerFactory for persistenceUnitName %s", persistenceUnitName );
final EntityManagerFactoryBuilder builder = getEntityManagerFactoryBuilderOrNull( persistenceUnitName, properties );
if ( builder == null ) {
- log.trace( "Could not obtain matching EntityManagerFactoryBuilder, returning null" );
+ LOG.trace( "Could not obtain matching EntityManagerFactoryBuilder, returning null" );
return null;
}
return builder.build();
@@ -72,12 +72,12 @@ protected EntityManagerFactoryBuilder getEntityManagerFactoryBuilderOrNull(Strin
private EntityManagerFactoryBuilder getEntityManagerFactoryBuilderOrNull(String persistenceUnitName, Map properties,
ClassLoader providedClassLoader, ClassLoaderService providedClassLoaderService) {
- log.tracef( "Attempting to obtain correct EntityManagerFactoryBuilder for persistenceUnitName : %s", persistenceUnitName );
+ LOG.tracef( "Attempting to obtain correct EntityManagerFactoryBuilder for persistenceUnitName : %s", persistenceUnitName );
final Map integration = wrap( properties );
final Collection units = locatePersistenceUnits( integration, providedClassLoader, providedClassLoaderService );
- log.tracef( "Located and parsed %s persistence units; checking each", units.size() );
+ LOG.tracef( "Located and parsed %s persistence units; checking each", units.size() );
if ( persistenceUnitName == null && units.size() > 1 ) {
// no persistence-unit name to look for was given and we found multiple persistence-units
@@ -85,8 +85,8 @@ private EntityManagerFactoryBuilder getEntityManagerFactoryBuilderOrNull(String
}
for ( PersistenceUnitDescriptor persistenceUnit : units ) {
- if ( log.isTraceEnabled() ) {
- log.tracef(
+ if ( LOG.isTraceEnabled() ) {
+ LOG.tracef(
"Checking persistence-unit [name=%s, explicit-provider=%s] against incoming persistence unit name [%s]",
persistenceUnit.getName(),
persistenceUnit.getProviderClassName(),
@@ -96,13 +96,13 @@ private EntityManagerFactoryBuilder getEntityManagerFactoryBuilderOrNull(String
final boolean matches = persistenceUnitName == null || persistenceUnit.getName().equals( persistenceUnitName );
if ( !matches ) {
- log.tracef( "Excluding from consideration due to name mismatch" );
+ LOG.tracef( "Excluding from consideration due to name mismatch" );
continue;
}
// See if we (Hibernate) are the persistence provider
if ( ! ProviderChecker.isProvider( persistenceUnit, properties ) ) {
- log.tracef( "Excluding from consideration due to provider mismatch" );
+ LOG.tracef( "Excluding from consideration due to provider mismatch" );
continue;
}
@@ -114,7 +114,7 @@ private EntityManagerFactoryBuilder getEntityManagerFactoryBuilderOrNull(String
}
}
- log.debug( "Found no matching persistence units" );
+ LOG.debug( "Found no matching persistence units" );
return null;
}
@@ -130,7 +130,7 @@ protected Collection locatePersistenceUnits(Map
var parser = PersistenceXmlParser.create( integration, providedClassLoader, providedClassLoaderService );
final List xmlUrls = parser.getClassLoaderService().locateResources( "META-INF/persistence.xml" );
if ( xmlUrls.isEmpty() ) {
- log.unableToFindPersistenceXmlInClasspath();
+ LOG.unableToFindPersistenceXmlInClasspath();
units = List.of();
}
else {
@@ -138,7 +138,7 @@ protected Collection locatePersistenceUnits(Map
}
}
catch (Exception e) {
- log.debug( "Unable to locate persistence units", e );
+ LOG.debug( "Unable to locate persistence units", e );
throw new PersistenceException( "Unable to locate persistence units", e );
}
return units;
@@ -151,8 +151,8 @@ protected Collection locatePersistenceUnits(Map
*/
@Override
public EntityManagerFactory createContainerEntityManagerFactory(PersistenceUnitInfo info, Map properties) {
- if ( log.isTraceEnabled() ) {
- log.tracef( "Starting createContainerEntityManagerFactory : %s", info.getPersistenceUnitName() );
+ if ( LOG.isTraceEnabled() ) {
+ LOG.tracef( "Starting createContainerEntityManagerFactory : %s", info.getPersistenceUnitName() );
}
return getEntityManagerFactoryBuilder( info, properties ).build();
@@ -160,8 +160,8 @@ public EntityManagerFactory createContainerEntityManagerFactory(PersistenceUnitI
@Override
public void generateSchema(PersistenceUnitInfo info, Map map) {
- if ( log.isTraceEnabled() ) {
- log.tracef( "Starting generateSchema : PUI.name=%s", info.getPersistenceUnitName() );
+ if ( LOG.isTraceEnabled() ) {
+ LOG.tracef( "Starting generateSchema : PUI.name=%s", info.getPersistenceUnitName() );
}
final EntityManagerFactoryBuilder builder = getEntityManagerFactoryBuilder( info, map );
@@ -170,11 +170,11 @@ public void generateSchema(PersistenceUnitInfo info, Map map) {
@Override
public boolean generateSchema(String persistenceUnitName, Map map) {
- log.tracef( "Starting generateSchema for persistenceUnitName %s", persistenceUnitName );
+ LOG.tracef( "Starting generateSchema for persistenceUnitName %s", persistenceUnitName );
final EntityManagerFactoryBuilder builder = getEntityManagerFactoryBuilderOrNull( persistenceUnitName, map );
if ( builder == null ) {
- log.trace( "Could not obtain matching EntityManagerFactoryBuilder, returning false" );
+ LOG.trace( "Could not obtain matching EntityManagerFactoryBuilder, returning false" );
return false;
}
builder.generateSchema();
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java
index 3f64ea8369bc..36107bd78ab5 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java
@@ -125,7 +125,7 @@
*/
@SuppressWarnings({"deprecation", "removal"})
public class EntityManagerFactoryBuilderImpl implements EntityManagerFactoryBuilder {
- private static final CoreMessageLogger log = CoreLogging.messageLogger( EntityManagerFactoryBuilderImpl.class );
+ private static final CoreMessageLogger LOG = CoreLogging.messageLogger( EntityManagerFactoryBuilderImpl.class );
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -267,7 +267,7 @@ private static void ignoreFlushBeforeCompletion(MergedSettings mergedSettings) {
// flush before completion validation
final var config = mergedSettings.getConfigurationValues();
if ( getBoolean( FLUSH_BEFORE_COMPLETION, config, false ) ) {
- log.definingFlushBeforeCompletionIgnoredInHem( FLUSH_BEFORE_COMPLETION );
+ LOG.definingFlushBeforeCompletionIgnoredInHem( FLUSH_BEFORE_COMPLETION );
config.put( FLUSH_BEFORE_COMPLETION, String.valueOf(false) );
}
}
@@ -351,7 +351,7 @@ private static void discoverTypesToTransform(
classTransformer.discoverTypes(classLoader, className );
}
catch (EnhancementException ex) {
- log.enhancementDiscoveryFailed( className, ex );
+ LOG.enhancementDiscoveryFailed( className, ex );
}
}
}
@@ -803,7 +803,7 @@ private void normalizeTransactionCoordinator(
}
private static boolean handeTransactionCoordinatorStrategy(MergedSettings mergedSettings) {
- log.overridingTransactionStrategyDangerous( TRANSACTION_COORDINATOR_STRATEGY );
+ LOG.overridingTransactionStrategyDangerous( TRANSACTION_COORDINATOR_STRATEGY );
// see if we can tell whether it is a JTA coordinator
final Object strategy = mergedSettings.getConfigurationValues().get( TRANSACTION_COORDINATOR_STRATEGY );
return strategy instanceof TransactionCoordinatorBuilder transactionCoordinatorBuilder
@@ -824,7 +824,7 @@ private static PersistenceUnitTransactionType determineTransactionType(
final var txnType = configuredTransactionType( persistenceUnit, integrationSettingsCopy, mergedSettings );
if ( txnType == null ) {
// is it more appropriate to have this be based on bootstrap entry point (EE vs SE)?
- log.debug( "PersistenceUnitTransactionType not specified - falling back to RESOURCE_LOCAL" );
+ LOG.debug( "PersistenceUnitTransactionType not specified - falling back to RESOURCE_LOCAL" );
return PersistenceUnitTransactionType.RESOURCE_LOCAL;
}
else {
@@ -1123,12 +1123,12 @@ private void cleanUpConfigKeys(Map integrationSettingsCopy, MergedSettings
for ( String key : keys ) {
final Object removedSetting = integrationSettingsCopy.remove( key );
if ( removedSetting != null ) {
- log.debugf( "Removed integration override setting [%s] due to normalization", key );
+ LOG.debugf( "Removed integration override setting [%s] due to normalization", key );
}
final Object removedMergedSetting = mergedSettings.getConfigurationValues().remove( key );
if ( removedMergedSetting != null ) {
- log.debugf( "Removed merged setting [%s] due to normalization", key );
+ LOG.debugf( "Removed merged setting [%s] due to normalization", key );
}
}
}
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/PersistenceXmlParser.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/PersistenceXmlParser.java
index 09e18f369ae3..0c0f45e1cb43 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/PersistenceXmlParser.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/PersistenceXmlParser.java
@@ -51,7 +51,7 @@
*/
public final class PersistenceXmlParser {
- private static final CoreMessageLogger log = CoreLogging.messageLogger( PersistenceXmlParser.class );
+ private static final CoreMessageLogger LOG = CoreLogging.messageLogger( PersistenceXmlParser.class );
/**
* @return A {@link PersistenceXmlParser} using no settings at all.
@@ -161,8 +161,8 @@ private void parsePersistenceXml(Map persiste
private void parsePersistenceXml(Map persistenceUnits,
URL xmlUrl, PersistenceUnitTransactionType defaultTransactionType) {
- if ( log.isTraceEnabled() ) {
- log.tracef( "Attempting to parse persistence.xml file : %s", xmlUrl.toExternalForm() );
+ if ( LOG.isTraceEnabled() ) {
+ LOG.tracef( "Attempting to parse persistence.xml file : %s", xmlUrl.toExternalForm() );
}
final URL persistenceUnitRootUrl = ArchiveHelper.getJarURLFromURLEntry( xmlUrl, "/META-INF/persistence.xml" );
@@ -174,7 +174,7 @@ private void parsePersistenceXml(Map persiste
final JaxbPersistenceUnitImpl jaxbPersistenceUnit = jaxbPersistenceUnits.get( i );
if ( persistenceUnits.containsKey( jaxbPersistenceUnit.getName() ) ) {
- log.duplicatedPersistenceUnitName( jaxbPersistenceUnit.getName() );
+ LOG.duplicatedPersistenceUnitName( jaxbPersistenceUnit.getName() );
continue;
}
@@ -195,7 +195,7 @@ private void bindPersistenceUnit(
ParsedPersistenceXmlDescriptor persistenceUnitDescriptor) {
final String name = jaxbPersistenceUnit.getName();
if ( StringHelper.isNotEmpty( name ) ) {
- log.tracef( "Persistence unit name from persistence.xml : %s", name );
+ LOG.tracef( "Persistence unit name from persistence.xml : %s", name );
persistenceUnitDescriptor.setName( name );
}
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/ProviderChecker.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/ProviderChecker.java
index da14f4706611..fa649699da25 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/ProviderChecker.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/ProviderChecker.java
@@ -21,7 +21,7 @@
*/
public final class ProviderChecker {
- private static final Logger log = Logger.getLogger( ProviderChecker.class );
+ private static final Logger LOG = Logger.getLogger( ProviderChecker.class );
/**
* Does the descriptor and/or integration request Hibernate as the
@@ -48,7 +48,7 @@ public static boolean isProvider(PersistenceUnitDescriptor persistenceUnit, Map
* @return {@code true} if Hibernate should be the provider; {@code false} otherwise.
*/
public static boolean hibernateProviderNamesContain(String requestedProviderName) {
- log.tracef(
+ LOG.tracef(
"Checking requested PersistenceProvider name [%s] against Hibernate provider names",
requestedProviderName
);
@@ -69,14 +69,14 @@ public static boolean hibernateProviderNamesContain(String requestedProviderName
public static String extractRequestedProviderName(PersistenceUnitDescriptor persistenceUnit, Map integration) {
final String integrationProviderName = extractProviderName( integration );
if ( integrationProviderName != null ) {
- log.debugf( "Integration provided explicit PersistenceProvider [%s]", integrationProviderName );
+ LOG.debugf( "Integration provided explicit PersistenceProvider [%s]", integrationProviderName );
return integrationProviderName;
}
final String persistenceUnitRequestedProvider = extractProviderName( persistenceUnit );
if ( persistenceUnitRequestedProvider != null ) {
- if ( log.isDebugEnabled() ) {
- log.debugf(
+ if ( LOG.isDebugEnabled() ) {
+ LOG.debugf(
"Persistence-unit [%s] requested PersistenceProvider [%s]",
persistenceUnit.getName(),
persistenceUnitRequestedProvider
@@ -86,7 +86,7 @@ public static String extractRequestedProviderName(PersistenceUnitDescriptor pers
}
// NOTE: if no provider requested, we assume we are the provider (the calls got to us somehow...)
- log.debug( "No PersistenceProvider explicitly requested, assuming Hibernate" );
+ LOG.debug( "No PersistenceProvider explicitly requested, assuming Hibernate" );
return HibernatePersistenceProvider.class.getName();
}
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbacksFactory.java b/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbacksFactory.java
index 98c26393fa14..b7457d8adf66 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbacksFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbacksFactory.java
@@ -27,7 +27,7 @@
* {@link SessionFactoryOptions#areJPACallbacksEnabled()}.
*/
public final class CallbacksFactory {
- private static final Logger log = Logger.getLogger( CallbacksFactory.class );
+ private static final Logger LOG = Logger.getLogger( CallbacksFactory.class );
public static CallbackRegistry buildCallbackRegistry(
SessionFactoryOptions options, ServiceRegistry serviceRegistry, Collection entityBindings) {
@@ -44,8 +44,8 @@ public static CallbackRegistry buildCallbackRegistry(
if ( !entityClasses.add( entityClass ) ) {
// this most likely means we have a class mapped multiple
// times using the hbm.xml "entity name" feature
- if ( log.isDebugEnabled() ) {
- log.debugf(
+ if ( LOG.isDebugEnabled() ) {
+ LOG.debugf(
"Class [%s] already has callbacks registered; " +
"assuming this means the class was mapped twice " +
"(using hbm.xml entity-name support) - skipping subsequent registrations" +
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/FlushModeTypeHelper.java b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/FlushModeTypeHelper.java
index ee8527359364..3e33ba4573ee 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/FlushModeTypeHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/FlushModeTypeHelper.java
@@ -20,7 +20,7 @@
* @author Steve Ebersole
*/
public class FlushModeTypeHelper {
- private static final Logger log = Logger.getLogger( FlushModeTypeHelper.class );
+ private static final Logger LOG = Logger.getLogger( FlushModeTypeHelper.class );
private FlushModeTypeHelper() {
}
@@ -31,11 +31,11 @@ public static FlushModeType getFlushModeType(FlushMode flushMode) {
}
return switch (flushMode) {
case ALWAYS -> {
- log.debug("Interpreting Hibernate FlushMode.ALWAYS as JPA FlushModeType.AUTO (may cause problems if relying on FlushMode.ALWAYS-specific behavior)");
+ LOG.debug("Interpreting Hibernate FlushMode.ALWAYS as JPA FlushModeType.AUTO (may cause problems if relying on FlushMode.ALWAYS-specific behavior)");
yield FlushModeType.AUTO;
}
case MANUAL -> {
- log.debug("Interpreting Hibernate FlushMode.MANUAL as JPA FlushModeType.COMMIT (may cause problems if relying on FlushMode.MANUAL-specific behavior)");
+ LOG.debug("Interpreting Hibernate FlushMode.MANUAL as JPA FlushModeType.COMMIT (may cause problems if relying on FlushMode.MANUAL-specific behavior)");
yield FlushModeType.COMMIT;
}
case COMMIT -> FlushModeType.COMMIT;
@@ -101,11 +101,11 @@ public static FlushMode interpretExternalSetting(String externalName) {
}
try {
- log.tracef( "Attempting to interpret external setting [%s] as FlushMode name", externalName );
+ LOG.tracef( "Attempting to interpret external setting [%s] as FlushMode name", externalName );
return FlushMode.valueOf( externalName.toUpperCase( Locale.ROOT) );
}
catch ( IllegalArgumentException e ) {
- log.tracef( "Attempting to interpret external setting [%s] as FlushModeType name", externalName );
+ LOG.tracef( "Attempting to interpret external setting [%s] as FlushModeType name", externalName );
}
try {
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..09e59cea0287 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,30 +4,30 @@
*/
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() {
}
public static void logPersistenceUnitInformation(PersistenceUnitDescriptor descriptor) {
- if ( ! log.isDebugEnabled() ) {
- log.processingPersistenceUnitInfoName( descriptor.getName() );
+ if ( ! LOG.isDebugEnabled() ) {
+ LOG.processingPersistenceUnitInfoName( descriptor.getName() );
return;
}
@@ -98,6 +98,6 @@ public static void logPersistenceUnitInformation(PersistenceUnitDescriptor descr
}
sb.append( "]" );
- log.debug( sb.toString() );
+ LOG.debug( sb.toString() );
}
}
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/BasicValue.java b/hibernate-core/src/main/java/org/hibernate/mapping/BasicValue.java
index 97d04b32706d..e5843b7407b6 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/BasicValue.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/BasicValue.java
@@ -90,7 +90,7 @@
*/
public class BasicValue extends SimpleValue
implements JdbcTypeIndicators, Resolvable, JpaAttributeConverterCreationContext {
- private static final CoreMessageLogger log = CoreLogging.messageLogger( BasicValue.class );
+ private static final CoreMessageLogger LOG = CoreLogging.messageLogger( BasicValue.class );
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// incoming "configuration" values
@@ -290,7 +290,7 @@ private void checkSelectable(Selectable incomingColumn) {
// final Selectable column = getColumn();
// if ( column == incomingColumn || column.getText().equals( incomingColumn.getText() ) ) {
-// log.debugf( "Skipping column re-registration: %s.%s", getTable().getName(), column.getText() );
+// LOG.debugf( "Skipping column re-registration: %s.%s", getTable().getName(), column.getText() );
// }
// else {
// throw new IllegalStateException(
@@ -638,7 +638,7 @@ private Resolution resolution(BasicJavaType explicitJavaType, JavaType
final MetadataBuildingContext context = getBuildingContext();
final TypeDefinition autoAppliedTypeDef = context.getTypeDefinitionRegistry().resolveAutoApplied( castType );
if ( autoAppliedTypeDef != null ) {
- log.trace( "BasicValue resolution matched auto-applied type definition" );
+ LOG.trace( "BasicValue resolution matched auto-applied type definition" );
return autoAppliedTypeDef.resolve( getTypeParameters(), null, context, this );
}
}
@@ -905,7 +905,7 @@ public TypeConfiguration getTypeConfiguration() {
}
catch (ClassLoadingException e) {
// allow the exception below to trigger
- log.debugf( "Could not resolve type-name [%s] as Java type : %s", name, e );
+ LOG.debugf( "Could not resolve type-name [%s] as Java type : %s", name, e );
}
throw new MappingException( "Could not resolve named type : " + name );
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..7491f31154d2 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/RootClass.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/RootClass.java
@@ -26,6 +26,7 @@
* @author Gavin King
*/
public final class RootClass extends PersistentClass implements TableOwner, SoftDeletable {
+
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( RootClass.class );
private Property identifierProperty;
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java b/hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java
index d5aaaf47d78d..8718b7599187 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java
@@ -631,7 +631,7 @@ protected ConverterDescriptor getAttributeConverterDescriptor() {
// // if this is a byte[] version/timestamp, then we need to use RowVersionType
// // instead of BinaryType (HHH-10413)
// // todo (6.0) - although for T/SQL databases we should use its
-// log.debug( "version is BinaryType; changing to RowVersionType" );
+// LOG.debug( "version is BinaryType; changing to RowVersionType" );
// result = RowVersionType.INSTANCE;
// }
//
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Table.java b/hibernate-core/src/main/java/org/hibernate/mapping/Table.java
index 6a8cc3ab1fe6..061794ce120c 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/Table.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/Table.java
@@ -45,7 +45,7 @@
* @author Gavin King
*/
public class Table implements Serializable, ContributableDatabaseObject {
- private static final Logger log = Logger.getLogger( Table.class );
+ private static final Logger LOG = Logger.getLogger( Table.class );
private static final Column[] EMPTY_COLUMN_ARRAY = new Column[0];
private final String contributor;
@@ -279,8 +279,8 @@ public void addColumn(Column column) {
for ( Column pkColumn : primaryKey.getColumns() ) {
if ( pkColumn.getCanonicalName().equals( column.getCanonicalName() ) ) {
column.setNullable( false );
- if ( log.isTraceEnabled() ) {
- log.tracef(
+ if ( LOG.isTraceEnabled() ) {
+ LOG.tracef(
"Forcing column [%s] to be non-null as it is part of the primary key for table [%s]",
column.getCanonicalName(),
getNameIdentifier().getCanonicalName()
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeFactory.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeFactory.java
index b02929cdc1c4..8bc5b43b4e6e 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeFactory.java
@@ -77,7 +77,7 @@
* @author Emmanuel Bernard
*/
public class AttributeFactory {
- private static final CoreMessageLogger log = CoreLogging.messageLogger( AttributeFactory.class );
+ private static final CoreMessageLogger LOG = CoreLogging.messageLogger( AttributeFactory.class );
private final MetadataContext context;
@@ -104,11 +104,11 @@ public AttributeFactory(MetadataContext context) {
MetadataContext metadataContext) {
if ( property.isSynthetic() ) {
// hide synthetic/virtual properties (fabricated by Hibernate) from the JPA metamodel.
- log.tracef( "Skipping synthetic property %s(%s)", ownerType.getTypeName(), property.getName() );
+ LOG.tracef( "Skipping synthetic property %s(%s)", ownerType.getTypeName(), property.getName() );
return null;
}
- log.tracef( "Building attribute [%s.%s]", ownerType.getTypeName(), property.getName() );
+ LOG.tracef( "Building attribute [%s.%s]", ownerType.getTypeName(), property.getName() );
final var attributeMetadata =
determineAttributeMetadata( wrap( ownerType, property ), normalMemberResolver, metadataContext );
@@ -162,7 +162,7 @@ public Property getPropertyMapping() {
public SingularPersistentAttribute buildIdAttribute(
IdentifiableDomainType ownerType,
Property property) {
- log.tracef( "Building identifier attribute [%s.%s]", ownerType.getTypeName(), property.getName() );
+ LOG.tracef( "Building identifier attribute [%s.%s]", ownerType.getTypeName(), property.getName() );
final var attributeMetadata =
determineAttributeMetadata( wrap( ownerType, property ), identifierMemberResolver );
@@ -190,7 +190,7 @@ public Property getPropertyMapping() {
public SingularAttributeImpl buildVersionAttribute(
IdentifiableDomainType ownerType,
Property property) {
- log.tracef( "Building version attribute [%s.%s]", ownerType.getTypeName(), property.getName() );
+ LOG.tracef( "Building version attribute [%s.%s]", ownerType.getTypeName(), property.getName() );
final var attributeMetadata =
determineAttributeMetadata( wrap( ownerType, property ), versionMemberResolver );
@@ -410,14 +410,14 @@ private static EntityPersister getDeclarerEntityPersister(
final Property propertyMapping = attributeContext.getPropertyMapping();
final String propertyName = propertyMapping.getName();
- log.tracef( "Starting attribute metadata determination [%s]", propertyName );
+ LOG.tracef( "Starting attribute metadata determination [%s]", propertyName );
final var member = memberResolver.resolveMember( attributeContext, context );
- log.tracef( "\tMember: %s", member );
+ LOG.tracef( "\tMember: %s", member );
final var value = propertyMapping.getValue();
final var type = value.getType();
- log.tracef( "\tType: %s [%s]", type.getName(), type.getClass().getSimpleName() );
+ LOG.tracef( "\tType: %s [%s]", type.getName(), type.getClass().getSimpleName() );
if ( type instanceof AnyType ) {
return new SingularAttributeMetadataImpl<>(
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..2f8fcc5d6d1b 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,6 +20,7 @@
* Support for instantiating embeddables as POJO representation
*/
public class EmbeddableInstantiatorPojoStandard extends AbstractPojoInstantiator implements StandardEmbeddableInstantiator {
+
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( EmbeddableInstantiatorPojoStandard.class );
private final Supplier embeddableMappingAccess;
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..f588dd2ba8ec 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,6 +23,7 @@
* Support for instantiating entity values as POJO representation
*/
public class EntityInstantiatorPojoStandard extends AbstractEntityInstantiatorPojo {
+
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( EntityInstantiatorPojoStandard.class );
private final Class proxyInterface;
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..657e0d39cda6 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,6 +28,7 @@
* @author Steve Ebersole
*/
public class EntityRepresentationStrategyMap implements EntityRepresentationStrategy {
+
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( EntityRepresentationStrategyMap.class );
private final JavaType> mapJavaType;
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..4742d5f04e65 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,6 +44,7 @@
* @author Steve Ebersole
*/
public class EntityRepresentationStrategyPojoStandard implements EntityRepresentationStrategy {
+
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( EntityRepresentationStrategyPojoStandard.class );
private final JavaType mappedJtd;
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/InjectionHelper.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/InjectionHelper.java
index 01dcfb91c5b0..73d08bd4da6d 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/InjectionHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/InjectionHelper.java
@@ -19,7 +19,7 @@
import static java.lang.reflect.Modifier.isPublic;
public class InjectionHelper {
- private static final CoreMessageLogger log = CoreLogging.messageLogger( MetadataContext.class );
+ private static final CoreMessageLogger LOG = CoreLogging.messageLogger( MetadataContext.class );
public static void injectEntityGraph(
NamedEntityGraphDefinition definition,
@@ -96,7 +96,7 @@ public static void injectField(
// + "; expected type : " + attribute.getClass().getName()
// + "; encountered type : " + field.getType().getName()
// );
- log.illegalArgumentOnStaticMetamodelFieldInjection(
+ LOG.illegalArgumentOnStaticMetamodelFieldInjection(
metamodelClass.getName(),
name,
model.getClass().getName(),
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataContext.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataContext.java
index 0afe0f194f1c..84d73fac326b 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataContext.java
@@ -71,7 +71,7 @@
*/
@Internal
public class MetadataContext {
- private static final CoreMessageLogger log = CoreLogging.messageLogger( MetadataContext.class );
+ private static final CoreMessageLogger LOG = CoreLogging.messageLogger( MetadataContext.class );
private final JpaMetamodelImplementor jpaMetamodel;
private final RuntimeModelCreationContext runtimeModelCreationContext;
@@ -291,8 +291,8 @@ public Map> getIdentifiableTypesByName() {
}
public void wrapUp() {
- if ( log.isTraceEnabled() ) {
- log.trace( "Wrapping up metadata context..." );
+ if ( LOG.isTraceEnabled() ) {
+ LOG.trace( "Wrapping up metadata context..." );
}
final boolean staticMetamodelScanEnabled =
@@ -302,8 +302,8 @@ public void wrapUp() {
//we need to process types from superclasses to subclasses
for ( Object mapping : orderedMappings ) {
if ( mapping instanceof PersistentClass persistentClass ) {
- if ( log.isTraceEnabled() ) {
- log.trace( "Starting entity [" + persistentClass.getEntityName() + ']' );
+ if ( LOG.isTraceEnabled() ) {
+ LOG.trace( "Starting entity [" + persistentClass.getEntityName() + ']' );
}
try {
final var jpaMapping = entityTypesByPersistentClass.get( persistentClass );
@@ -333,14 +333,14 @@ public void wrapUp() {
}
}
finally {
- if ( log.isTraceEnabled() ) {
- log.trace( "Completed entity [" + persistentClass.getEntityName() + ']' );
+ if ( LOG.isTraceEnabled() ) {
+ LOG.trace( "Completed entity [" + persistentClass.getEntityName() + ']' );
}
}
}
else if ( mapping instanceof MappedSuperclass mappedSuperclass ) {
- if ( log.isTraceEnabled() ) {
- log.trace( "Starting mapped superclass [" + mappedSuperclass.getMappedClass().getName() + ']' );
+ if ( LOG.isTraceEnabled() ) {
+ LOG.trace( "Starting mapped superclass [" + mappedSuperclass.getMappedClass().getName() + ']' );
}
try {
final var jpaType = mappedSuperclassByMappedSuperclassMapping.get( mappedSuperclass );
@@ -370,8 +370,8 @@ else if ( mappedSuperclass.isVersioned() && property == mappedSuperclass.getVers
}
}
finally {
- if ( log.isTraceEnabled() ) {
- log.trace( "Completed mapped superclass [" + mappedSuperclass.getMappedClass().getName() + ']' );
+ if ( LOG.isTraceEnabled() ) {
+ LOG.trace( "Completed mapped superclass [" + mappedSuperclass.getMappedClass().getName() + ']' );
}
}
}
@@ -702,8 +702,8 @@ private Property getMappedSuperclassProperty(String propertyName, MappedSupercla
private Set> buildIdClassAttributes(
IdentifiableDomainType ownerType,
List properties) {
- if ( log.isTraceEnabled() ) {
- log.trace( "Building old-school composite identifier [" + ownerType.getJavaType().getName() + ']' );
+ if ( LOG.isTraceEnabled() ) {
+ LOG.trace( "Building old-school composite identifier [" + ownerType.getJavaType().getName() + ']' );
}
final Set> attributes = new HashSet<>();
for ( Property property : properties ) {
@@ -806,7 +806,7 @@ private void registerAttribute(Class metamodelClass, Attribute attr
injectField( metamodelClass, name, attribute, allowNonDeclaredFieldReference );
}
catch (NoSuchFieldException e) {
- log.unableToLocateStaticMetamodelField( metamodelClass.getName(), name );
+ LOG.unableToLocateStaticMetamodelField( metamodelClass.getName(), name );
// throw new AssertionFailure(
// "Unable to locate static metamodel field: " + metamodelClass.getName() + '#' + name
// );
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractIdentifiableType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractIdentifiableType.java
index 3e03274013c3..673d95030c5a 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractIdentifiableType.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractIdentifiableType.java
@@ -401,10 +401,10 @@ public void finishUp() {
}
}
- private static final Logger log = Logger.getLogger( AbstractIdentifiableType.class );
+ private static final Logger LOG = Logger.getLogger( AbstractIdentifiableType.class );
private SqmPathSource interpretIdDescriptor() {
- log.tracef( "Interpreting domain-model identifier descriptor" );
+ LOG.tracef( "Interpreting domain-model identifier descriptor" );
final var superType = getSuperType();
if ( superType != null ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/JpaMetamodelImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/JpaMetamodelImpl.java
index 3cd722566eee..0be4804e8eb6 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/JpaMetamodelImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/JpaMetamodelImpl.java
@@ -67,7 +67,7 @@
* @author Steve Ebersole
*/
public class JpaMetamodelImpl implements JpaMetamodelImplementor, Serializable {
- private static final CoreMessageLogger log = CoreLogging.messageLogger( JpaMetamodel.class );
+ private static final CoreMessageLogger LOG = CoreLogging.messageLogger( JpaMetamodel.class );
private static class ImportInfo {
private final String importedName;
@@ -388,7 +388,7 @@ private Field getJavaField(String className, String fieldName) throws NoSuchFiel
public void addNamedEntityGraph(String graphName, RootGraphImplementor rootGraph) {
final EntityGraph old = entityGraphMap.put( graphName, rootGraph.makeImmutableCopy( graphName ) );
if ( old != null ) {
- log.tracef( "EntityGraph named '%s' was replaced", graphName );
+ LOG.tracef( "EntityGraph named '%s' was replaced", graphName );
}
}
@@ -485,7 +485,7 @@ private ImportInfo resolveImport(final String name) {
private void applyNamedEntityGraphs(Collection namedEntityGraphs) {
for ( NamedEntityGraphDefinition definition : namedEntityGraphs ) {
- log.tracef( "Applying named entity graph [name=%s, source=%s]",
+ LOG.tracef( "Applying named entity graph [name=%s, source=%s]",
definition.name(), definition.source() );
final RootGraphImplementor graph = definition.graphCreator().createEntityGraph(
@@ -766,7 +766,7 @@ private void handleUnusedMappedSuperclasses(MetadataContext context, TypeConfigu
final Set unusedMappedSuperclasses = context.getUnusedMappedSuperclasses();
if ( !unusedMappedSuperclasses.isEmpty() ) {
for ( MappedSuperclass mappedSuperclass : unusedMappedSuperclasses ) {
- log.unusedMappedSuperclass( mappedSuperclass.getMappedClass().getName() );
+ LOG.unusedMappedSuperclass( mappedSuperclass.getMappedClass().getName() );
locateOrBuildMappedSuperclassType( mappedSuperclass, context, typeConfiguration );
}
}
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..55d62a9e4629 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,6 +40,7 @@
@Deprecated(since = "6", forRemoval = true)
@Remove
class EntityPropertyMapping {
+
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( EntityPropertyMapping.class );
private final Map typesByPropertyPath = new HashMap<>();
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java
index 5410d56c1dfb..a6167ba68ff4 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java
@@ -80,7 +80,7 @@
*/
@Internal
public class JoinedSubclassEntityPersister extends AbstractEntityPersister {
- private static final Logger log = Logger.getLogger( JoinedSubclassEntityPersister.class );
+ private static final Logger LOG = Logger.getLogger( JoinedSubclassEntityPersister.class );
private static final String IMPLICIT_DISCRIMINATOR_ALIAS = "clazz_";
@@ -163,7 +163,7 @@ public JoinedSubclassEntityPersister(
forceDiscriminator = persistentClass.isForceDiscriminator();
final var discriminatorMapping = persistentClass.getDiscriminator();
if ( discriminatorMapping != null ) {
- log.tracef( "Encountered explicit discriminator mapping for joined inheritance" );
+ LOG.tracef( "Encountered explicit discriminator mapping for joined inheritance" );
final var selectable = discriminatorMapping.getSelectables().get(0);
if ( selectable instanceof Column column ) {
explicitDiscriminatorColumnName = column.getQuotedName( dialect );
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..42ab47ff8938 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,6 +71,7 @@
* @author Steve Ebersole
*/
public class UpdateCoordinatorStandard extends AbstractMutationCoordinator implements UpdateCoordinator {
+
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( UpdateCoordinatorStandard.class );
private final MutationOperationGroup staticUpdateGroup;
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..efddecc13f0d 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,6 +26,7 @@
* @author Steve Ebersole
*/
public class ProcedureParamBindings implements QueryParameterBindings {
+
private static final Logger LOG = Logger.getLogger( QueryParameterBindings.class );
private final ProcedureParameterMetadataImpl parameterMetadata;
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..6b49d9f68eb5 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,6 +29,7 @@
*/
@Internal
public class GetterMethodImpl implements Getter {
+
private static final CoreMessageLogger LOG = messageLogger( GetterMethodImpl.class );
private final Class containerClass;
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..288bbe0d2a85 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,6 +24,7 @@
*/
@Internal
public class SetterMethodImpl implements Setter {
+
private static final CoreMessageLogger LOG = messageLogger( SetterMethodImpl.class );
private final Class 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..c649d4629cb9 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,6 +25,7 @@
* @author Gavin King
*/
public abstract class AbstractLazyInitializer implements LazyInitializer {
+
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( AbstractLazyInitializer.class );
private final String entityName;
@@ -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
@@ -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
@@ -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..468d5e6cee34 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,7 +16,10 @@
import static org.hibernate.internal.CoreLogging.messageLogger;
import static org.hibernate.internal.util.ReflectHelper.isPublic;
-public class ByteBuddyInterceptor extends BasicLazyInitializer implements ProxyConfiguration.Interceptor {
+public class ByteBuddyInterceptor
+ extends BasicLazyInitializer
+ implements ProxyConfiguration.Interceptor {
+
private static final CoreMessageLogger LOG = messageLogger( ByteBuddyInterceptor.class );
private final Class[] interfaces;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/QualifiedJoinPathConsumer.java b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/QualifiedJoinPathConsumer.java
index d09b48affd62..6bd21c050771 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/QualifiedJoinPathConsumer.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/QualifiedJoinPathConsumer.java
@@ -37,7 +37,7 @@
* @author Steve Ebersole
*/
public class QualifiedJoinPathConsumer implements DotIdentifierConsumer {
- private static final Logger log = Logger.getLogger( QualifiedJoinPathConsumer.class );
+ private static final Logger LOG = Logger.getLogger( QualifiedJoinPathConsumer.class );
private final SqmCreationState creationState;
private final SqmRoot sqmRoot;
@@ -355,7 +355,7 @@ public void consumeIdentifier(String identifier, boolean isTerminal, boolean all
assert ! ( joinedEntityType instanceof SqmPolymorphicRootDescriptor );
if ( fetch ) {
- log.debugf( "Ignoring fetch on entity join: %s(%s)", joinedEntityType.getHibernateEntityName(), alias );
+ LOG.debugf( "Ignoring fetch on entity join: %s(%s)", joinedEntityType.getHibernateEntityName(), alias );
}
join = new SqmEntityJoin<>( joinedEntityType, alias, joinType, sqmRoot );
diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SemanticQueryBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SemanticQueryBuilder.java
index 53d709bd94d8..5ebb76db1291 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SemanticQueryBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SemanticQueryBuilder.java
@@ -257,7 +257,7 @@
*/
public class SemanticQueryBuilder extends HqlParserBaseVisitor