small fixes to new session/factory logging

Author: gavinking

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

@@ -1138,7 +1138,7 @@ private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundE
 	 */
 	@Serial
 	private Object readResolve() throws InvalidObjectException {
-		SESSION_FACTORY_LOGGER.trace( "Resolving serialized factory" );
+		SESSION_FACTORY_LOGGER.resolvingSerializedFactory();
 		return locateSessionFactoryOnDeserialization( uuid, name );
 	}
 

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

@@ -27,10 +27,10 @@
  */
 @SubSystemLogging(
 		name = SessionFactoryLogging.NAME,
-		description = "Logging related to SessionFactory lifecycle, serialization, and registry/JNDI operations"
+		description = "Logging related to SessionFactory lifecycle and serialization"
 )
 @MessageLogger(projectCode = "HHH")
-@ValidIdRange(min = 90006001, max = 90006100)
+@ValidIdRange(min = 90020001, max = 90030000)
 @Internal
 public interface SessionFactoryLogging extends BasicLogger {
 	String NAME = SubSystemLogging.BASE + ".factory";
@@ -44,7 +44,7 @@ public interface SessionFactoryLogging extends BasicLogger {
 	void buildingSessionFactory();
 
 	@LogMessage(level = DEBUG)
-	@Message(value = "Instantiating factory [%s] with settings: %s", id = 90006001)
+	@Message(value = "Instantiating factory [%s] with settings: %s", id = 90020001)
 	void instantiatingFactory(String uuid, Map<String, Object> settings);
 
 	@LogMessage(level = TRACE)
@@ -64,15 +64,15 @@ public interface SessionFactoryLogging extends BasicLogger {
 	void alreadyClosed();
 
 	@LogMessage(level = DEBUG)
-	@Message(value = "Closing factory [%s]", id = 90006005)
+	@Message(value = "Closing factory [%s]", id = 90020005)
 	void closingFactory(String uuid);
 
 	@LogMessage(level = DEBUG)
-	@Message(value = "Serializing factory [%s]", id = 90006010)
+	@Message(value = "Serializing factory [%s]", id = 90020010)
 	void serializingFactory(String uuid);
 
 	@LogMessage(level = DEBUG)
-	@Message(value = "Deserialized factory [%s]", id = 90006011)
+	@Message(value = "Deserialized factory [%s]", id = 90020011)
 	void deserializedFactory(String uuid);
 
 	@LogMessage(level = TRACE)
@@ -88,19 +88,19 @@ public interface SessionFactoryLogging extends BasicLogger {
 	void resolvingSerializedFactory();
 
 	@LogMessage(level = TRACE)
-	@Message("Resolved factory by UUID: %s")
+	@Message("Resolved factory by UUID: [%s]")
 	void resolvedFactoryByUuid(String uuid);
 
 	@LogMessage(level = TRACE)
-	@Message("Resolved factory by name: %s")
+	@Message("Resolved factory by name: '%s'")
 	void resolvedFactoryByName(String name);
 
 	@LogMessage(level = TRACE)
 	@Message("Resolving factory from deserialized session")
 	void resolvingFactoryFromDeserializedSession();
 
 	@LogMessage(level = WARN)
-	@Message(value = "Unable to construct current session context [%s]", id = 90006030)
+	@Message(value = "Unable to construct current session context [%s]", id = 90020030)
 	void unableToConstructCurrentSessionContext(String sessionContextType, @Cause Throwable throwable);
 
 }

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

@@ -31,7 +31,7 @@
 		description = "Logging related to session lifecycle and operations"
 )
 @MessageLogger(projectCode = "HHH")
-@ValidIdRange(min = 90006101, max = 90006500)
+@ValidIdRange(min = 90010001, max = 90020000)
 @Internal
 public interface SessionLogging extends BasicLogger {
 	String NAME = SubSystemLogging.BASE + ".session";
@@ -61,7 +61,7 @@ public interface SessionLogging extends BasicLogger {
 	void closingSession(UUID sessionIdentifier);
 
 	@LogMessage(level = WARN)
-	@Message(id = 90006101, value = "Closing shared session with unprocessed transaction completion actions")
+	@Message(id = 90010101, value = "Closing shared session with unprocessed transaction completion actions")
 	void closingSharedSessionWithUnprocessedTxCompletions();
 
 	@LogMessage(level = TRACE)
@@ -105,19 +105,19 @@ public interface SessionLogging extends BasicLogger {
 	void afterTransactionCompletion(boolean successful, boolean delayed);
 
 	@LogMessage(level = ERROR)
-	@Message(id = 90006102, value = "JDBC exception executing SQL; transaction rolled back")
+	@Message(id = 90010102, value = "JDBC exception executing SQL; transaction rolled back")
 	void jdbcExceptionThrownWithTransactionRolledBack(@Cause Exception e);
 
 	@LogMessage(level = DEBUG)
-	@Message(id = 90006103, value = "Ignoring EntityNotFoundException for '%s.%s'")
+	@Message(id = 90010103, value = "Ignoring EntityNotFoundException for '%s.%s'")
 	void ignoringEntityNotFound(String entityName, Object id);
 
 	@LogMessage(level = WARN)
-	@Message(id = 90006104, value = "Property '%s' is not serializable, value won't be set")
+	@Message(id = 90010104, value = "Property '%s' is not serializable, value won't be set")
 	void nonSerializableProperty(String propertyName);
 
 	@LogMessage(level = WARN)
-	@Message(id = 90006105, value = "Property having key null is illegal, value won't be set")
+	@Message(id = 90010105, value = "Property having key null is illegal, value won't be set")
 	void nullPropertyKey();
 
 	@LogMessage(level = TRACE)
@@ -129,11 +129,11 @@ public interface SessionLogging extends BasicLogger {
 	void deserializingSession(UUID sessionIdentifier);
 
 	@LogMessage(level = ERROR)
-	@Message(id = 90006106, value = "Exception in interceptor beforeTransactionCompletion()")
+	@Message(id = 90010106, value = "Exception in interceptor beforeTransactionCompletion()")
 	void exceptionInBeforeTransactionCompletionInterceptor(@Cause Throwable e);
 
 	@LogMessage(level = ERROR)
-	@Message(id = 90006107, value = "Exception in interceptor afterTransactionCompletion()")
+	@Message(id = 90010107, value = "Exception in interceptor afterTransactionCompletion()")
 	void exceptionInAfterTransactionCompletionInterceptor(@Cause Throwable e);
 
 	// StatelessSession-specific