Fix annotation ClassDetails default values extraction

hibernate · Mar 19, 2024 · 5df2c12 · 5df2c12
1 parent 12a6fc2
commit 5df2c12
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/src/main/java/org/hibernate/models/internal/dynamic/DynamicAnnotationUsage.java b/src/main/java/org/hibernate/models/internal/dynamic/DynamicAnnotationUsage.java
@@ -157,9 +157,15 @@ private static Object wrapValue(Object value, AnnotationTarget target, SourceMod
 				throw new AnnotationAccessException( "Error accessing default annotation attribute value", e );
 			}
 		}
-		else if ( value != null && value.getClass().isArray() ) {
-			return getList( value, target, context );
+		else if ( value != null ) {
+			if ( value.getClass().isArray() ) {
+				return getList( value, target, context );
+			}
+			else if ( value.getClass() == Class.class ) {
+				return context.getClassDetailsRegistry().findClassDetails( ( (Class) value ).getName() );
+			}
 		}
+
 		return value;
 	}
 

diff --git a/src/test/java/org/hibernate/models/dynamic/DynamicAnnotationTests.java b/src/test/java/org/hibernate/models/dynamic/DynamicAnnotationTests.java
@@ -14,10 +14,12 @@
 import org.hibernate.models.internal.dynamic.DynamicAnnotationUsage;
 import org.hibernate.models.internal.dynamic.DynamicClassDetails;
 import org.hibernate.models.orm.JpaAnnotations;
+import org.hibernate.models.spi.ClassDetails;
 
 import org.junit.jupiter.api.Test;
 
 import jakarta.persistence.ConstraintMode;
+import jakarta.persistence.ElementCollection;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.JoinTable;
@@ -110,4 +112,18 @@ void testDefaultValues() {
 		String generator = generatorAnn.findAttributeValue( "generator" );
 		assertThat( generator ).isEqualTo( "" );
 	}
+
+	@Test
+	void testClassDetailsDefaultValue(){
+		final SourceModelBuildingContextImpl buildingContext = createBuildingContext();
+		final DynamicClassDetails dynamicEntity = new DynamicClassDetails( "DynamicEntity", buildingContext );
+		final DynamicAnnotationUsage<ElementCollection> elementCollectionAnn = new DynamicAnnotationUsage<>(
+				JpaAnnotations.ELEMENT_COLLECTION,
+				dynamicEntity,
+				buildingContext
+		);
+
+		Object value = elementCollectionAnn.getAttributeValue( "targetClass" );
+		assertThat( value ).isInstanceOf( ClassDetails.class );
+	}
 }