HHH-8276 - Integrate LoadPlans into UniqueEntityLoader (PoC)

Author: stliu

hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java

@@ -1831,12 +1831,12 @@ public int getSize(Serializable key, SessionImplementor session) {
 			}
 		}
 		catch ( SQLException sqle ) {
-			throw getFactory().getSQLExceptionHelper().convert(
+			throw getSQLExceptionHelper().convert(
 					sqle,
 					"could not retrieve collection size: " +
 							MessageHelper.collectionInfoString( this, key, getFactory() ),
 					sqlSelectSizeString
-					);
+			);
 		}
 	}
 
@@ -1873,12 +1873,12 @@ private boolean exists(Serializable key, Object indexOrElement, Type indexOrElem
 			}
 		}
 		catch ( SQLException sqle ) {
-			throw getFactory().getSQLExceptionHelper().convert(
+			throw getSQLExceptionHelper().convert(
 					sqle,
 					"could not check row existence: " +
 							MessageHelper.collectionInfoString( this, key, getFactory() ),
 					sqlSelectSizeString
-					);
+			);
 		}
 	}
 
@@ -1909,12 +1909,12 @@ public Object getElementByIndex(Serializable key, Object index, SessionImplement
 			}
 		}
 		catch ( SQLException sqle ) {
-			throw getFactory().getSQLExceptionHelper().convert(
+			throw getSQLExceptionHelper().convert(
 					sqle,
 					"could not read row: " +
 							MessageHelper.collectionInfoString( this, key, getFactory() ),
 					sqlSelectSizeString
-					);
+			);
 		}
 	}
 
@@ -2002,8 +2002,38 @@ public CompositionDefinition toCompositeDefinition() {
 				if ( ! getType().isComponentType() ) {
 					throw new IllegalStateException( "Cannot treat entity collection index type as composite" );
 				}
-				// todo : implement
-				throw new NotYetImplementedException();
+				return new CompositeCollectionElementDefinition() {
+					@Override
+					public String getName() {
+						return "index";
+					}
+
+					@Override
+					public CompositeType getType() {
+						return (CompositeType) getIndexType();
+					}
+
+					@Override
+					public boolean isNullable() {
+						return false;
+					}
+
+					@Override
+					public AttributeSource getSource() {
+						// TODO: what if this is a collection w/in an encapsulated composition attribute?
+						// should return the encapsulated composition attribute instead???
+						return getOwnerEntityPersister();
+					}
+
+					@Override
+					public Iterable<AttributeDefinition> getAttributes() {
+						return CompositionSingularSubAttributesHelper.getCompositeCollectionIndexSubAttributes( this );
+					}
+					@Override
+					public CollectionDefinition getCollectionDefinition() {
+						return AbstractCollectionPersister.this;
+					}
+				};
 			}
 		};
 	}

hibernate-core/src/main/java/org/hibernate/persister/walking/internal/CompositionSingularSubAttributesHelper.java

@@ -100,6 +100,18 @@ public static Iterable<AttributeDefinition> getCompositeCollectionElementSubAttr
 		);
 	}
 
+	public static Iterable<AttributeDefinition> getCompositeCollectionIndexSubAttributes(CompositeCollectionElementDefinition compositionElementDefinition){
+		final QueryableCollection collectionPersister =
+				(QueryableCollection) compositionElementDefinition.getCollectionDefinition().getCollectionPersister();
+		return getSingularSubAttributes(
+				compositionElementDefinition.getSource(),
+				(OuterJoinLoadable) collectionPersister.getOwnerEntityPersister(),
+				(CompositeType) collectionPersister.getIndexType(),
+				collectionPersister.getTableName(),
+				collectionPersister.getIndexColumnNames()
+		);
+	}
+
 	private static Iterable<AttributeDefinition> getSingularSubAttributes(
 			final AttributeSource source,
 			final OuterJoinLoadable ownerEntityPersister,

hibernate-core/src/main/java/org/hibernate/tuple/component/AbstractCompositionAttribute.java

@@ -156,9 +156,7 @@ else if ( aType.getForeignKeyDirection() == ForeignKeyDirection.FOREIGN_KEY_FROM
 							}
 
 							final CompositeType cType = getType();
-							final boolean nullable = cType.getPropertyNullability() == null
-									? true
-									: cType.getPropertyNullability()[ subAttributeNumber ];
+							final boolean nullable = cType.getPropertyNullability() == null || cType.getPropertyNullability()[subAttributeNumber];
 
 							return new CompositeBasedAssociationAttribute(
 									AbstractCompositionAttribute.this,
@@ -203,9 +201,7 @@ else if ( type.isComponentType() ) {
 						}
 						else {
 							final CompositeType cType = getType();
-							final boolean nullable = cType.getPropertyNullability() == null
-									? true
-									: cType.getPropertyNullability()[ subAttributeNumber ];
+							final boolean nullable = cType.getPropertyNullability() == null || cType.getPropertyNullability()[subAttributeNumber];
 
 							return new CompositeBasedBasicAttribute(
 									AbstractCompositionAttribute.this,

hibernate-core/src/main/java/org/hibernate/tuple/component/CompositionBasedCompositionAttribute.java

@@ -32,8 +32,7 @@
  * @author Steve Ebersole
  */
 public class CompositionBasedCompositionAttribute
-		extends AbstractCompositionAttribute
-		implements CompositionDefinition {
+		extends AbstractCompositionAttribute {
 	public CompositionBasedCompositionAttribute(
 			CompositionDefinition source,
 			SessionFactoryImplementor sessionFactory,