hibernate · gavinking · Jul 12, 2025 · Jul 13, 2025 · Jul 13, 2025 · Jul 13, 2025
diff --git a/.../asciidoc/integrationguide/chapters/services/extras/register-event-listeners-example.java b/.../asciidoc/integrationguide/chapters/services/extras/register-event-listeners-example.java
@@ -6,7 +6,7 @@ public void integrate(
             SessionFactoryServiceRegistry serviceRegistry) {
         // As you might expect, an EventListenerRegistry is the thing with which event listeners are registered  It is a
         // service so we look it up using the service registry
-        final EventListenerRegistry eventListenerRegistry = serviceRegistry.getService( EventListenerRegistry.class );
+        final EventListenerRegistry eventListenerRegistry = sessionFactory.getEventListenerRegistry();
 
         // If you wish to have custom determination and handling of "duplicate" listeners, you would have to add an
         // implementation of the org.hibernate.event.service.spi.DuplicationStrategy contract like this

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
@@ -158,7 +158,7 @@ private static void setupListener(ValidatorFactory validatorFactory, SessionFact
 		final ConfigurationService cfgService = serviceRegistry.requireService( ConfigurationService.class );
 		final BeanValidationEventListener listener =
 				new BeanValidationEventListener( validatorFactory, cfgService.getSettings(), classLoaderService );
-		final EventListenerRegistry listenerRegistry = serviceRegistry.requireService( EventListenerRegistry.class );
+		final EventListenerRegistry listenerRegistry = sessionFactory.getEventListenerRegistry();
 		listenerRegistry.addDuplicationStrategy( DuplicationStrategyImpl.INSTANCE );
 		listenerRegistry.appendListeners( EventType.PRE_INSERT, listener );
 		listenerRegistry.appendListeners( EventType.PRE_UPDATE, listener );

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
@@ -130,10 +130,7 @@ public Properties loadProperties(String resourceName) {
 				stream.close();
 			}
 			catch (IOException e) {
-				log.debug(
-						String.format( "Unable to close properties file [%s] stream", resourceName ),
-						e
-				);
+				log.debug( "Unable to close properties file stream [" + resourceName + "]", e );
 			}
 		}
 	}
