HHH-18815 WTF is going on here??

Signed-off-by: Gavin King <[email protected]>

Author: gavinking

hibernate-core/src/main/java/org/hibernate/tuple/entity/EntityMetamodel.java

@@ -310,9 +310,11 @@ public EntityMetamodel(
 			// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 			// generated value strategies ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 			final Generator generator = buildGenerator( name, property, creationContext );
 			if ( generator != null ) {
-				if ( i == tempVersionProperty && !generator.generatedOnExecution() ) {
+				final boolean generatedOnExecution = generator.generatedOnExecution();
+				if ( i == tempVersionProperty && !generatedOnExecution ) {
 					// when we have an in-memory generator for the version, we
 					// want to plug it in to the older infrastructure specific
 					// to version generation, instead of treating it like a
@@ -321,36 +323,50 @@ public EntityMetamodel(
 				}
 				else {
 					generators[i] = generator;
-					if ( !generator.allowMutation() ) {
-						propertyInsertability[i] = false;
-						propertyUpdateability[i] = false;
+					final boolean allowMutation = generator.allowMutation();
+					if ( !allowMutation ) {
 						propertyCheckability[i] = false;
 					}
-					final boolean noParameter = generatedWithNoParameter( generator );
 					if ( generator.generatesOnInsert() ) {
-						propertyInsertability[i] = !noParameter;
-						if ( generator.generatedOnExecution() ) {
-							foundPostInsertGeneratedValues = true;
-							if ( generator instanceof BeforeExecutionGenerator ) {
-								foundPreInsertGeneratedValues = true;
+						if ( generatedOnExecution ) {
+							final OnExecutionGenerator onExecutionGenerator = (OnExecutionGenerator) generator;
+							final boolean writePropertyValue = onExecutionGenerator.writePropertyValue();
+							propertyInsertability[i] = writePropertyValue;
+							// TODO: move this validation somewhere else!
+							if ( !writePropertyValue && generator instanceof BeforeExecutionGenerator ) {
+								throw new HibernateException( "BeforeExecutionGenerator returned false from OnExecutionGenerator.writePropertyValue()" );
 							}
 						}
-						else {
+						if ( generator instanceof OnExecutionGenerator ) {
+							foundPostInsertGeneratedValues = true;
+						}
+						if ( generator instanceof BeforeExecutionGenerator ) {
 							foundPreInsertGeneratedValues = true;
 						}
 					}
+					else if ( !allowMutation ) {
+						propertyInsertability[i] = false;
+					}
 					if ( generator.generatesOnUpdate() ) {
-						propertyUpdateability[i] = !noParameter;
-						if ( generator.generatedOnExecution() ) {
-							foundPostUpdateGeneratedValues = true;
-							if ( generator instanceof BeforeExecutionGenerator ) {
-								foundPreUpdateGeneratedValues = true;
+						if ( generatedOnExecution ) {
+							final OnExecutionGenerator onExecutionGenerator = (OnExecutionGenerator) generator;
+							final boolean writePropertyValue = onExecutionGenerator.writePropertyValue();
+							propertyUpdateability[i] = writePropertyValue;
+							// TODO: move this validation somewhere else!
+							if ( !writePropertyValue && generator instanceof BeforeExecutionGenerator ) {
+								throw new HibernateException( "BeforeExecutionGenerator returned false from OnExecutionGenerator.writePropertyValue()" );
 							}
 						}
-						else {
+						if ( generator instanceof OnExecutionGenerator ) {
+							foundPostUpdateGeneratedValues = true;
+						}
+						if ( generator instanceof BeforeExecutionGenerator ) {
 							foundPreUpdateGeneratedValues = true;
 						}
 					}
+					else if ( !allowMutation ) {
+						propertyUpdateability[i] = false;
+					}
 				}
 			}
 
@@ -515,11 +531,6 @@ private String propertyName(Property property) {
 		return getName() + "." + property.getName();
 	}
 
-	private static boolean generatedWithNoParameter(Generator generator) {
-		return generator.generatedOnExecution()
-			&& !((OnExecutionGenerator) generator).writePropertyValue();
-	}
-
 	private static Generator buildGenerator(
 			final String entityName,
 			final Property mappingProperty,