HHH-19733 Extracting some more reusable constants in the ByteBuddy Enhancer

Author: Sanne

hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerImpl.java

@@ -69,7 +69,6 @@
 import java.util.Set;
 import java.util.function.Supplier;
 
-import static net.bytebuddy.matcher.ElementMatchers.isDefaultFinalizer;
 import static net.bytebuddy.matcher.ElementMatchers.isGetter;
 import static net.bytebuddy.matcher.ElementMatchers.isSetter;
 import static net.bytebuddy.matcher.ElementMatchers.isStatic;
@@ -85,7 +84,7 @@ public class EnhancerImpl implements Enhancer {
 	private final ByteBuddyState byteBuddyState;
 	private final EnhancerClassLocator typePool;
 	private final EnhancerImplConstants constants;
-	private final List<? extends Annotation> infoAnnotationList;
+	private final AnnotationList.ForLoadedAnnotations infoAnnotationList;
 
 	/**
 	 * Constructs the Enhancer, using the given context.
@@ -111,7 +110,7 @@ public EnhancerImpl(final EnhancementContext enhancementContext, final ByteBuddy
 		this.typePool = Objects.requireNonNull( classLocator );
 		this.constants = byteBuddyState.getEnhancerConstants();
 
-		this.infoAnnotationList = List.of( createInfoAnnotation( enhancementContext ) );
+		this.infoAnnotationList = new AnnotationList.ForLoadedAnnotations( List.of( createInfoAnnotation( enhancementContext ) ) );
 	}
 
 
@@ -135,7 +134,7 @@ public byte[] enhance(String className, byte[] originalBytes) throws Enhancement
 			final TypeDescription typeDescription = typePool.describe( safeClassName ).resolve();
 
 			return byteBuddyState.rewrite( typePool, safeClassName, byteBuddy -> doEnhance(
-					() -> byteBuddy.ignore( isDefaultFinalizer() )
+					() -> byteBuddy.ignore( constants.defaultFinalizer() )
 							.redefine( typeDescription, typePool.asClassFileLocator() )
 							.annotateType( infoAnnotationList ),
 					typeDescription

hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerImplConstants.java

@@ -7,6 +7,7 @@
 import jakarta.persistence.Transient;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.annotation.AnnotationDescription;
+import net.bytebuddy.description.method.MethodDescription;
 import net.bytebuddy.description.modifier.FieldPersistence;
 import net.bytebuddy.description.modifier.ModifierContributor;
 import net.bytebuddy.description.modifier.Visibility;
@@ -19,11 +20,14 @@
 import java.util.Collection;
 import java.util.List;
 
+import net.bytebuddy.matcher.ElementMatcher;
 import org.hibernate.bytecode.enhance.spi.CollectionTracker;
 import org.hibernate.engine.spi.EntityEntry;
 import org.hibernate.engine.spi.ManagedEntity;
 import org.hibernate.engine.spi.PersistentAttributeInterceptor;
 
+import static net.bytebuddy.matcher.ElementMatchers.isDefaultFinalizer;
+
 /**
  * Extracts constants used by EnhancerImpl.
  * This allows integrators to choose reusing this state for multiple enhancement processes,
@@ -69,6 +73,9 @@ public final class EnhancerImplConstants {
 	final TypeDefinition Type_Array_String = TypeDescription.ForLoadedType.of( String[].class );
 	final TypeDefinition TypeCollectionTracker = TypeDescription.ForLoadedType.of( CollectionTracker.class );
 
+	//Frequently used ElementMatchers:
+	final ElementMatcher.Junction<MethodDescription> DEFAULT_FINALIZER = isDefaultFinalizer();
+
 	public EnhancerImplConstants() {
 		this.adviceLocator = ClassFileLocator.ForClassLoader.of( CodeTemplates.class.getClassLoader() );
 		this.implementationTrackChange = Advice.to( CodeTemplates.TrackChange.class, adviceLocator )
@@ -110,4 +117,8 @@ public EnhancerImplConstants() {
 				.wrap( StubMethod.INSTANCE );
 	}
 
+	public ElementMatcher<? super MethodDescription> defaultFinalizer() {
+		return DEFAULT_FINALIZER;
+	}
+
 }