Minor cleanup in EnhancementHelper#performWork flow control

Author: Sanne

hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/EnhancementHelper.java

@@ -150,8 +150,8 @@ public static <T> T performWork(
 			String attributeName) {
 		SharedSessionContractImplementor session = interceptor.getLinkedSession();
 
-		boolean isTempSession = false;
-		boolean isJta = false;
+		final boolean isTempSession;
+		final boolean isJta;
 
 		// first figure out which Session to use
 		if ( session == null ) {
@@ -160,7 +160,7 @@ public static <T> T performWork(
 				isTempSession = true;
 			}
 			else {
-				throwLazyInitializationException( Cause.NO_SESSION, entityName, attributeName );
+				throw createLazyInitializationException( Cause.NO_SESSION, entityName, attributeName );
 			}
 		}
 		else if ( !session.isOpen() ) {
@@ -169,7 +169,7 @@ else if ( !session.isOpen() ) {
 				isTempSession = true;
 			}
 			else {
-				throwLazyInitializationException( Cause.CLOSED_SESSION, entityName, attributeName );
+				throw createLazyInitializationException( Cause.CLOSED_SESSION, entityName, attributeName );
 			}
 		}
 		else if ( !session.isConnected() ) {
@@ -178,9 +178,12 @@ else if ( !session.isConnected() ) {
 				isTempSession = true;
 			}
 			else {
-				throwLazyInitializationException( Cause.DISCONNECTED_SESSION, entityName, attributeName);
+				throw createLazyInitializationException( Cause.DISCONNECTED_SESSION, entityName, attributeName);
 			}
 		}
+		else {
+			isTempSession = false;
+		}
 
 		// If we are using a temporary Session, begin a transaction if necessary
 		if ( isTempSession ) {
@@ -198,6 +201,9 @@ else if ( !session.isConnected() ) {
 				session.beginTransaction();
 			}
 		}
+		else {
+			isJta = false;
+		}
 
 		try {
 			// do the actual work
@@ -238,29 +244,13 @@ enum Cause {
 		NO_SF_UUID
 	}
 
-	private static void throwLazyInitializationException(Cause cause, String entityName, String attributeName) {
-		final String reason;
-		switch ( cause ) {
-			case NO_SESSION: {
-				reason = "no session and settings disallow loading outside the Session";
-				break;
-			}
-			case CLOSED_SESSION: {
-				reason = "session is closed and settings disallow loading outside the Session";
-				break;
-			}
-			case DISCONNECTED_SESSION: {
-				reason = "session is disconnected and settings disallow loading outside the Session";
-				break;
-			}
-			case NO_SF_UUID: {
-				reason = "could not determine SessionFactory UUId to create temporary Session for loading";
-				break;
-			}
-			default: {
-				reason = "<should never get here>";
-			}
-		}
+	private static LazyInitializationException createLazyInitializationException(final Cause cause, final String entityName, final String attributeName) {
+		final String reason = switch ( cause ) {
+			case NO_SESSION -> "no session and settings disallow loading outside the Session";
+			case CLOSED_SESSION -> "session is closed and settings disallow loading outside the Session";
+			case DISCONNECTED_SESSION -> "session is disconnected and settings disallow loading outside the Session";
+			case NO_SF_UUID -> "could not determine SessionFactory UUId to create temporary Session for loading";
+		};
 
 		final String message = String.format(
 				Locale.ROOT,
@@ -270,15 +260,15 @@ private static void throwLazyInitializationException(Cause cause, String entityN
 				reason
 		);
 
-		throw new LazyInitializationException( message );
+		return new LazyInitializationException( message );
 	}
 
 	private static SharedSessionContractImplementor openTemporarySessionForLoading(
 			BytecodeLazyAttributeInterceptor interceptor,
 			String entityName,
 			String attributeName) {
 		if ( interceptor.getSessionFactoryUuid() == null ) {
-			throwLazyInitializationException( Cause.NO_SF_UUID, entityName, attributeName );
+			throw createLazyInitializationException( Cause.NO_SF_UUID, entityName, attributeName );
 		}
 
 		final SessionFactoryImplementor sf = SessionFactoryRegistry.INSTANCE.getSessionFactory( interceptor.getSessionFactoryUuid() );