clean up some uses of BOOT_LOGGER

gavinking · gavinking · commit 76d6228173b4 · 2025-12-01T17:11:16.000+01:00
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/BootLogging.java b/hibernate-core/src/main/java/org/hibernate/boot/BootLogging.java
@@ -45,7 +45,6 @@ public interface BootLogging extends BasicLogger {
 	@Message(id = 160101, value = "Duplicate generator name: '%s'")
 	void duplicateGeneratorName(String name);
 
-
 	@LogMessage(level = DEBUG)
 	@Message(id = 160111, value = "Package not found or no package-info.java: %s")
 	void packageNotFound(String packageName);
@@ -84,7 +83,6 @@ public interface BootLogging extends BasicLogger {
 					@ManyToOne and @OneToOne associations mapped with @NotFound are forced to EAGER fetching""")
 	void ignoreNotFoundWithFetchTypeLazy(String entity, String association);
 
-	// --- New typed TRACE/DEBUG messages for boot internals ---
 	@LogMessage(level = TRACE)
 	@Message(id = 160140, value = "Binding formula: %s")
 	void bindingFormula(String formula);
@@ -449,4 +447,12 @@ public interface BootLogging extends BasicLogger {
 	@LogMessage(level = DEBUG)
 	@Message(id = 160244, value = "Skipping HBM processing of entity hierarchy [%s], as at least one entity [%s] has been processed")
 	void skippingHbmProcessingOfEntityHierarchy(String rootEntityName, String processedEntity);
+
+	@LogMessage(level = WARN)
+	@Message(id = 160245, value = "Association '%s' is 'mappedBy' another entity and should not specify a '@MapKeyColumn' (use '@MapKey' instead)")
+	void mappedByShouldNotSpecifyMapKeyColumn(String associationPath);
+
+	@LogMessage(level = WARN)
+	@Message(id = 160246, value = "Association '%s' is 'mappedBy' another entity and should not specify an '@OrderColumn' (use '@OrderBy' instead)")
+	void mappedByShouldNotSpecifyOrderColumn(String associationPath);
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/MetadataSources.java b/hibernate-core/src/main/java/org/hibernate/boot/MetadataSources.java
@@ -105,9 +105,7 @@ public MetadataSources(ServiceRegistry serviceRegistry, XmlMappingBinderAccess x
 		// service registry really should be either BootstrapServiceRegistry or StandardServiceRegistry type...
 		if ( !isExpectedServiceRegistryType( serviceRegistry ) ) {
 			if ( BOOT_LOGGER.isDebugEnabled() ) {
-				BOOT_LOGGER.unexpectedServiceRegistryType(
-						serviceRegistry.getClass().getName()
-				);
+				BOOT_LOGGER.unexpectedServiceRegistryType( serviceRegistry.getClass().getName() );
 			}
 		}
 		this.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
@@ -14,6 +14,8 @@
 
 import org.hibernate.boot.archive.spi.ArchiveException;
 
+import static org.hibernate.boot.BootLogging.BOOT_LOGGER;
+
 
 /**
  * Helper for dealing with archives
@@ -89,7 +91,7 @@ else if ( "zip".equals( protocol )
 					"Unable to determine JAR Url from " + url + ". Cause: " + e.getMessage()
 			);
 		}
-		org.hibernate.boot.BootLogging.BOOT_LOGGER.jarUrlFromUrlEntry( String.valueOf(url), String.valueOf(jarUrl) );
+		BOOT_LOGGER.jarUrlFromUrlEntry( String.valueOf(url), String.valueOf(jarUrl) );
 		return jarUrl;
 	}
 
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
@@ -100,12 +100,11 @@ public static LoadedConfig consume(JaxbCfgHibernateConfiguration jaxbCfg) {
 					final String eventTypeName = listenerGroup.getType().value();
 					final var eventType = EventType.resolveEventTypeByName( eventTypeName );
 					for ( var listener : listenerGroup.getListener() ) {
-					if ( listener.getType() != null ) {
-						BOOT_LOGGER.listenerDefinedAlsoDefinedEventType(
-								listener.getClazz()
-						);
-					}
-						cfg.addEventListener( eventType, listener.getClazz() );
+						final String listenerClassName = listener.getClazz();
+						if ( listener.getType() != null ) {
+							BOOT_LOGGER.listenerDefinedAlsoDefinedEventType( listenerClassName );
+						}
+						cfg.addEventListener( eventType, listenerClassName );
 					}
 				}
 			}
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
@@ -318,7 +318,7 @@ void injectJpaTempClassLoader(ClassLoader classLoader) {
 
 	void injectScanOptions(ScanOptions scanOptions) {
 		if ( scanOptions != this.scanOptions ) {
-			BOOT_LOGGER.injectingScanOptions(scanOptions, this.scanOptions);
+			BOOT_LOGGER.injectingScanOptions( scanOptions, this.scanOptions );
 		}
 		this.scanOptions = scanOptions;
 	}
@@ -332,7 +332,7 @@ void injectScanEnvironment(ScanEnvironment scanEnvironment) {
 
 	void injectScanner(Scanner scanner) {
 		if ( scanner != this.scannerSetting ) {
-			BOOT_LOGGER.injectingScanner( scanner, scannerSetting );
+			BOOT_LOGGER.injectingScanner( scanner, this.scannerSetting );
 		}
 		this.scannerSetting = scanner;
 	}
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
@@ -235,9 +235,7 @@ public AnnotatedColumn() {
 
 	public void bind() {
 		if ( isNotEmpty( formulaString ) ) {
-if ( BOOT_LOGGER.isTraceEnabled() ) {
-				BOOT_LOGGER.bindingFormula( formulaString );
-			}
+			BOOT_LOGGER.bindingFormula( formulaString );
 			formula = new Formula();
 			formula.setFormula( formulaString );
 		}
@@ -269,7 +267,7 @@ public void bind() {
 			if ( generatedAs != null ) {
 				mappingColumn.setGeneratedAs( generatedAs );
 			}
-if ( BOOT_LOGGER.isDebugEnabled() && logicalColumnName != null ) {
+			if ( logicalColumnName != null ) {
 				BOOT_LOGGER.bindingColumn( logicalColumnName );
 			}
 		}
@@ -770,7 +768,7 @@ private static jakarta.persistence.Column[] overrideColumns(
 						+ " columns (every column must have exactly one '@AttributeOverride')" );
 			}
 			if ( BOOT_LOGGER.isTraceEnabled() ) {
-	BOOT_LOGGER.columnMappingOverridden( inferredData.getPropertyName() );
+				BOOT_LOGGER.columnMappingOverridden( inferredData.getPropertyName() );
 			}
 			return isEmpty( overriddenCols ) ? null : overriddenCols;
 		}
@@ -930,7 +928,7 @@ void applyColumnDefault(PropertyData inferredData, int length) {
 			}
 		}
 		else {
-BOOT_LOGGER.couldNotPerformColumnDefaultLookup();
+			BOOT_LOGGER.couldNotPerformColumnDefaultLookup();
 		}
 	}
 
@@ -951,7 +949,7 @@ void applyGeneratedAs(PropertyData inferredData, int length) {
 			}
 		}
 		else {
-BOOT_LOGGER.couldNotPerformGeneratedColumnLookup();
+			BOOT_LOGGER.couldNotPerformGeneratedColumnLookup();
 		}
 }
 
@@ -994,9 +992,9 @@ void applyCheckConstraint(PropertyData inferredData, int length) {
 			}
 		}
 		else {
-BOOT_LOGGER.couldNotPerformCheckLookup();
+			BOOT_LOGGER.couldNotPerformCheckLookup();
 		}
-}
+	}
 
 	//must only be called after all setters are defined and before binding
 	private void extractDataFromPropertyData(
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
@@ -1062,9 +1062,7 @@ private void bind() {
 		}
 		collection = createCollection( propertyHolder.getPersistentClass() );
 		final String role = qualify( propertyHolder.getPath(), propertyName );
-		if ( BOOT_LOGGER.isTraceEnabled() ) {
-			BOOT_LOGGER.bindingCollectionRole( role );
-		}
+		BOOT_LOGGER.bindingCollectionRole( role );
 		collection.setRole( role );
 		collection.setMappedByProperty( mappedBy );
 
@@ -1145,16 +1143,14 @@ private void detectMappedByProblem(boolean isMappedBy) {
 			}
 			if ( oneToMany ) {
 				if ( property.hasDirectAnnotationUsage( MapKeyColumn.class ) ) {
-					BOOT_LOGGER.warn( "Association '"
-									+ qualify( propertyHolder.getPath(), propertyName )
-									+ "' is 'mappedBy' another entity and should not specify a '@MapKeyColumn'"
-									+ " (use '@MapKey' instead)" );
+					BOOT_LOGGER.mappedByShouldNotSpecifyMapKeyColumn(
+							qualify( propertyHolder.getPath(), propertyName )
+					);
 				}
 				if ( property.hasDirectAnnotationUsage( OrderColumn.class ) ) {
-					BOOT_LOGGER.warn( "Association '"
-									+ qualify( propertyHolder.getPath(), propertyName )
-									+ "' is 'mappedBy' another entity and should not specify an '@OrderColumn'"
-									+ " (use '@OrderBy' instead)" );
+					BOOT_LOGGER.mappedByShouldNotSpecifyOrderColumn(
+							qualify( propertyHolder.getPath(), propertyName )
+					);
 				}
 			}
 			else {
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
@@ -95,9 +95,9 @@ public void registerTable(Identifier logicalName, Table table) {
 		final Table previous = tables.put( logicalName, table );
 		if ( previous != null ) {
 			BOOT_LOGGER.replacingTableRegistration(
-					String.valueOf(logicalName),
-					String.valueOf(previous),
-					String.valueOf(table)
+					String.valueOf( logicalName ),
+					String.valueOf( previous ),
+					String.valueOf( table )
 			);
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -105,9 +105,7 @@ public MetadataSources(ServiceRegistry serviceRegistry, XmlMappingBinderAccess x`
`105`	`105`	`// service registry really should be either BootstrapServiceRegistry or StandardServiceRegistry type...`
`106`	`106`	`if ( !isExpectedServiceRegistryType( serviceRegistry ) ) {`
`107`	`107`	`if ( BOOT_LOGGER.isDebugEnabled() ) {`
`108`		`- BOOT_LOGGER.unexpectedServiceRegistryType(`
`109`		`- serviceRegistry.getClass().getName()`
`110`		`- );`
	`108`	`+ BOOT_LOGGER.unexpectedServiceRegistryType( serviceRegistry.getClass().getName() );`
`111`	`109`	`}`
`112`	`110`	`}`
`113`	`111`	`this.serviceRegistry = serviceRegistry;`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@`
`14`	`14`
`15`	`15`	`import org.hibernate.boot.archive.spi.ArchiveException;`
`16`	`16`
	`17`	`+import static org.hibernate.boot.BootLogging.BOOT_LOGGER;`
	`18`	`+`
`17`	`19`
`18`	`20`	`/**`
`19`	`21`	`* Helper for dealing with archives`
`@@ -89,7 +91,7 @@ else if ( "zip".equals( protocol )`
`89`	`91`	`"Unable to determine JAR Url from " + url + ". Cause: " + e.getMessage()`
`90`	`92`	`);`
`91`	`93`	`}`
`92`		`- org.hibernate.boot.BootLogging.BOOT_LOGGER.jarUrlFromUrlEntry( String.valueOf(url), String.valueOf(jarUrl) );`
	`94`	`+ BOOT_LOGGER.jarUrlFromUrlEntry( String.valueOf(url), String.valueOf(jarUrl) );`
`93`	`95`	`return jarUrl;`
`94`	`96`	`}`
`95`	`97`
Original file line number	Diff line number	Diff line change
`@@ -100,12 +100,11 @@ public static LoadedConfig consume(JaxbCfgHibernateConfiguration jaxbCfg) {`
`100`	`100`	`final String eventTypeName = listenerGroup.getType().value();`
`101`	`101`	`final var eventType = EventType.resolveEventTypeByName( eventTypeName );`
`102`	`102`	`for ( var listener : listenerGroup.getListener() ) {`
`103`		`- if ( listener.getType() != null ) {`
`104`		`- BOOT_LOGGER.listenerDefinedAlsoDefinedEventType(`
`105`		`- listener.getClazz()`
`106`		`- );`
`107`		`- }`
`108`		`- cfg.addEventListener( eventType, listener.getClazz() );`
	`103`	`+ final String listenerClassName = listener.getClazz();`
	`104`	`+ if ( listener.getType() != null ) {`
	`105`	`+ BOOT_LOGGER.listenerDefinedAlsoDefinedEventType( listenerClassName );`
	`106`	`+ }`
	`107`	`+ cfg.addEventListener( eventType, listenerClassName );`
`109`	`108`	`}`
`110`	`109`	`}`
`111`	`110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -318,7 +318,7 @@ void injectJpaTempClassLoader(ClassLoader classLoader) {`
`318`	`318`
`319`	`319`	`void injectScanOptions(ScanOptions scanOptions) {`
`320`	`320`	`if ( scanOptions != this.scanOptions ) {`
`321`		`- BOOT_LOGGER.injectingScanOptions(scanOptions, this.scanOptions);`
	`321`	`+ BOOT_LOGGER.injectingScanOptions( scanOptions, this.scanOptions );`
`322`	`322`	`}`
`323`	`323`	`this.scanOptions = scanOptions;`
`324`	`324`	`}`
`@@ -332,7 +332,7 @@ void injectScanEnvironment(ScanEnvironment scanEnvironment) {`
`332`	`332`
`333`	`333`	`void injectScanner(Scanner scanner) {`
`334`	`334`	`if ( scanner != this.scannerSetting ) {`
`335`		`- BOOT_LOGGER.injectingScanner( scanner, scannerSetting );`
	`335`	`+ BOOT_LOGGER.injectingScanner( scanner, this.scannerSetting );`
`336`	`336`	`}`
`337`	`337`	`this.scannerSetting = scanner;`
`338`	`338`	`}`
Original file line number	Diff line number	Diff line change
`@@ -235,9 +235,7 @@ public AnnotatedColumn() {`
`235`	`235`
`236`	`236`	`public void bind() {`
`237`	`237`	`if ( isNotEmpty( formulaString ) ) {`
`238`		`-if ( BOOT_LOGGER.isTraceEnabled() ) {`
`239`		`- BOOT_LOGGER.bindingFormula( formulaString );`
`240`		`- }`
	`238`	`+ BOOT_LOGGER.bindingFormula( formulaString );`
`241`	`239`	`formula = new Formula();`
`242`	`240`	`formula.setFormula( formulaString );`
`243`	`241`	`}`
`@@ -269,7 +267,7 @@ public void bind() {`
`269`	`267`	`if ( generatedAs != null ) {`
`270`	`268`	`mappingColumn.setGeneratedAs( generatedAs );`
`271`	`269`	`}`
`272`		`-if ( BOOT_LOGGER.isDebugEnabled() && logicalColumnName != null ) {`
	`270`	`+ if ( logicalColumnName != null ) {`
`273`	`271`	`BOOT_LOGGER.bindingColumn( logicalColumnName );`
`274`	`272`	`}`
`275`	`273`	`}`
`@@ -770,7 +768,7 @@ private static jakarta.persistence.Column[] overrideColumns(`
`770`	`768`	`+ " columns (every column must have exactly one '@AttributeOverride')" );`
`771`	`769`	`}`
`772`	`770`	`if ( BOOT_LOGGER.isTraceEnabled() ) {`
`773`		`- BOOT_LOGGER.columnMappingOverridden( inferredData.getPropertyName() );`
	`771`	`+ BOOT_LOGGER.columnMappingOverridden( inferredData.getPropertyName() );`
`774`	`772`	`}`
`775`	`773`	`return isEmpty( overriddenCols ) ? null : overriddenCols;`
`776`	`774`	`}`
`@@ -930,7 +928,7 @@ void applyColumnDefault(PropertyData inferredData, int length) {`
`930`	`928`	`}`
`931`	`929`	`}`
`932`	`930`	`else {`
`933`		`-BOOT_LOGGER.couldNotPerformColumnDefaultLookup();`
	`931`	`+ BOOT_LOGGER.couldNotPerformColumnDefaultLookup();`
`934`	`932`	`}`
`935`	`933`	`}`
`936`	`934`
`@@ -951,7 +949,7 @@ void applyGeneratedAs(PropertyData inferredData, int length) {`
`951`	`949`	`}`
`952`	`950`	`}`
`953`	`951`	`else {`
`954`		`-BOOT_LOGGER.couldNotPerformGeneratedColumnLookup();`
	`952`	`+ BOOT_LOGGER.couldNotPerformGeneratedColumnLookup();`
`955`	`953`	`}`
`956`	`954`	`}`
`957`	`955`
`@@ -994,9 +992,9 @@ void applyCheckConstraint(PropertyData inferredData, int length) {`
`994`	`992`	`}`
`995`	`993`	`}`
`996`	`994`	`else {`
`997`		`-BOOT_LOGGER.couldNotPerformCheckLookup();`
	`995`	`+ BOOT_LOGGER.couldNotPerformCheckLookup();`
`998`	`996`	`}`
`999`		`-}`
	`997`	`+ }`
`1000`	`998`
`1001`	`999`	`//must only be called after all setters are defined and before binding`
`1002`	`1000`	`private void extractDataFromPropertyData(`
Original file line number	Diff line number	Diff line change
`@@ -95,9 +95,9 @@ public void registerTable(Identifier logicalName, Table table) {`
`95`	`95`	`final Table previous = tables.put( logicalName, table );`
`96`	`96`	`if ( previous != null ) {`
`97`	`97`	`BOOT_LOGGER.replacingTableRegistration(`
`98`		`- String.valueOf(logicalName),`
`99`		`- String.valueOf(previous),`
`100`		`- String.valueOf(table)`
	`98`	`+ String.valueOf( logicalName ),`
	`99`	`+ String.valueOf( previous ),`
	`100`	`+ String.valueOf( table )`
`101`	`101`	`);`
`102`	`102`	`}`
`103`	`103`	`}`