HHH-7695: @NotNull ignored on @embeddable static classes

https://hibernate.onjira.com/browse/HHH-7695

Author: brmeyer

hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/ddl/NotNullSchemaConstraint.java

@@ -24,6 +24,7 @@
 package org.hibernate.cfg.beanvalidation.ddl;
 
 import java.util.Iterator;
+
 import javax.validation.constraints.NotNull;
 import javax.validation.metadata.ConstraintDescriptor;
 import javax.validation.metadata.PropertyDescriptor;
@@ -33,6 +34,7 @@
 import org.hibernate.mapping.Property;
 import org.hibernate.mapping.SingleTableSubclass;
 import org.hibernate.metamodel.spi.binding.AttributeBinding;
+import org.hibernate.metamodel.spi.binding.CompositeAttributeBinding;
 import org.hibernate.metamodel.spi.binding.EntityBinding;
 import org.hibernate.metamodel.spi.binding.InheritanceType;
 
@@ -74,15 +76,34 @@ public boolean applyConstraint(AttributeBinding attributeBinding, ConstraintDesc
 		if(InheritanceType.SINGLE_TABLE.equals( inheritanceType )) {
 			return false;
 		}
-
-		org.hibernate.metamodel.spi.relational.Column column = SchemaModificationHelper.getSingleColumn( attributeBinding );
-		if ( column == null ) {
-			return false;
+		
+		// If a Composite (Embeddable static type, etc.), use the attribute's
+		// nullability on the static type's fields.
+		
+		// TODO: Is this the correct place to do this?  Higher up in
+		// TypeSafeActivator?
+		if ( attributeBinding instanceof CompositeAttributeBinding ) {
+			Iterator<AttributeBinding> iter
+					= ( ( CompositeAttributeBinding ) attributeBinding)
+							.attributeBindings().iterator();
+			while( iter.hasNext() ) {
+				applyNullConstraint( iter.next() );
+			}
+		} else {
+			applyNullConstraint( attributeBinding );
 		}
 
-		// TODO check with components as in the old configuration approach. see above (HF)
-		column.setNullable( false );
+		
 
 		return true;
 	}
+	
+	private void applyNullConstraint(AttributeBinding attributeBinding) {
+		org.hibernate.metamodel.spi.relational.Column column
+				= SchemaModificationHelper.getSingleColumn( attributeBinding );
+		if ( column != null ) {
+			// TODO check with components as in the old configuration approach. see above (HF)
+			column.setNullable( false );
+		}
+	}
 }

hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/DDLTest.java

@@ -79,17 +79,16 @@ public void testSingleTableAvoidNotNull() throws Exception {
 		assertTrue( "Notnull should not be applied on single tables", column.isNullable() );
 	}
 
-	@FailureExpectedWithNewMetamodel
 	@Test
 	public void testNotNullOnlyAppliedIfEmbeddedIsNotNullItself() throws Exception {
-		Column column = SchemaUtil.getColumn( Tv.class, "tuner.frequency", metadata() );
+		Column column = SchemaUtil.getColumn( Tv.class, "frequency", metadata() );
 		assertEquals(
 				"Validator annotations are applied on tuner as it is @NotNull", false, column.isNullable()
 		);
 
-		column = SchemaUtil.getColumn( Tv.class, "recorder.time", metadata() );
+		column = SchemaUtil.getColumn( Tv.class, "time", metadata() );
 		assertEquals(
-				"Validator annotations are applied on tuner as it is @NotNull", true, column.isNullable()
+				"Validator annotations were not applied on recorder", true, column.isNullable()
 		);
 	}