HHH-7803 Automatically index @target classes

brmeyer · brmeyer · commit addadfccd4a9 · 2012-12-05T20:18:50.000-05:00
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/MetadataSources.java b/hibernate-core/src/main/java/org/hibernate/metamodel/MetadataSources.java
@@ -28,11 +28,8 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.lang.reflect.Field;
-import java.lang.reflect.ParameterizedType;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
@@ -53,12 +50,14 @@
 import org.hibernate.jaxb.spi.SourceType;
 import org.hibernate.jaxb.spi.orm.JaxbEntityMappings;
 import org.hibernate.metamodel.internal.MetadataBuilderImpl;
+import org.hibernate.metamodel.internal.source.annotations.util.HibernateDotNames;
 import org.hibernate.metamodel.internal.source.annotations.util.JPADotNames;
 import org.hibernate.metamodel.internal.source.annotations.util.JandexHelper;
 import org.hibernate.metamodel.internal.source.annotations.xml.mocker.EntityMappingsMocker;
 import org.hibernate.metamodel.spi.source.MappingException;
 import org.hibernate.metamodel.spi.source.MappingNotFoundException;
 import org.hibernate.service.ServiceRegistry;
+import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.Index;
 import org.jboss.jandex.IndexView;
@@ -512,7 +511,8 @@ private void indexClass(Class clazz, Indexer indexer, Set<Class<?>> processedCla
 		
 		processedClasses.add( clazz );
 
-		indexResource( clazz.getName().replace( '.', '/' ) + ".class", indexer );
+		ClassInfo classInfo = indexResource(
+				clazz.getName().replace( '.', '/' ) + ".class", indexer );
 
 		// index all super classes of the specified class. Using org.hibernate.cfg.Configuration it was not
 		// necessary to add all annotated classes. Entities would be enough. Mapped superclasses would be
@@ -538,6 +538,16 @@ private void indexClass(Class clazz, Indexer indexer, Set<Class<?>> processedCla
 				}
 			}
 		}
+		
+		// Also check for classes within a @Target annotation.
+		for ( AnnotationInstance targetAnnotation : JandexHelper.getAnnotations(
+				classInfo, HibernateDotNames.TARGET ) ) {
+			String targetClassName = targetAnnotation.value().asClass().name()
+					.toString();
+			Class<?> targetClass = serviceRegistry.getService(
+					ClassLoaderService.class ).classForName( targetClassName );
+			indexClass(targetClass, indexer, processedClasses );
+		}
 	}
 
 	private ClassInfo indexResource(String resourceName, Indexer indexer) {
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/util/JandexHelper.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/util/JandexHelper.java
@@ -28,6 +28,7 @@
 import java.io.InputStream;
 import java.lang.reflect.Array;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -186,7 +187,11 @@ else if ( methodName.startsWith( "get" ) ) {
 	 */
 	public static List<AnnotationInstance> getAnnotations( 
 			ClassInfo classInfo, DotName annotationName ) {
-		return classInfo.annotations().get( annotationName );
+		if ( classInfo.annotations().containsKey( annotationName ) ) {
+			return classInfo.annotations().get( annotationName );
+		} else {
+			return Collections.emptyList();
+		}
 	}
 
 	/**
diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/cid/ParentPk.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cid/ParentPk.java
@@ -1,12 +1,14 @@
 //$Id$
 package org.hibernate.test.annotations.cid;
 import java.io.Serializable;
+
 import javax.persistence.Column;
+import javax.persistence.Embeddable;
 
 /**
  * @author Emmanuel Bernard
  */
-
+@Embeddable
 public class ParentPk implements Serializable {
 	public String getFirstName() {
 		return firstName;
diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/a/EmployeeId.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/a/EmployeeId.java
@@ -1,9 +1,12 @@
 package org.hibernate.test.annotations.derivedidentities.e3.a;
 import java.io.Serializable;
 
+import javax.persistence.Embeddable;
+
 /**
  * @author Emmanuel Bernard
  */
+@Embeddable
 public class EmployeeId implements Serializable{
 	String firstName;
 	String lastName;
diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/b/PersonId.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/b/PersonId.java
@@ -1,9 +1,12 @@
 package org.hibernate.test.annotations.derivedidentities.e5.b;
 import java.io.Serializable;
 
+import javax.persistence.Embeddable;
+
 /**
  * @author Emmanuel Bernard
  */
+@Embeddable
 public class PersonId implements Serializable {
 	String firstName;
 	String lastName;
diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/strategy/Location.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/strategy/Location.java
@@ -1,10 +1,13 @@
 //$Id$
 package org.hibernate.test.annotations.strategy;
 
+import javax.persistence.Embeddable;
+
 
 /**
  * @author Emmanuel Bernard
  */
+@Embeddable
 public class Location {
 	private String city;
 	private String country;