@@ -157,10 +154,7 @@ public Properties loadProperties(File file) {
 					stream.close();
 				}
 				catch (IOException e) {
-					log.debug(
-							String.format( "Unable to close properties file [%s] 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/internal/BootstrapContextImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/BootstrapContextImpl.java
@@ -307,28 +307,43 @@ public void addAttributeConverterDescriptor(ConverterDescriptor<?,?> descriptor)
 		}
 	}
 
-	void injectJpaTempClassLoader(ClassLoader jpaTempClassLoader) {
-		log.debugf( "Injecting JPA temp ClassLoader [%s] into BootstrapContext; was [%s]", jpaTempClassLoader, this.getJpaTempClassLoader() );
-		this.classLoaderAccess.injectTempClassLoader( jpaTempClassLoader );
+	void injectJpaTempClassLoader(ClassLoader classLoader) {
+		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) {
-		log.debugf( "Injecting ScanOptions [%s] into BootstrapContext; was [%s]", scanOptions, this.scanOptions );
+		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) {
-		log.debugf( "Injecting ScanEnvironment [%s] into BootstrapContext; was [%s]", scanEnvironment, this.scanEnvironment );
+		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) {
-		log.debugf( "Injecting Scanner [%s] into BootstrapContext; was [%s]", scanner, this.scannerSetting );
+		if ( log.isTraceEnabled() && scanner != this.scannerSetting ) {
+			log.tracef( "Injecting Scanner [%s] into BootstrapContext; was [%s]",
+					scanner, scannerSetting );
+		}
 		this.scannerSetting = scanner;
 	}
 
 	void injectArchiveDescriptorFactory(ArchiveDescriptorFactory factory) {
-		log.debugf( "Injecting ArchiveDescriptorFactory [%s] into BootstrapContext; was [%s]", factory, this.archiveDescriptorFactory );
+		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
@@ -40,7 +40,6 @@ public ClassLoaderAccessImpl(ClassLoaderService classLoaderService) {
 	}
 
 	public void injectTempClassLoader(ClassLoader jpaTempClassLoader) {
-		log.debugf( "ClassLoaderAccessImpl#injectTempClassLoader(%s) [was %s]", jpaTempClassLoader, this.jpaTempClassLoader );
 		this.jpaTempClassLoader = jpaTempClassLoader;
 	}
 
@@ -55,20 +54,19 @@ public Class<?> classForName(String name) {
 			return classLoaderService.classForName( name );
 		}
 		else {
-			log.debugf( "Not known whether passed class name [%s] is safe", name );
+			// Could not determine that the given class is safe to load with live ClassLoader
 			if ( jpaTempClassLoader == null ) {
-				log.debugf(
-						"No temp ClassLoader provided; using live ClassLoader " +
-								"for loading potentially unsafe class : %s",
+				log.tracef(
+						"No temp ClassLoader provided; using live ClassLoader to load potentially unsafe class: %s",
 						name
 				);
 				return classLoaderService.classForName( name );
 			}
 			else {
-				log.debugf(
-						"Temp ClassLoader was provided, so we will use that : %s",
-						name
-				);
+//				log.tracef(
+//						"Temp ClassLoader was provided, so we will use that: %s",
+//						name
+//				);
 				try {
 					return jpaTempClassLoader.loadClass( 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
@@ -903,9 +903,9 @@ public void addImport(String importName, String className) {
 			throw new IllegalArgumentException( "Import name or entity name is null" );
 		}
 		log.tracev( "Import: {0} -> {1}", importName, className);
-		String old = imports.put( 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<ForeignKey> done, M
 
 	private void processPropertyReferences() {
 		if ( delayedPropertyReferenceHandlers != null ) {
-			log.debug( "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.debugf( "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/MetadataImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataImpl.java
@@ -493,12 +493,9 @@ public void initSessionFactory(SessionFactoryImplementor sessionFactory) {
 		// must not use BootstrapContext services here
 		final ServiceRegistryImplementor registry = sessionFactory.getServiceRegistry();
 		assert registry != null;
-		final ConfigurationService configurationService =
-				registry.requireService( ConfigurationService.class );
-		final ClassLoaderService classLoaderService =
-				registry.requireService( ClassLoaderService.class );
-		final EventListenerRegistry eventListenerRegistry =
-				registry.requireService( EventListenerRegistry.class );
+		final ConfigurationService configurationService = registry.requireService( ConfigurationService.class );
+		final ClassLoaderService classLoaderService = registry.requireService( ClassLoaderService.class );
+		final EventListenerRegistry eventListenerRegistry = sessionFactory.getEventListenerRegistry();
 		configurationService.getSettings().forEach( (propertyName, value) -> {
 			if ( propertyName.startsWith( EVENT_LISTENER_PREFIX ) ) {
 				final String eventTypeName = propertyName.substring( EVENT_LISTENER_PREFIX.length() + 1 );

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
@@ -99,7 +99,6 @@ private <X extends T> Binding<X> doBind(XMLEventReader eventReader, Origin origi
 			}
 			catch (Exception 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
@@ -118,8 +118,8 @@ private static void writeSerFile(Serializable binding, File xmlFile, File serFil
 			binding = (Serializable) bindingWrapper.getRoot();
 		}
 		try ( FileOutputStream fos = new FileOutputStream( serFile ) ) {
-			if ( log.isDebugEnabled() ) {
-				log.debugf( "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( binding, fos );
 			boolean success = serFile.setLastModified( System.currentTimeMillis() );

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
@@ -163,8 +163,8 @@
 			Origin origin) {
 		final String rootElementLocalName = rootElementStartEvent.getName().getLocalPart();
 		if ( "hibernate-mapping".equals( rootElementLocalName ) ) {
-			if ( log.isDebugEnabled() ) {
-				log.debugf( "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 @@
 		else {
 			assert "entity-mappings".equals( rootElementLocalName );
 			try {
-				log.debugf( "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/...te-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalXmlResourceResolver.java b/...te-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalXmlResourceResolver.java
@@ -37,7 +37,7 @@ public Object resolveEntity(String publicID, String systemID, String baseURI, St
 		log.tracef( "In resolveEntity(%s, %s, %s, %s)", publicID, systemID, baseURI, namespace );
 
 		if ( namespace != null ) {
-			log.debugf( "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.debugf( "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.debugf( "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.debugf( "Unable to resolve [%s] on classpath", systemID );
+					log.tracef( "Unable to resolve [%s] on classpath", systemID );
 				}
 				else {
-					log.debugf( "Resolved [%s] on classpath", systemID );
+					log.tracef( "Resolved [%s] on classpath", systemID );
 				}
 				return stream;
 			}

diff --git a/...re/src/main/java/org/hibernate/boot/model/convert/internal/AttributeConverterManager.java b/...re/src/main/java/org/hibernate/boot/model/convert/internal/AttributeConverterManager.java
@@ -112,8 +112,7 @@ public void addRegistration(RegisteredConversion conversion, BootstrapContext co
 		// see if we have a matching entry in `attributeConverterDescriptorsByClass`.
 		// if so, remove it.  The conversion being registered will always take precedence
 		if ( attributeConverterDescriptorsByClass != null ) {
-			final ConverterDescriptor<?,?> removed =
-					attributeConverterDescriptorsByClass.remove( conversion.getConverterType() );
+			final var removed = attributeConverterDescriptorsByClass.remove( conversion.getConverterType() );
 			if ( removed != null && log.isDebugEnabled() ) {
 				log.debugf( "Removed potentially auto-applicable converter `%s` due to @ConverterRegistration",
 						removed.getAttributeConverterClass().getName() );
@@ -228,8 +227,8 @@ private List<ConverterDescriptor<?,?>> getMatches(
 			ConverterDescriptor<?,?>> matcher) {
 		final List<ConverterDescriptor<?,?>> matches = new ArrayList<>();
 		for ( ConverterDescriptor<?,?> descriptor : converterDescriptors() ) {
-			if ( log.isDebugEnabled() ) {
-				log.debugf(
+			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/AnnotatedColumn.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedColumn.java
@@ -240,8 +240,8 @@ public AnnotatedColumn() {
 
 	public void bind() {
 		if ( isNotEmpty( formulaString ) ) {
-			if ( LOG.isDebugEnabled() ) {
-				LOG.debug( "Binding formula: " + formulaString );
+			if ( LOG.isTraceEnabled() ) {
+				LOG.trace( "Binding formula: " + formulaString );
 			}
 			formula = new Formula();
 			formula.setFormula( formulaString );
@@ -274,8 +274,8 @@ public void bind() {
 			if ( generatedAs != null ) {
 				mappingColumn.setGeneratedAs( generatedAs );
 			}
-			if ( LOG.isDebugEnabled() ) {
-				LOG.debug( "Binding column: " + logicalColumnName );
+			if ( LOG.isDebugEnabled() && logicalColumnName != null ) {
+				LOG.trace( "Binding column: " + logicalColumnName );
 			}
 		}
 	}
@@ -773,8 +773,8 @@ private static jakarta.persistence.Column[] overrideColumns(
 						+ " '@AttributeOverride's but the overridden property has " + overriddenCols.length
 						+ " columns (every column must have exactly one '@AttributeOverride')" );
 			}
-			if ( LOG.isDebugEnabled() ) {
-				LOG.debug( "Column mapping overridden for property: " + inferredData.getPropertyName() );
+			if ( LOG.isTraceEnabled() ) {
+				LOG.trace( "Column mapping overridden for property: " + inferredData.getPropertyName() );
 			}
 			return isEmpty( overriddenCols ) ? null : overriddenCols;
 		}

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
@@ -1079,8 +1079,8 @@ private void setDeclaringClass(ClassDetails declaringClass) {
 	private void bind() {
 		collection = createCollection( propertyHolder.getPersistentClass() );
 		final String role = qualify( propertyHolder.getPath(), propertyName );
-		if ( LOG.isDebugEnabled() ) {
-			LOG.debug( "Binding collection role: " + role );
+		if ( LOG.isTraceEnabled() ) {
+			LOG.trace( "Binding collection role: " + role );
 		}
 		collection.setRole( role );
 		collection.setMappedByProperty( mappedBy );
@@ -2803,27 +2803,27 @@ private void setLocalGenerators(Map<String, IdentifierGeneratorDefinition> local
 	}
 
 	private void logOneToManySecondPass() {
-		if ( LOG.isDebugEnabled() ) {
-			LOG.debug( "Binding @OneToMany through foreign key: " + safeCollectionRole() );
+		if ( LOG.isTraceEnabled() ) {
+			LOG.trace( "Binding one-to-many association through foreign key: " + safeCollectionRole() );
 		}
 	}
 
 	private void logManyToManySecondPass(
 			boolean isOneToMany,
 			boolean isCollectionOfEntities,
 			boolean isManyToAny) {
-		if ( LOG.isDebugEnabled() ) {
+		if ( LOG.isTraceEnabled() ) {
 			if ( isCollectionOfEntities && isOneToMany ) {
-				LOG.debug( "Binding @OneToMany through association table: " + safeCollectionRole() );
+				LOG.trace( "Binding one-to-many association through association table: " + safeCollectionRole() );
 			}
 			else if ( isCollectionOfEntities ) {
-				LOG.debug( "Binding @ManyToMany through association table: " + safeCollectionRole() );
+				LOG.trace( "Binding many-to-many association through association table: " + safeCollectionRole() );
 			}
 			else if ( isManyToAny ) {
-				LOG.debug( "Binding @ManyToAny: " + safeCollectionRole() );
+				LOG.trace( "Binding many-to-any: " + safeCollectionRole() );
 			}
 			else {
-				LOG.debug( "Binding @ElementCollection to collection table: " + safeCollectionRole() );
+				LOG.trace( "Binding element collection to collection table: " + safeCollectionRole() );
 			}
 		}
 	}

diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionSecondPass.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionSecondPass.java
@@ -36,14 +36,14 @@ public CollectionSecondPass(Collection collection) {
 	@Override
 	public void doSecondPass(Map<String, PersistentClass> persistentClasses)
 			throws MappingException {
-		if ( LOG.isDebugEnabled() ) {
-			LOG.debug( "Second pass for collection: " + collection.getRole() );
+		if ( LOG.isTraceEnabled() ) {
+			LOG.trace( "Second pass for collection: " + collection.getRole() );
 		}
 
 		secondPass( persistentClasses );
 		collection.createAllKeys();
 
-		if ( LOG.isDebugEnabled() ) {
+		if ( LOG.isTraceEnabled() ) {
 			String msg = "Mapped collection key: " + columns( collection.getKey() );
 			if ( collection.isIndexed() ) {
 				msg += ", index: " + columns( ( (IndexedCollection) collection ).getIndex() );
@@ -55,7 +55,7 @@ public void doSecondPass(Map<String, PersistentClass> persistentClasses)
 			else {
 				msg += ", element: " + columns( collection.getElement() );
 			}
-			LOG.debug( msg );
+			LOG.trace( msg );
 		}
 	}
 

diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EmbeddableBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EmbeddableBinder.java
@@ -452,8 +452,8 @@ static Component fillEmbeddable(
 		);
 
 		final String subpath = getPath( propertyHolder, inferredData );
-		if ( LOG.isDebugEnabled() ) {
-			LOG.debug( "Binding component with path: " + subpath );
+		if ( LOG.isTraceEnabled() ) {
+			LOG.trace( "Binding embeddable with path: " + subpath );
 		}
 		final PropertyHolder subholder = buildPropertyHolder(
 				component,
-Original file line number
+Diff line change
@@ Expand Up @@
     			}
     			catch (Exception e) {
     				log.debug( "Unable to close StAX reader", e );
     			}
     		}
     	}
@@ Expand Down @@