#107 - hibernate-models-bytebuddy

# Conflicts:
#	hibernate-models/src/main/java/org/hibernate/models/spi/ModelsConfiguration.java

Author: sebersole

hibernate-models-bytebuddy/build.gradle

@@ -1,5 +1,6 @@
 plugins {
     id "published-java-module"
+    id "shared-testing"
 }
 
 description = "Support for hibernate-models based on ByteBuddy (isolated dependency)"
@@ -12,6 +13,4 @@ dependencies {
     api project( ":hibernate-models" )
 
     implementation libs.byteBuddy
-
-    testImplementation project( ":hibernate-models-testing" )
 }

hibernate-models-bytebuddy/src/main/java/org/hibernate/models/bytebuddy/Settings.java

@@ -0,0 +1,17 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.models.bytebuddy;
+
+/**
+ * Settings for hibernate-models ByteBuddy support
+ *
+ * @author Steve Ebersole
+ */
+public interface Settings {
+	/**
+	 * Used to pass the ByteBuddy {@linkplain net.bytebuddy.pool.TypePool}.
+	 */
+	String TYPE_POOL_PARAM = "hibernate.models.bytebuddy.typePool";
+}

hibernate-models-bytebuddy/src/main/java/org/hibernate/models/bytebuddy/internal/AbstractAnnotationTarget.java

@@ -7,6 +7,7 @@
 import java.lang.annotation.Annotation;
 import java.util.Map;
 
+import org.hibernate.models.bytebuddy.spi.ByteBuddyModelsContext;
 import org.hibernate.models.internal.AnnotationTargetSupport;
 
 import net.bytebuddy.description.annotation.AnnotationSource;
