move more logging to SessionLogging

Author: gavinking

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

@@ -120,6 +120,7 @@
 
 import static java.lang.Boolean.TRUE;
 import static org.hibernate.boot.model.naming.Identifier.toIdentifier;
+import static org.hibernate.internal.SessionLogging.SESSION_LOGGER;
 import static org.hibernate.internal.util.StringHelper.isEmpty;
 import static org.hibernate.query.sqm.internal.SqmUtil.verifyIsSelectStatement;
 
@@ -139,7 +140,6 @@
  * @author Steve Ebersole
  */
 public abstract class AbstractSharedSessionContract implements SharedSessionContractImplementor {
-	private static final CoreMessageLogger LOG = CoreLogging.messageLogger( SessionImpl.class );
 
 	private transient SessionFactoryImpl factory;
 	private transient SessionFactoryOptions factoryOptions;
@@ -282,13 +282,12 @@ protected final void setUpMultitenancy(SessionFactoryImplementor factory, LoadQu
 	}
 
 	private void logInconsistentOptions(SharedSessionCreationOptions sharedOptions) {
+		// TODO: these should probable be exceptions!
 		if ( sharedOptions.shouldAutoJoinTransactions() ) {
-			LOG.debug( "Session creation specified 'autoJoinTransactions', which is invalid in conjunction " +
-							"with sharing JDBC connection between sessions; ignoring" );
+			SESSION_LOGGER.invalidAutoJoinTransactionsWithSharedConnection();
 		}
 		if ( sharedOptions.getPhysicalConnectionHandlingMode() != connectionHandlingMode ) {
-			LOG.debug( "Session creation specified 'PhysicalConnectionHandlingMode' which is invalid in conjunction " +
-							"with sharing JDBC connection between sessions; ignoring" );
+			SESSION_LOGGER.invalidPhysicalConnectionHandlingModeWithSharedConnection();
 		}
 	}
 
@@ -357,15 +356,17 @@ void afterTransactionBeginEvents() {
 	}
 
 	void beforeTransactionCompletionEvents() {
+		SESSION_LOGGER.beforeTransactionCompletion();
 		try {
 			getInterceptor().beforeTransactionCompletion( getTransactionIfAccessible() );
 		}
 		catch (Throwable t) {
-			LOG.exceptionInBeforeTransactionCompletionInterceptor( t );
+			SESSION_LOGGER.exceptionInBeforeTransactionCompletionInterceptor( t );
 		}
 	}
 
 	void afterTransactionCompletionEvents(boolean successful) {
+		SESSION_LOGGER.afterTransactionCompletion( successful, false );
 		getEventListenerManager().transactionCompletion(successful);
 
 		final var statistics = getFactory().getStatistics();
@@ -377,7 +378,7 @@ void afterTransactionCompletionEvents(boolean successful) {
 			getInterceptor().afterTransactionCompletion( getTransactionIfAccessible() );
 		}
 		catch (Throwable t) {
-			LOG.exceptionInAfterTransactionCompletionInterceptor( t );
+			SESSION_LOGGER.exceptionInAfterTransactionCompletionInterceptor( t );
 		}
 	}
 
@@ -1686,9 +1687,7 @@ public SessionAssociationMarkers getSessionAssociationMarkers() {
 
 	@Serial
 	private void writeObject(ObjectOutputStream oos) throws IOException {
-		if ( LOG.isTraceEnabled() ) {
-			LOG.trace( "Serializing " + getClass().getSimpleName() + " [" );
-		}
+		SESSION_LOGGER.serializingSession( getSessionIdentifier() );
 
 
 		if ( !jdbcCoordinator.isReadyForSerialization() ) {
@@ -1721,13 +1720,10 @@ private void writeObject(ObjectOutputStream oos) throws IOException {
 
 	@Serial
 	private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException, SQLException {
-		if ( LOG.isTraceEnabled() ) {
-			LOG.trace( "Deserializing " + getClass().getSimpleName() );
-		}
-
 		// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		// Step 1 :: read back non-transient state...
 		ois.defaultReadObject();
+		SESSION_LOGGER.deserializingSession( getSessionIdentifier() );
 
 		// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		// Step 2 :: read back transient state...

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

@@ -95,14 +95,6 @@ public interface CoreMessageLogger extends BasicLogger {
 			id = 84)
 	void entityMappedAsNonAbstract(String name);
 
-	@LogMessage(level = ERROR)
-	@Message(value = "Exception in interceptor afterTransactionCompletion()", id = 87)
-	void exceptionInAfterTransactionCompletionInterceptor(@Cause Throwable e);
-
-	@LogMessage(level = ERROR)
-	@Message(value = "Exception in interceptor beforeTransactionCompletion()", id = 88)
-	void exceptionInBeforeTransactionCompletionInterceptor(@Cause Throwable e);
-
 	@LogMessage(level = INFO)
 	@Message(value = "Sub-resolver threw unexpected exception, continuing to next: %s", id = 89)
 	void exceptionInSubResolver(String message);

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

@@ -211,7 +211,7 @@ public SessionFactoryImpl(
 			final MetadataImplementor bootMetamodel,
 			final SessionFactoryOptions options,
 			final BootstrapContext bootstrapContext) {
-SESSION_FACTORY_LOGGER.buildingSessionFactory();
+		SESSION_FACTORY_LOGGER.buildingSessionFactory();
 		typeConfiguration = bootstrapContext.getTypeConfiguration();
 
 		sessionFactoryOptions = options;

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

@@ -358,7 +358,7 @@ public void close() {
 			if ( getSessionFactoryOptions().getJpaCompliance().isJpaClosedComplianceEnabled() ) {
 				throw new IllegalStateException( "EntityManager was already closed" );
 			}
-		SESSION_LOGGER.alreadyClosed();
+			SESSION_LOGGER.alreadyClosed();
 		}
 		else {
 			closeWithoutOpenChecks();
@@ -483,7 +483,7 @@ else if ( isClosed() ) {
 	}
 
 	private void managedClose() {
-			SESSION_LOGGER.automaticallyClosingSession();
+		SESSION_LOGGER.automaticallyClosingSession();
 		closeWithoutOpenChecks();
 	}
 
@@ -841,20 +841,15 @@ public void delete(String entityName, Object object, boolean isCascadeDeleteEnab
 	public void removeOrphanBeforeUpdates(String entityName, Object child) {
 		// TODO: The removeOrphan concept is a temporary "hack" for HHH-6484.
 		//       This should be removed once action/task ordering is improved.
-		final boolean traceEnabled = SESSION_LOGGER.isTraceEnabled();
-		if ( traceEnabled ) {
-			logRemoveOrphanBeforeUpdates( "begin", entityName, child );
-		}
+		logRemoveOrphanBeforeUpdates( "begin", entityName, child );
 		persistenceContext.beginRemoveOrphanBeforeUpdates();
 		try {
 			checkOpenOrWaitingForAutoClose();
 			fireDelete( new DeleteEvent( entityName, child, false, true, this ) );
 		}
 		finally {
 			persistenceContext.endRemoveOrphanBeforeUpdates();
-			if ( traceEnabled ) {
-				logRemoveOrphanBeforeUpdates( "end", entityName, child );
-			}
+			logRemoveOrphanBeforeUpdates( "end", entityName, child );
 		}
 	}
 

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

@@ -38,6 +38,16 @@ public interface SessionLogging extends BasicLogger {
 
 	SessionLogging SESSION_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), SessionLogging.class, NAME );
 
+	@LogMessage(level = DEBUG)
+	@Message("Session creation specified 'autoJoinTransactions', "
+			+ "which is invalid in conjunction with sharing JDBC connection between sessions; ignoring")
+	void invalidAutoJoinTransactionsWithSharedConnection();
+
+	@LogMessage(level = DEBUG)
+	@Message("Session creation specified a 'PhysicalConnectionHandlingMode', "
+			+ "which is invalid in conjunction with sharing JDBC connection between sessions; ignoring")
+	void invalidPhysicalConnectionHandlingModeWithSharedConnection();
+
 	@LogMessage(level = TRACE)
 	@Message("Opened Session [%s] at timestamp: %s")
 	void openedSession(UUID sessionIdentifier, long timestamp);
@@ -118,6 +128,14 @@ public interface SessionLogging extends BasicLogger {
 	@Message("Deserializing Session [%s]")
 	void deserializingSession(UUID sessionIdentifier);
 
+	@LogMessage(level = ERROR)
+	@Message(id = 90006106, value = "Exception in interceptor beforeTransactionCompletion()")
+	void exceptionInBeforeTransactionCompletionInterceptor(@Cause Throwable e);
+
+	@LogMessage(level = ERROR)
+	@Message(id = 90006107, value = "Exception in interceptor afterTransactionCompletion()")
+	void exceptionInAfterTransactionCompletionInterceptor(@Cause Throwable e);
+
 	// StatelessSession-specific
 
 	@LogMessage(level = TRACE)