redo of #10865 with uppercase LOG

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;
 

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;
 

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

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;

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;

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;
 	}
 

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 <jar-file/> URL [%s] relative to root URL [%s]",
 							filePart,

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<String, Object> settings, ClassLoaderService classLoaderService) {

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";
 

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.

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 );
 				}
 			}
 		}

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() );
 				}
 			}
 		}

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(),

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;