@@ -15,15 +16,15 @@
  * @author Steve Ebersole
  */
 public abstract class AbstractAnnotationTarget implements AnnotationTargetSupport {
-	private final SourceModelBuildingContextImpl modelContext;
+	private final ByteBuddyModelsContext modelContext;
 
 	private Map<Class<? extends Annotation>, ? extends Annotation> usageMap;
 
-	public AbstractAnnotationTarget(SourceModelBuildingContextImpl modelContext) {
+	public AbstractAnnotationTarget(ByteBuddyModelsContext modelContext) {
 		this.modelContext = modelContext;
 	}
 
-	public SourceModelBuildingContextImpl getModelContext() {
+	public ByteBuddyModelsContext getModelContext() {
 		return modelContext;
 	}
 

hibernate-models-bytebuddy/src/main/java/org/hibernate/models/bytebuddy/internal/AnnotationDescriptorImpl.java

@@ -6,6 +6,7 @@
 
 import java.lang.annotation.Annotation;
 
+import org.hibernate.models.bytebuddy.spi.ByteBuddyModelsContext;
 import org.hibernate.models.internal.StandardAnnotationDescriptor;
 import org.hibernate.models.spi.AnnotationDescriptor;
 import org.hibernate.models.spi.SourceModelBuildingContext;
@@ -29,7 +30,7 @@ public AnnotationDescriptorImpl(
 		super( annotationType, repeatableContainer, buildingContext );
 	}
 
-	public A createUsage(AnnotationDescription annotationDescription, SourceModelBuildingContextImpl context) {
+	public A createUsage(AnnotationDescription annotationDescription, ByteBuddyModelsContext context) {
 		return AnnotationUsageBuilder.makeUsage( annotationDescription, this, context );
 	}
 }

hibernate-models-bytebuddy/src/main/java/org/hibernate/models/bytebuddy/internal/AnnotationUsageBuilder.java

@@ -15,11 +15,13 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.BiConsumer;
 
+import org.hibernate.models.bytebuddy.spi.ByteBuddyModelsContext;
 import org.hibernate.models.bytebuddy.spi.ValueExtractor;
 import org.hibernate.models.internal.util.CollectionHelper;
 import org.hibernate.models.spi.AnnotationDescriptor;
 import org.hibernate.models.spi.AnnotationDescriptorRegistry;
 import org.hibernate.models.spi.AttributeDescriptor;
+import org.hibernate.models.spi.SourceModelBuildingContext;
 
 import net.bytebuddy.description.annotation.AnnotationDescription;
 import net.bytebuddy.description.annotation.AnnotationList;
@@ -35,7 +37,7 @@ public class AnnotationUsageBuilder {
 	public static <A extends Annotation> A makeUsage(
 			AnnotationDescription annotationDescription,
 			AnnotationDescriptor<A> annotationDescriptor,
-			SourceModelBuildingContextImpl modelContext) {
+			SourceModelBuildingContext modelContext) {
 		final Map<String, Object> attributeValues = extractAttributeValues(
 				annotationDescription,
 				annotationDescriptor,
@@ -47,7 +49,7 @@ public static <A extends Annotation> A makeUsage(
 	private static <A extends Annotation> Map<String, Object> extractAttributeValues(
 			AnnotationDescription annotationDescription,
 			AnnotationDescriptor<A> annotationDescriptor,
-			SourceModelBuildingContextImpl modelContext) {
+			SourceModelBuildingContext modelContext) {
 
 		if ( CollectionHelper.isEmpty( annotationDescriptor.getAttributes() ) ) {
 			return Collections.emptyMap();
@@ -57,7 +59,7 @@ private static <A extends Annotation> Map<String, Object> extractAttributeValues
 		for ( int i = 0; i < annotationDescriptor.getAttributes().size(); i++ ) {
 			final AttributeDescriptor<?> attributeDescriptor = annotationDescriptor.getAttributes().get( i );
 			final ValueExtractor<?> extractor = modelContext
-					.as( SourceModelBuildingContextImpl.class )
+					.as( ByteBuddyModelContextImpl.class )
 					.getValueExtractor( attributeDescriptor.getTypeDescriptor() );
 			final Object attributeValue = extractor.extractValue(
 					annotationDescription,
@@ -71,7 +73,7 @@ private static <A extends Annotation> Map<String, Object> extractAttributeValues
 
 	public static Map<Class<? extends Annotation>, ? extends Annotation> collectUsages(
 			AnnotationSource annotationSource,
-			SourceModelBuildingContextImpl modelContext) {
+			ByteBuddyModelsContext modelContext) {
 		if ( annotationSource == null ) {
 			return Collections.emptyMap();
 		}
@@ -90,7 +92,7 @@ private static <A extends Annotation> Map<String, Object> extractAttributeValues
 	public static void processAnnotations(
 			AnnotationList annotations,
 			BiConsumer<Class<? extends Annotation>, Annotation> consumer,
-			SourceModelBuildingContextImpl buildingContext) {
+			ByteBuddyModelsContext buildingContext) {
 		final AnnotationDescriptorRegistry annotationDescriptorRegistry = buildingContext.getAnnotationDescriptorRegistry();
 
 		for ( AnnotationDescription annotation : annotations ) {

hibernate-models-bytebuddy/src/main/java/org/hibernate/models/bytebuddy/internal/SourceModelBuildingContextImpl.java renamed to hibernate-models-bytebuddy/src/main/java/org/hibernate/models/bytebuddy/internal/ByteBuddyModelContextImpl.java

@@ -7,7 +7,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.hibernate.models.bytebuddy.spi.ByteBuddyModelsBuildingContext;
+import org.hibernate.models.bytebuddy.spi.ByteBuddyModelsContext;
 import org.hibernate.models.bytebuddy.spi.ValueConverter;
 import org.hibernate.models.bytebuddy.spi.ValueExtractor;
 import org.hibernate.models.internal.AbstractModelBuildingContext;
@@ -28,9 +28,9 @@
  *
  * @author Steve Ebersole
  */
-public class SourceModelBuildingContextImpl
+public class ByteBuddyModelContextImpl
 		extends AbstractModelBuildingContext
-		implements ByteBuddyModelsBuildingContext {
+		implements ByteBuddyModelsContext {
 	private final TypePool typePool;
 
 	private final ClassDetailsRegistryImpl classDetailsRegistry;
@@ -39,13 +39,13 @@ public class SourceModelBuildingContextImpl
 	private final Map<ValueTypeDescriptor, ValueConverter> valueConverters = new HashMap<>();
 	private final Map<ValueTypeDescriptor, ValueExtractor> valueExtractors = new HashMap<>();
 
-	public SourceModelBuildingContextImpl(
+	public ByteBuddyModelContextImpl(
 			TypePool typePool,
 			RegistryPrimer registryPrimer) {
 		this( typePool, SimpleClassLoading.SIMPLE_CLASS_LOADING, registryPrimer );
 	}
 
-	public SourceModelBuildingContextImpl(
+	public ByteBuddyModelContextImpl(
 			TypePool typePool,
 			ClassLoading classLoading,
 			RegistryPrimer registryPrimer) {

hibernate-models-bytebuddy/src/main/java/org/hibernate/models/bytebuddy/internal/ClassDetailsBuilderImpl.java

@@ -4,6 +4,7 @@
  */
 package org.hibernate.models.bytebuddy.internal;
 
+import org.hibernate.models.bytebuddy.spi.ByteBuddyModelsContext;
 import org.hibernate.models.spi.ClassDetails;
 import org.hibernate.models.spi.ClassDetailsBuilder;
 import org.hibernate.models.spi.SourceModelBuildingContext;
@@ -12,9 +13,9 @@
  * @author Steve Ebersole
  */
 public class ClassDetailsBuilderImpl implements ClassDetailsBuilder {
-	private final SourceModelBuildingContextImpl modelContext;
+	private final ByteBuddyModelsContext modelContext;
 
-	public ClassDetailsBuilderImpl(SourceModelBuildingContextImpl modelContext) {
+	public ClassDetailsBuilderImpl(ByteBuddyModelsContext modelContext) {
 		this.modelContext = modelContext;
 	}
 

hibernate-models-bytebuddy/src/main/java/org/hibernate/models/bytebuddy/internal/ClassDetailsImpl.java

@@ -7,6 +7,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.hibernate.models.bytebuddy.spi.ByteBuddyModelsContext;
 import org.hibernate.models.internal.ClassDetailsSupport;
 import org.hibernate.models.internal.jdk.SerialJdkClassDetails;
 import org.hibernate.models.internal.util.CollectionHelper;
@@ -49,7 +50,7 @@ public class ClassDetailsImpl extends AbstractAnnotationTarget implements ClassD
 	private List<MethodDetails> methods;
 	private List<RecordComponentDetails> recordComponents;
 
-	public ClassDetailsImpl(TypeDescription typeDescription, SourceModelBuildingContextImpl modelContext) {
+	public ClassDetailsImpl(TypeDescription typeDescription, ByteBuddyModelsContext modelContext) {
 		super( modelContext );
 		this.typeDescription = typeDescription;
 		this.superClassDetails = determineSuperType( typeDescription, modelContext );

hibernate-models-bytebuddy/src/main/java/org/hibernate/models/bytebuddy/internal/ClassDetailsRegistryImpl.java

@@ -17,12 +17,10 @@
  * @author Steve Ebersole
  */
 public class ClassDetailsRegistryImpl extends AbstractClassDetailsRegistry {
-	private final SourceModelBuildingContextImpl modelContext;
 	private final ClassDetailsBuilderImpl classDetailsBuilder;
 
-	public ClassDetailsRegistryImpl(SourceModelBuildingContextImpl context) {
+	public ClassDetailsRegistryImpl(ByteBuddyModelContextImpl context) {
 		super( context );
-		this.modelContext = context;
 		this.classDetailsBuilder = new ClassDetailsBuilderImpl( context );
 	}
 

hibernate-models-bytebuddy/src/main/java/org/hibernate/models/bytebuddy/internal/FieldDetailsImpl.java

@@ -11,6 +11,7 @@
 import java.util.Map;
 
 import org.hibernate.models.IllegalCastException;
+import org.hibernate.models.bytebuddy.spi.ByteBuddyModelsContext;
 import org.hibernate.models.internal.AnnotationTargetSupport;
 import org.hibernate.models.spi.AnnotationDescriptor;
 import org.hibernate.models.spi.ClassDetails;
@@ -40,7 +41,7 @@ public class FieldDetailsImpl
 	public FieldDetailsImpl(
 			FieldDescription.InDefinedShape underlyingField,
 			ClassDetailsImpl declaringClassDetails,
-			SourceModelBuildingContextImpl modelContext) {
+			ByteBuddyModelsContext modelContext) {
 		super( modelContext );
 		this.underlyingField = underlyingField;
 		this.declaringClassDetails = declaringClassDetails;