more tyepsafe logging

Author: gavinking

hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java

@@ -19,6 +19,8 @@
 import org.hibernate.engine.spi.CollectionEntry;
 import org.hibernate.internal.log.SubSystemLogging;
 
+import org.hibernate.tool.schema.spi.CommandAcceptanceException;
+import org.hibernate.tool.schema.spi.GenerationTarget;
 import org.jboss.logging.BasicLogger;
 import org.jboss.logging.Logger;
 import org.jboss.logging.annotations.Cause;
@@ -311,6 +313,10 @@ void missingArguments(
 	@Message(value = "Unsuccessful: %s", id = 478)
 	void unsuccessfulSchemaManagementCommand(String command);
 
+	@LogMessage(level = DEBUG)
+	@Message( value = "Error performing delayed DROP command [%s]", id = 479 )
+	void unsuccessfulDelayedDropCommand(CommandAcceptanceException e);
+
 	@LogMessage(level = WARN)
 	@Message(
 			value = """
@@ -504,22 +510,34 @@ void unableToLocateStaticMetamodelField(
 	void collectionFoundUninitialized(String is, String was);
 
 	@LogMessage(level = TRACE)
-	@Message( id = 6049, value = "Starting serialization of [%s] EntityEntry entries" )
+	@Message( id = 6049, value = "Created collection wrapper for: %s" )
+	void createdCollectionWrapper(String s);
+
+	@LogMessage(level = TRACE)
+	@Message( id = 6051, value = "Starting serialization of [%s] EntityEntry entries" )
 	void startingEntityEntrySerialization(int count);
 
 	@LogMessage(level = TRACE)
-	@Message( id = 6050, value = "Starting deserialization of [%s] EntityEntry entries" )
+	@Message( id = 6052, value = "Starting deserialization of [%s] EntityEntry entries" )
 	void startingEntityEntryDeserialization(int count);
 
 	@LogMessage(level = ERROR)
-	@Message( id = 6051, value = "Enable to deserialize [%s]" )
+	@Message( id = 6053, value = "Unable to deserialize [%s]" )
 	void unableToDeserialize(String entityEntryClassName);
 
 	@LogMessage(level = TRACE)
 	@Message( id = 6061, value = "Extracted generated values for entity %s - %s" )
-	void extractedGeneratedValues(String s, String string);
+	void extractedGeneratedValues(String info, String results);
 
 	@LogMessage(level = WARN)
 	@Message( id = 6062, value = "Could not resolve type name [%s] as Java type" )
 	void couldNotResolveTypeName(String typeName, @Cause ClassLoadingException exception);
+
+	@LogMessage(level = DEBUG)
+	@Message( id = 6063, value = "Problem releasing GenerationTarget [%s]" )
+	void problemReleasingGenerationTarget(GenerationTarget target, @Cause Exception e);
+
+	@LogMessage(level = WARN)
+	@Message( id = 6064, value = "Unable to close temp session" )
+	void unableToCLoseTempSession();
 }

hibernate-core/src/main/java/org/hibernate/proxy/AbstractLazyInitializer.java

@@ -236,13 +236,13 @@ protected void permissiveInitialization() {
 						session.close();
 					}
 					catch (Exception e) {
-						CORE_LOGGER.warn( "Unable to close temporary session used to load lazy proxy associated to no session" );
+						CORE_LOGGER.unableToCLoseTempSession();
 					}
 				}
 			}
 			catch (Exception e) {
-				CORE_LOGGER.error( "Initialization failure [" + entityName + "#" + id + "]", e );
-				throw new LazyInitializationException( e.getMessage() );
+				throw new LazyInitializationException( "Could not initialize proxy ["
+						+ entityName + "#" + id + "]: " + e.getMessage() );
 			}
 		}
 		else if ( session.isOpenOrWaitingForAutoClose() && session.isConnected() ) {

hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaCreatorImpl.java

@@ -133,7 +133,7 @@ public void doCreation(
 					target.release();
 				}
 				catch (Exception e) {
-					CORE_LOGGER.debugf( "Problem releasing GenerationTarget [%s]: %s", target, e.getMessage() );
+					CORE_LOGGER.problemReleasingGenerationTarget( target, e );
 				}
 			}
 		}

hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaDropperImpl.java

@@ -629,7 +629,7 @@ public void perform(ServiceRegistry serviceRegistry) {
 						// implicitly we do not "halt on error", but we do want to
 						// report the problem
 						CORE_LOGGER.unsuccessfulSchemaManagementCommand( command );
-						CORE_LOGGER.debugf( e, "Error performing delayed DROP command [%s]", command );
+						CORE_LOGGER.unsuccessfulDelayedDropCommand( e );
 					}
 				}
 			}

hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaPopulatorImpl.java

@@ -71,7 +71,7 @@ public void doPopulation(Dialect dialect, ExecutionOptions options, GenerationTa
 					target.release();
 				}
 				catch (Exception e) {
-					CORE_LOGGER.debugf( "Problem releasing GenerationTarget [%s] : %s", target, e.getMessage() );
+					CORE_LOGGER.problemReleasingGenerationTarget( target, e );
 				}
 			}
 		}

hibernate-core/src/main/java/org/hibernate/type/CollectionType.java

@@ -822,8 +822,8 @@ else if ( overridingEager != null ? overridingEager : !persister.isLazy() ) {
 			persistenceContext.addCollectionHolder( collection );
 		}
 		if ( CORE_LOGGER.isTraceEnabled() ) {
-			CORE_LOGGER.trace( "Created collection wrapper: "
-							+ collectionInfoString( persister, collection, key, session ) );
+			CORE_LOGGER.createdCollectionWrapper(
+					collectionInfoString( persister, collection, key, session ) );
 		}
 		return collection;
 	}