report a limitation sooner

Author: gavinking

hibernate-core/src/main/java/org/hibernate/mapping/Component.java

@@ -81,7 +81,7 @@ public class Component extends SimpleValue implements MetaAttributable, Sortable
 	private PersistentClass owner;
 	private boolean dynamic;
 	private boolean isKey;
-	private Boolean isGeneric;
+	private transient Boolean isGeneric;
 	private String roleName;
 	private MappedSuperclass mappedSuperclass;
 	private Value discriminator;
@@ -99,7 +99,7 @@ public class Component extends SimpleValue implements MetaAttributable, Sortable
 	private String[] instantiatorPropertyNames;
 
 	// cache the status of the type
-	private volatile CompositeType type;
+	private transient volatile CompositeType type;
 
 	private AggregateColumn aggregateColumn;
 	private AggregateColumn parentAggregateColumn;
@@ -680,11 +680,19 @@ private Generator buildIdentifierGenerator(Dialect dialect, RootClass rootClass)
 				if ( !value.getCustomIdGeneratorCreator().isAssigned() ) {
 					// skip any 'assigned' generators, they would have been
 					// handled by the StandardGenerationContextLocator
-					generator.addGeneratedValuePlan( new ValueGenerationPlan(
-							value.createGenerator( dialect, rootClass, property ),
-							getType().isMutable() ? injector( property, getAttributeDeclarer( rootClass ) ) : null,
-							i
-					) );
+					if ( value.createGenerator( dialect, rootClass, property )
+							instanceof BeforeExecutionGenerator beforeExecutionGenerator ) {
+						generator.addGeneratedValuePlan( new ValueGenerationPlan(
+								beforeExecutionGenerator,
+								getType().isMutable()
+										? injector( property, getAttributeDeclarer( rootClass ) )
+										: null,
+								i
+						) );
+					}
+					else {
+						throw new IdentifierGenerationException( "Identity generation isn't supported for composite ids" );
+					}
 				}
 			}
 		}
@@ -757,12 +765,12 @@ public Object locateGenerationContext(SharedSessionContractImplementor session,
 	}
 
 	public static class ValueGenerationPlan implements CompositeNestedGeneratedValueGenerator.GenerationPlan {
-		private final Generator subgenerator;
+		private final BeforeExecutionGenerator generator;
 		private final Setter injector;
 		private final int propertyIndex;
 
-		public ValueGenerationPlan(Generator subgenerator, Setter injector, int propertyIndex) {
-			this.subgenerator = subgenerator;
+		public ValueGenerationPlan(BeforeExecutionGenerator generator, Setter injector, int propertyIndex) {
+			this.generator = generator;
 			this.injector = injector;
 			this.propertyIndex = propertyIndex;
 		}
@@ -779,9 +787,8 @@ public int getPropertyIndex() {
 
 		@Override
 		public Object execute(SharedSessionContractImplementor session, Object incomingObject) {
-			if ( !subgenerator.generatedOnExecution( incomingObject, session ) ) {
-				return ( (BeforeExecutionGenerator) subgenerator)
-						.generate( session, incomingObject, null, INSERT );
+			if ( !generator.generatedOnExecution( incomingObject, session ) ) {
+				return generator.generate( session, incomingObject, null, INSERT );
 			}
 			else {
 				throw new IdentifierGenerationException( "Identity generation isn't supported for composite ids" );
@@ -790,15 +797,15 @@ public Object execute(SharedSessionContractImplementor session, Object incomingO
 
 		@Override
 		public void registerExportables(Database database) {
-			if ( subgenerator instanceof ExportableProducer ) {
-				( (ExportableProducer) subgenerator).registerExportables( database );
+			if ( generator instanceof ExportableProducer exportableProducer ) {
+				exportableProducer.registerExportables( database );
 			}
 		}
 
 		@Override
 		public void initialize(SqlStringGenerationContext context) {
-			if ( subgenerator instanceof Configurable) {
-				( (Configurable) subgenerator).initialize( context );
+			if ( generator instanceof Configurable configurable ) {
+				configurable.initialize( context );
 			}
 		}
 	}
@@ -951,7 +958,8 @@ public void setStructColumnNames(String[] structColumnNames) {
 
 	public boolean isGeneric() {
 		if ( isGeneric == null ) {
-			isGeneric = getComponentClassName() != null && getComponentClass().getTypeParameters().length != 0;
+			isGeneric = getComponentClassName() != null
+					&& getComponentClass().getTypeParameters().length > 0;
 		}
 		return isGeneric;
 	}