HHH-6132 @FetchProfiles should throw MappingException when invalid

entity or association used

Author: brmeyer

hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/annotations/global/FetchProfileProcessor.java

@@ -34,9 +34,10 @@
 import org.hibernate.metamodel.source.internal.annotations.AnnotationBindingContext;
 import org.hibernate.metamodel.source.internal.annotations.util.HibernateDotNames;
 import org.hibernate.metamodel.source.internal.annotations.util.JandexHelper;
+import org.hibernate.metamodel.spi.binding.EntityBinding;
 import org.hibernate.metamodel.spi.binding.FetchProfile;
 import org.hibernate.metamodel.spi.binding.FetchProfile.Fetch;
-
+import org.hibernate.metamodel.spi.domain.Attribute;
 import org.jboss.jandex.AnnotationInstance;
 
 /**
@@ -54,7 +55,6 @@ private FetchProfileProcessor() {
  *
  * @param bindingContext the context for annotation binding
  */
-// TODO verify that association exists. See former VerifyFetchProfileReferenceSecondPass
 public static void bind(AnnotationBindingContext bindingContext) {
 
 Collection<AnnotationInstance> annotations = bindingContext.getJandexAccess()
@@ -93,8 +93,19 @@ private static void bind(AnnotationBindingContext bindingContext, AnnotationInst
 if ( !fetchMode.equals( org.hibernate.annotations.FetchMode.JOIN ) ) {
 throw new MappingException( "Only FetchMode.JOIN is currently supported" );
 }
+
 final String entityName = JandexHelper.getValue( override, "entity", String.class, classLoaderService );
 final String associationName = JandexHelper.getValue( override, "association", String.class, classLoaderService );
+
+EntityBinding entityBinding = bindingContext.getMetadataCollector().getEntityBinding( entityName );
+if ( entityBinding == null ) {
+throw new MappingException( "FetchProfile " + name + " references an unknown entity: " + entityName );
+}
+Attribute attributeBinding = entityBinding.getAttributeContainer().locateAttribute( associationName );
+if ( attributeBinding == null ) {
+throw new MappingException( "FetchProfile " + name + " references an unknown association: " + associationName );
+}
+
 fetches.add( new Fetch( entityName, associationName, fetchMode.toString().toLowerCase() ) );
 }
 bindingContext.getMetadataCollector().addFetchProfile( new FetchProfile( name, fetches ) );

hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/Foo.java

@@ -23,10 +23,24 @@
  */
 package org.hibernate.metamodel.internal.source;
 
+import java.util.List;
+
+import javax.persistence.ElementCollection;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
 /**
  * @author Hardy Ferentschik
  */
+@Entity
 public class Foo {
+@Id
+@GeneratedValue
+public long id;
+
+@ElementCollection
+public List<String> bars;
 }
 
 

hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/MetadataImplTest.java

@@ -65,6 +65,7 @@ public void testAddingNullPackageName() {
 public void testAddingPackageName() {
 MetadataSources sources = new MetadataSources( new StandardServiceRegistryBuilder().build() );
 sources.addPackage( "org.hibernate.metamodel.internal.source" );
+sources.addAnnotatedClass( Foo.class );
 MetadataImpl metadata = (MetadataImpl) sources.buildMetadata();
 
 assertFetchProfile( metadata );
@@ -74,6 +75,7 @@ public void testAddingPackageName() {
 public void testAddingPackageNameWithTrailingDot() {
 MetadataSources sources = new MetadataSources( new StandardServiceRegistryBuilder().build() );
 sources.addPackage( "org.hibernate.metamodel.internal.source." );
+sources.addAnnotatedClass( Foo.class );
 MetadataImpl metadata = (MetadataImpl) sources.buildMetadata();
 
 assertFetchProfile( metadata );

hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/global/FetchProfileBinderTest.java

@@ -24,6 +24,12 @@
 package org.hibernate.metamodel.internal.source.annotations.global;
 
 import java.util.Iterator;
+import java.util.List;
+
+import javax.persistence.ElementCollection;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
 
 import org.hibernate.MappingException;
 import org.hibernate.annotations.FetchMode;
@@ -33,7 +39,6 @@
 import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl;
 import org.hibernate.metamodel.Metadata;
 import org.hibernate.metamodel.MetadataSources;
-
 import org.hibernate.testing.junit4.BaseUnitTestCase;
 import org.junit.After;
 import org.junit.Before;
@@ -62,9 +67,16 @@ public void tearDown() {
 @Test
 public void testSingleFetchProfile() {
 @FetchProfile(name = "foo", fetchOverrides = {
-@FetchProfile.FetchOverride(entity = Foo.class, association = "bar", mode = FetchMode.JOIN)
+@FetchProfile.FetchOverride(entity = Foo.class, association = "bars", mode = FetchMode.JOIN)
 })
+@Entity
 class Foo {
+@Id
+@GeneratedValue
+public long id;
+
+@ElementCollection
+public List<String> bars;
 }
 
 Metadata meta = new MetadataSources( serviceRegistry ).addAnnotatedClass( Foo.class ).buildMetadata();
@@ -74,7 +86,7 @@ class Foo {
 org.hibernate.metamodel.spi.binding.FetchProfile profile = mappedFetchProfiles.next();
 assertEquals( "Wrong fetch profile name", "foo", profile.getName() );
 org.hibernate.metamodel.spi.binding.FetchProfile.Fetch fetch = profile.getFetches().iterator().next();
-assertEquals( "Wrong association name", "bar", fetch.getAssociation() );
+assertEquals( "Wrong association name", "bars", fetch.getAssociation() );
 assertEquals( "Wrong association type", Foo.class.getName(), fetch.getEntity() );
 }
 
@@ -95,12 +107,12 @@ public void testFetchProfiles() {
 private void assertProfiles(org.hibernate.metamodel.spi.binding.FetchProfile profile) {
 if ( profile.getName().equals( "foobar" ) ) {
 org.hibernate.metamodel.spi.binding.FetchProfile.Fetch fetch = profile.getFetches().iterator().next();
-assertEquals( "Wrong association name", "foobar", fetch.getAssociation() );
+assertEquals( "Wrong association name", "fubars", fetch.getAssociation() );
 assertEquals( "Wrong association type", FooBar.class.getName(), fetch.getEntity() );
 }
 else if ( profile.getName().equals( "fubar" ) ) {
 org.hibernate.metamodel.spi.binding.FetchProfile.Fetch fetch = profile.getFetches().iterator().next();
-assertEquals( "Wrong association name", "fubar", fetch.getAssociation() );
+assertEquals( "Wrong association name", "fubars", fetch.getAssociation() );
 assertEquals( "Wrong association type", FooBar.class.getName(), fetch.getEntity() );
 }
 else {
@@ -111,23 +123,37 @@ else if ( profile.getName().equals( "fubar" ) ) {
 @Test(expected = MappingException.class)
 public void testNonJoinFetchThrowsException() {
 @FetchProfile(name = "foo", fetchOverrides = {
-@FetchProfile.FetchOverride(entity = Foo.class, association = "bar", mode = FetchMode.SELECT)
+@FetchProfile.FetchOverride(entity = Foo.class, association = "bars", mode = FetchMode.SELECT)
 })
+@Entity
 class Foo {
+@Id
+@GeneratedValue
+public long id;
+
+@ElementCollection
+public List<String> bars;
 }
 
 new MetadataSources( serviceRegistry ).addAnnotatedClass( Foo.class ).buildMetadata();
 }
 
 @FetchProfiles( {
 @FetchProfile(name = "foobar", fetchOverrides = {
-@FetchProfile.FetchOverride(entity = FooBar.class, association = "foobar", mode = FetchMode.JOIN)
+@FetchProfile.FetchOverride(entity = FooBar.class, association = "fubars", mode = FetchMode.JOIN)
 }),
 @FetchProfile(name = "fubar", fetchOverrides = {
-@FetchProfile.FetchOverride(entity = FooBar.class, association = "fubar", mode = FetchMode.JOIN)
+@FetchProfile.FetchOverride(entity = FooBar.class, association = "fubars", mode = FetchMode.JOIN)
 })
 })
+@Entity
 class FooBar {
+@Id
+@GeneratedValue
+public long id;
+
+@ElementCollection
+public List<String> fubars;
 }
 }
 

hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/package-info.java

@@ -22,7 +22,7 @@
  * Boston, MA 02110-1301 USA
  */
 @FetchProfile(name = "package-configured-profile", fetchOverrides = {
-@FetchProfile.FetchOverride(entity = Foo.class, association = "bar", mode = FetchMode.JOIN)
+@FetchProfile.FetchOverride(entity = Foo.class, association = "bars", mode = FetchMode.JOIN)
 })
 package org.hibernate.metamodel.internal.source;