#80 - Investigate use of MethodHandles instead of Constructor and Method references

Author: sebersole

hibernate-models/src/main/java/org/hibernate/models/internal/AnnotationUsageHelper.java

@@ -101,7 +101,7 @@ public static <A extends Annotation, C extends Annotation> void forEachRepeatedA
 		if ( container != null ) {
 			final AnnotationDescriptor<C> containerDescriptor = modelContext.getAnnotationDescriptorRegistry().getDescriptor( containerType );
 			final AttributeDescriptor<A[]> attribute = containerDescriptor.getAttribute( "value" );
-			final A[] repetitions = AnnotationHelper.extractValue( container, attribute, modelContext );
+			final A[] repetitions = AnnotationHelper.extractValue( container, attribute );
 			CollectionHelper.forEach( repetitions, consumer );
 		}
 	}
@@ -122,7 +122,7 @@ public static <A extends Annotation> void forEachRepeatedAnnotationUsages(
 		if ( container != null ) {
 			final AnnotationDescriptor<?> containerDescriptor = modelContext.getAnnotationDescriptorRegistry().getDescriptor( containerType );
 			final AttributeDescriptor<A[]> attribute = containerDescriptor.getAttribute( "value" );
-			final A[] repetitions = AnnotationHelper.extractValue( container, attribute, modelContext );
+			final A[] repetitions = AnnotationHelper.extractValue( container, attribute );
 			CollectionHelper.forEach( repetitions, consumer );
 		}
 	}
@@ -140,7 +140,7 @@ public static <A extends Annotation> A[] getRepeatedUsages(
 
 		if ( containerUsage != null ) {
 			final AttributeDescriptor<A[]> attribute = type.getRepeatableContainer().getAttribute( "value" );
-			final A[] repeatableValues = AnnotationHelper.extractValue( containerUsage, attribute, modelContext );
+			final A[] repeatableValues = AnnotationHelper.extractValue( containerUsage, attribute );
 
 			if ( CollectionHelper.isNotEmpty( repeatableValues ) ) {
 				if ( usage != null ) {
@@ -207,7 +207,7 @@ private static <A extends Annotation> boolean nameMatches(
 			String attributeToMatch,
 			SourceModelBuildingContext modelContext) {
 		final AttributeDescriptor<String> attributeDescriptor = descriptor.getAttribute( attributeToMatch );
-		final String usageName = AnnotationHelper.extractValue( annotationUsage, attributeDescriptor, modelContext );
+		final String usageName = AnnotationHelper.extractValue( annotationUsage, attributeDescriptor );
 		return matchValue.equals( usageName );
 	}
 

hibernate-models/src/main/java/org/hibernate/models/internal/OrmAnnotationDescriptor.java

@@ -12,6 +12,7 @@
 import java.util.List;
 import java.util.Map;
 
+import org.hibernate.models.ModelsException;
 import org.hibernate.models.spi.AnnotationDescriptor;
 import org.hibernate.models.spi.AttributeDescriptor;
 import org.hibernate.models.spi.MutableAnnotationDescriptor;
@@ -116,7 +117,7 @@ private static <A extends Annotation, C extends A> MethodHandle resolveConstruct
 				return MethodHandles.publicLookup().findConstructor( concreteClass, methodType );
 			}
 			catch (Exception e) {
-				throw new MethodResolutionException( "Unable to locate default-variant constructor for `" + concreteClass.getName() + "`", e );
+				throw new ModelsException( "Unable to locate default-variant constructor for `" + concreteClass.getName() + "`", e );
 			}
 		}
 
@@ -131,7 +132,7 @@ public C createUsage(SourceModelBuildingContext context) {
 				return (C) constructor.invoke( context );
 			}
 			catch (Throwable e) {
-				throw new MethodInvocationException( "Unable to invoke default-variant constructor for `" + concreteClass.getName() + "`", e );
+				throw new ModelsException( "Unable to invoke default-variant constructor for `" + concreteClass.getName() + "`", e );
 			}
 		}
 	}
@@ -152,7 +153,7 @@ private static <A extends Annotation, C extends A> MethodHandle resolveConstruct
 				return MethodHandles.publicLookup().findConstructor( concreteClass, methodType );
 			}
 			catch (Exception e) {
-				throw new MethodResolutionException( "Unable to locate JDK-variant constructor for `" + concreteClass.getName() + "`", e );
+				throw new ModelsException( "Unable to locate JDK-variant constructor for `" + concreteClass.getName() + "`", e );
 			}
 		}
 
@@ -167,7 +168,7 @@ public C createUsage(A jdkAnnotation, SourceModelBuildingContext context) {
 				return (C) constructor.invoke( jdkAnnotation, context );
 			}
 			catch (Throwable e) {
-				throw new MethodInvocationException( "Unable to invoke JDK-variant constructor for `" + concreteClass.getName() + "`", e );
+				throw new ModelsException( "Unable to invoke JDK-variant constructor for `" + concreteClass.getName() + "`", e );
 			}
 		}
 	}
@@ -182,11 +183,11 @@ public DeTypedCreator(Class<A> annotationType, Class<C> concreteClass) {
 
 		private static <A extends Annotation, C extends A> MethodHandle resolveConstructor(Class<C> concreteClass) {
 			try {
-				final MethodType methodType = MethodType.methodType( void.class, AnnotationInstance.class, SourceModelBuildingContext.class );
+				final MethodType methodType = MethodType.methodType( void.class, Map.class, SourceModelBuildingContext.class );
 				return MethodHandles.publicLookup().findConstructor( concreteClass, methodType );
 			}
 			catch (Exception e) {
-				throw new MethodResolutionException( "Unable to locate Jandex-variant constructor for `" + concreteClass.getName() + "`", e );
+				throw new ModelsException( "Unable to locate Jandex-variant constructor for `" + concreteClass.getName() + "`", e );
 			}
 		}
 
@@ -201,7 +202,7 @@ public C createUsage(Map<String,?> attributeValues, SourceModelBuildingContext c
 				return (C) constructor.invoke( attributeValues, context );
 			}
 			catch (Throwable e) {
-				throw new MethodInvocationException( "Unable to invoke Jandex-variant constructor for `" + concreteClass.getName() + "`", e );
+				throw new ModelsException( "Unable to invoke Jandex-variant constructor for `" + concreteClass.getName() + "`", e );
 			}
 		}
 	}