slightly improve error messages from AbstractPersistentCollection

Author: gavinking

hibernate-core/src/main/java/org/hibernate/collection/spi/AbstractPersistentCollection.java

@@ -195,8 +195,8 @@ public int getSize() {
 			final CollectionEntry entry = session.getPersistenceContextInternal().getCollectionEntry( this );
 			if ( entry == null ) {
 				throwLazyInitializationExceptionIfNotConnected();
-				throwLazyInitializationException("collection not associated with session");
-				throw new AssertionFailure("impossible");
+				throwLazyInitializationException( "collection not associated with session" );
+				throw new AssertionFailure( "impossible" );
 			}
 			else {
 				if ( hasQueuedOperations() ) {
@@ -233,23 +233,23 @@ private <T> T withTemporarySessionIfNeeded(LazyInitializationWork<T> lazyInitial
 				tempSession = openTemporarySessionForLoading();
 			}
 			else {
-				throwLazyInitializationException( "could not initialize proxy - no Session" );
+				throwLazyInitializationException( "no session" );
 			}
 		}
 		else if ( !session.isOpenOrWaitingForAutoClose() ) {
 			if ( allowLoadOutsideTransaction ) {
 				tempSession = openTemporarySessionForLoading();
 			}
 			else {
-				throwLazyInitializationException( "could not initialize proxy - the owning Session was closed" );
+				throwLazyInitializationException( "the owning session was closed" );
 			}
 		}
 		else if ( !session.isConnected() ) {
 			if ( allowLoadOutsideTransaction ) {
 				tempSession = openTemporarySessionForLoading();
 			}
 			else {
-				throwLazyInitializationException( "could not initialize proxy - the owning Session is disconnected" );
+				throwLazyInitializationException( "the owning session is disconnected" );
 			}
 		}
 
@@ -273,8 +273,7 @@ else if ( !session.isConnected() ) {
 				}
 
 				final CollectionPersister collectionDescriptor =
-						session.getSessionFactory()
-								.getMappingMetamodel()
+						session.getSessionFactory().getMappingMetamodel()
 								.getCollectionDescriptor( getRole() );
 				session.getPersistenceContextInternal()
 						.addUninitializedDetachedCollection( collectionDescriptor, this );
@@ -301,20 +300,22 @@ else if ( !session.isConnected() ) {
 			else {
 				// Whenever the collection lazy loading is triggered during the loading process,
 				// closing the connection will cause an error when RowProcessingStateStandardImpl#next() will be called.
-				final PersistenceContext persistenceContext = session.getPersistenceContext();
-				if ( !session.isTransactionInProgress()
-						&& ( !persistenceContext.hasLoadContext()
-							|| persistenceContext.hasLoadContext()
-								&& persistenceContext.getLoadContexts().isLoadingFinished() ) ) {
+				if ( !session.isTransactionInProgress() && !unfinishedLoading() ) {
 					session.getJdbcCoordinator().afterTransaction();
 				}
 			}
 		}
 	}
 
+	private boolean unfinishedLoading() {
+		final PersistenceContext persistenceContext = session.getPersistenceContext();
+		return persistenceContext.hasLoadContext()
+			&& !persistenceContext.getLoadContexts().isLoadingFinished();
+	}
+
 	private SharedSessionContractImplementor openTemporarySessionForLoading() {
 		if ( sessionFactoryUuid == null ) {
-			throwLazyInitializationException( "SessionFactory UUID not known to create temporary Session for loading" );
+			throwLazyInitializationException( "SessionFactory UUID not known; cannot create temporary session for loading" );
 		}
 
 		final SessionImplementor session =
@@ -373,8 +374,8 @@ public boolean elementExists(Object element) {
 		final CollectionEntry entry = session.getPersistenceContextInternal().getCollectionEntry( this );
 		if ( entry == null ) {
 			throwLazyInitializationExceptionIfNotConnected();
-			throwLazyInitializationException("collection not associated with session");
-			throw new AssertionFailure("impossible");
+			throwLazyInitializationException( "collection not associated with session" );
+			throw new AssertionFailure( "impossible" );
 		}
 		else {
 			if ( hasQueuedOperations() ) {
@@ -427,8 +428,8 @@ public Object elementByIndex(Object index) {
 		final CollectionEntry entry = session.getPersistenceContextInternal().getCollectionEntry( this );
 		if ( entry == null ) {
 			throwLazyInitializationExceptionIfNotConnected();
-			throwLazyInitializationException("collection not associated with session");
-			throw new AssertionFailure("impossible");
+			throwLazyInitializationException( "collection not associated with session" );
+			throw new AssertionFailure( "impossible" );
 		}
 		else {
 			if ( hasQueuedOperations() ) {
@@ -646,9 +647,8 @@ private void throwLazyInitializationExceptionIfNotConnected() {
 
 	private void throwLazyInitializationException(String message) {
 		throw new LazyInitializationException(
-				"failed to lazily initialize a collection" +
-						(role == null ? "" : " of role: " + role) +
-						": " + message
+				String.format( "Cannot lazily initialize collection%s (%s)",
+						role == null ? "" : " of role '" + role + "'", message )
 		);
 	}
 
@@ -1305,11 +1305,7 @@ protected static <E> Collection<E> getOrphans(
 					currentSaving.add( current );
 				}
 				else {
-					final Object currentId = getEntityIdentifierIfNotUnsaved(
-							entityName,
-							current,
-							session
-					);
+					final Object currentId = getEntityIdentifierIfNotUnsaved( entityName, current, session );
 					currentIds.add( useIdDirect ? currentId : new TypedValue( idType, currentId ) );
 				}
 			}