Fix annotation default values extraction

Author: dreab8

src/main/java/org/hibernate/models/internal/dynamic/DynamicAnnotationUsage.java

@@ -7,16 +7,20 @@
 package org.hibernate.models.internal.dynamic;
 
 import java.lang.annotation.Annotation;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 
+import org.hibernate.models.AnnotationAccessException;
 import org.hibernate.models.UnknownAnnotationAttributeException;
 import org.hibernate.models.internal.AnnotationProxy;
 import org.hibernate.models.spi.AnnotationDescriptor;
 import org.hibernate.models.spi.AnnotationTarget;
 import org.hibernate.models.spi.AttributeDescriptor;
 import org.hibernate.models.spi.MutableAnnotationUsage;
+import org.hibernate.models.spi.SourceModelBuildingContext;
 
 /**
  * AnnotationUsage built dynamically (for dynamic models, XML mappings, etc.)
@@ -29,15 +33,14 @@ public class DynamicAnnotationUsage<A extends Annotation> implements MutableAnno
 
 	private Map<String,Object> values;
 
-	public DynamicAnnotationUsage(AnnotationDescriptor<A> annotationDescriptor) {
-		this( annotationDescriptor, null );
-	}
-
-	public DynamicAnnotationUsage(AnnotationDescriptor<A> annotationDescriptor, AnnotationTarget target) {
+	public DynamicAnnotationUsage(
+			AnnotationDescriptor<A> annotationDescriptor,
+			AnnotationTarget target,
+			SourceModelBuildingContext context) {
 		this.annotationDescriptor = annotationDescriptor;
 		this.target = target;
 
-		this.values = extractBaselineValues( annotationDescriptor );
+		this.values = extractBaselineValues( annotationDescriptor, target, context );
 	}
 
 	@Override
@@ -109,4 +112,46 @@ private static <A extends Annotation> Map<String, Object> extractBaselineValues(
 		}
 		return values;
 	}
+
+	private static <A extends Annotation> Map<String, Object> extractBaselineValues(
+			AnnotationDescriptor<A> annotationDescriptor,
+			AnnotationTarget target,
+			SourceModelBuildingContext context) {
+		final HashMap<String, Object> values = new HashMap<>();
+		for ( AttributeDescriptor<?> attribute : annotationDescriptor.getAttributes() ) {
+			final Object defaultValue = attribute.getAttributeMethod().getDefaultValue();
+			if ( defaultValue instanceof Annotation annotation ) {
+				try {
+					values.put( attribute.getName(), extractDynamicAnnotationUsage( annotation, target, context ) );
+				}
+				catch (InvocationTargetException | IllegalAccessException e) {
+					throw new AnnotationAccessException( "Error accessing default annotation attribute value", e );
+				}
+			}
+			else if ( attribute.isMultiValued() ) {
+				values.put( attribute.getName(), Arrays.asList( defaultValue ) );
+			}
+			else {
+				values.put( attribute.getName(), defaultValue );
+			}
+		}
+		return values;
+	}
+
+	private static DynamicAnnotationUsage<?> extractDynamicAnnotationUsage(
+			Annotation annotation,
+			AnnotationTarget target,
+			SourceModelBuildingContext context) throws InvocationTargetException, IllegalAccessException {
+		final Class<? extends Annotation> annotationType = annotation.annotationType();
+		final AnnotationDescriptor<?> descriptor = context.getAnnotationDescriptorRegistry()
+				.getDescriptor( annotationType );
+		final DynamicAnnotationUsage<?> annotationUsage = new DynamicAnnotationUsage<>( descriptor, target, context );
+		for ( AttributeDescriptor<?> attribute : descriptor.getAttributes() ) {
+			annotationUsage.setAttributeValue(
+					attribute.getName(),
+					attribute.getAttributeMethod().invoke( annotation )
+			);
+		}
+		return annotationUsage;
+	}
 }

src/main/java/org/hibernate/models/spi/AnnotationDescriptor.java

@@ -88,7 +88,7 @@ default <V> AttributeDescriptor<V> getAttribute(String name) {
 	 * @param context Access to needed services
 	 */
 	default MutableAnnotationUsage<A> createUsage(AnnotationTarget target, SourceModelBuildingContext context) {
-		final DynamicAnnotationUsage<A> usage = new DynamicAnnotationUsage<>( this, target );
+		final DynamicAnnotationUsage<A> usage = new DynamicAnnotationUsage<>( this, target, context );
 		getAttributes().forEach( (attr) -> {
 			final Object value = attr.getTypeDescriptor().createValue( attr, target, context );
 			usage.setAttributeValue( attr.getName(), value );

src/test/java/org/hibernate/models/annotations/DynamicAnnotationTests.java

@@ -7,6 +7,8 @@
 
 package org.hibernate.models.annotations;
 
+import java.util.List;
+
 import org.hibernate.models.UnknownAnnotationAttributeException;
 import org.hibernate.models.internal.SourceModelBuildingContextImpl;
 import org.hibernate.models.internal.dynamic.DynamicAnnotationUsage;
@@ -15,6 +17,8 @@
 
 import org.junit.jupiter.api.Test;
 
+import jakarta.persistence.ConstraintMode;
+import jakarta.persistence.JoinTable;
 import jakarta.persistence.SequenceGenerator;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -31,7 +35,8 @@ void testBasicUsage() {
 		final DynamicClassDetails dynamicEntity = new DynamicClassDetails( "DynamicEntity", buildingContext );
 		final DynamicAnnotationUsage<SequenceGenerator> generatorAnn = new DynamicAnnotationUsage<>(
 				JpaAnnotations.SEQUENCE_GENERATOR,
-				dynamicEntity
+				dynamicEntity,
+				buildingContext
 		);
 		assertThat( generatorAnn.getString( "name" ) ).isEqualTo( "" );
 		assertThat( generatorAnn.getString( "sequenceName" ) ).isEqualTo( "" );
@@ -49,4 +54,42 @@ void testBasicUsage() {
 		}
 
 	}
+
+	@Test
+	void testJoinTableForeignKeyDefaultValue() {
+		final SourceModelBuildingContextImpl buildingContext = createBuildingContext();
+		final DynamicClassDetails dynamicEntity = new DynamicClassDetails( "DynamicEntity", buildingContext );
+		final DynamicAnnotationUsage<JoinTable> generatorAnn = new DynamicAnnotationUsage<>(
+				JpaAnnotations.JOIN_TABLE,
+				dynamicEntity,
+				buildingContext
+		);
+
+		final Object foreignKey = generatorAnn.getAttributeValue( "foreignKey" );
+
+		assertThat( foreignKey ).isInstanceOf( DynamicAnnotationUsage.class );
+
+		final DynamicAnnotationUsage foreignKeyAnnotationUsage = (DynamicAnnotationUsage) foreignKey;
+
+		assertThat( foreignKeyAnnotationUsage.getAttributeValue( "value" ) ).isEqualTo( ConstraintMode.PROVIDER_DEFAULT );
+
+		assertThat( foreignKeyAnnotationUsage.getAttributeValue( "name" )).isEqualTo( "" );
+		assertThat( foreignKeyAnnotationUsage.getAttributeValue( "options" )).isEqualTo( "" );
+		assertThat( foreignKeyAnnotationUsage.getAttributeValue( "foreignKeyDefinition" )).isEqualTo( "" );
+	}
+
+	@Test
+	void testDefaultArrayValue() {
+		final SourceModelBuildingContextImpl buildingContext = createBuildingContext();
+		final DynamicClassDetails dynamicEntity = new DynamicClassDetails( "DynamicEntity", buildingContext );
+		final DynamicAnnotationUsage<JoinTable> generatorAnn = new DynamicAnnotationUsage<>(
+				JpaAnnotations.JOIN_TABLE,
+				dynamicEntity,
+				buildingContext
+		);
+
+		final Object joinColumns = generatorAnn.getAttributeValue( "joinColumns" );
+		assertThat( joinColumns ).isInstanceOf( List.class );
+
+	}
 }