[hibernate#2640] Override EntityMetamodel#getBytecodeEnhancementMetadataPojo

Hibernate ORM 7.2 now calls this method when it needs to enable
bytecode enhancements

Author: DavideD

hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveJoinedSubclassEntityPersister.java

@@ -6,13 +6,15 @@
 package org.hibernate.reactive.persister.entity.impl;
 
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.CompletionStage;
 
 import org.hibernate.FetchMode;
 import org.hibernate.HibernateException;
 import org.hibernate.LockMode;
 import org.hibernate.LockOptions;
 import org.hibernate.bytecode.enhance.spi.interceptor.LazyAttributeDescriptor;
+import org.hibernate.bytecode.spi.BytecodeEnhancementMetadata;
 import org.hibernate.cache.spi.access.EntityDataAccess;
 import org.hibernate.cache.spi.access.NaturalIdDataAccess;
 import org.hibernate.engine.spi.CascadeStyle;
@@ -41,6 +43,7 @@
 import org.hibernate.persister.entity.mutation.InsertCoordinator;
 import org.hibernate.persister.entity.mutation.UpdateCoordinator;
 import org.hibernate.property.access.spi.PropertyAccess;
+import org.hibernate.reactive.bythecode.spi.ReactiveBytecodeEnhancementMetadataPojoImplAdapter;
 import org.hibernate.reactive.loader.ast.internal.ReactiveSingleIdArrayLoadPlan;
 import org.hibernate.reactive.loader.ast.spi.ReactiveSingleUniqueKeyEntityLoader;
 import org.hibernate.reactive.logging.impl.Log;
@@ -53,6 +56,7 @@
 import org.hibernate.sql.ast.tree.from.TableGroup;
 import org.hibernate.sql.results.graph.DomainResult;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
+import org.hibernate.type.CompositeType;
 import org.hibernate.type.EntityType;
 import org.hibernate.type.Type;
 
@@ -88,6 +92,17 @@ public void initializeLazyProperty(Object entity, EntityEntry entry, Object prop
 		super.initializeLazyProperty( entity, entry, propValue, index, type );
 	}
 
+	@Override
+	protected BytecodeEnhancementMetadata getBytecodeEnhancementMetadataPojo(
+			PersistentClass persistentClass,
+			RuntimeModelCreationContext creationContext,
+			Set<String> idAttributeNames,
+			CompositeType nonAggregatedCidMapper,
+			boolean collectionsInDefaultFetchGroupEnabled) {
+			return ReactiveBytecodeEnhancementMetadataPojoImplAdapter
+				.from( persistentClass, idAttributeNames, nonAggregatedCidMapper, collectionsInDefaultFetchGroupEnabled, creationContext.getMetadata() );
+	}
+
 	@Override
 	protected SingleIdEntityLoader<?> buildSingleIdEntityLoader() {
 		return reactiveDelegate.buildSingleIdEntityLoader();

hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveSingleTableEntityPersister.java

@@ -6,6 +6,7 @@
 package org.hibernate.reactive.persister.entity.impl;
 
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.CompletionStage;
 import java.util.function.Supplier;
 
@@ -14,6 +15,7 @@
 import org.hibernate.LockMode;
 import org.hibernate.LockOptions;
 import org.hibernate.bytecode.enhance.spi.interceptor.LazyAttributeDescriptor;
+import org.hibernate.bytecode.spi.BytecodeEnhancementMetadata;
 import org.hibernate.cache.spi.access.EntityDataAccess;
 import org.hibernate.cache.spi.access.NaturalIdDataAccess;
 import org.hibernate.engine.spi.CascadeStyle;
@@ -44,6 +46,7 @@
 import org.hibernate.persister.entity.mutation.InsertCoordinator;
 import org.hibernate.persister.entity.mutation.UpdateCoordinator;
 import org.hibernate.property.access.spi.PropertyAccess;
+import org.hibernate.reactive.bythecode.spi.ReactiveBytecodeEnhancementMetadataPojoImplAdapter;
 import org.hibernate.reactive.generator.values.GeneratedValuesMutationDelegateAdaptor;
 import org.hibernate.reactive.loader.ast.internal.ReactiveSingleIdArrayLoadPlan;
 import org.hibernate.reactive.loader.ast.spi.ReactiveSingleUniqueKeyEntityLoader;
@@ -57,6 +60,7 @@
 import org.hibernate.sql.ast.tree.from.TableGroup;
 import org.hibernate.sql.results.graph.DomainResult;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
+import org.hibernate.type.CompositeType;
 import org.hibernate.type.EntityType;
 import org.hibernate.type.Type;
 
@@ -93,6 +97,17 @@ public void initializeLazyProperty(Object entity, EntityEntry entry, Object prop
 		super.initializeLazyProperty( entity, entry, propValue, index, type );
 	}
 
+	@Override
+	protected BytecodeEnhancementMetadata getBytecodeEnhancementMetadataPojo(
+			PersistentClass persistentClass,
+			RuntimeModelCreationContext creationContext,
+			Set<String> idAttributeNames,
+			CompositeType nonAggregatedCidMapper,
+			boolean collectionsInDefaultFetchGroupEnabled) {
+			return ReactiveBytecodeEnhancementMetadataPojoImplAdapter
+				.from( persistentClass, idAttributeNames, nonAggregatedCidMapper, collectionsInDefaultFetchGroupEnabled, creationContext.getMetadata() );
+	}
+
 	@Override
 	public GeneratedValuesMutationDelegate createInsertDelegate() {
 		return ReactiveAbstractEntityPersister.super.createReactiveInsertDelegate();

hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveUnionSubclassEntityPersister.java

@@ -7,6 +7,7 @@
 
 import java.lang.invoke.MethodHandles;
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.CompletionStage;
 
 import org.hibernate.FetchMode;
@@ -15,6 +16,7 @@
 import org.hibernate.LockOptions;
 import org.hibernate.MappingException;
 import org.hibernate.bytecode.enhance.spi.interceptor.LazyAttributeDescriptor;
+import org.hibernate.bytecode.spi.BytecodeEnhancementMetadata;
 import org.hibernate.cache.spi.access.EntityDataAccess;
 import org.hibernate.cache.spi.access.NaturalIdDataAccess;
 import org.hibernate.engine.spi.CascadeStyle;
@@ -44,6 +46,7 @@
 import org.hibernate.persister.entity.mutation.InsertCoordinator;
 import org.hibernate.persister.entity.mutation.UpdateCoordinator;
 import org.hibernate.property.access.spi.PropertyAccess;
+import org.hibernate.reactive.bythecode.spi.ReactiveBytecodeEnhancementMetadataPojoImplAdapter;
 import org.hibernate.reactive.loader.ast.internal.ReactiveSingleIdArrayLoadPlan;
 import org.hibernate.reactive.loader.ast.spi.ReactiveSingleUniqueKeyEntityLoader;
 import org.hibernate.reactive.logging.impl.Log;
@@ -57,6 +60,7 @@
 import org.hibernate.sql.ast.tree.from.TableGroup;
 import org.hibernate.sql.results.graph.DomainResult;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
+import org.hibernate.type.CompositeType;
 import org.hibernate.type.EntityType;
 import org.hibernate.type.Type;
 
@@ -89,6 +93,17 @@ public void initializeLazyProperty(Object entity, EntityEntry entry, Object prop
 		super.initializeLazyProperty( entity, entry, propValue, index, type );
 	}
 
+	@Override
+	protected BytecodeEnhancementMetadata getBytecodeEnhancementMetadataPojo(
+			PersistentClass persistentClass,
+			RuntimeModelCreationContext creationContext,
+			Set<String> idAttributeNames,
+			CompositeType nonAggregatedCidMapper,
+			boolean collectionsInDefaultFetchGroupEnabled) {
+			return ReactiveBytecodeEnhancementMetadataPojoImplAdapter
+				.from( persistentClass, idAttributeNames, nonAggregatedCidMapper, collectionsInDefaultFetchGroupEnabled, creationContext.getMetadata() );
+	}
+
 	@Override
 	protected SingleIdEntityLoader<?> buildSingleIdEntityLoader() {
 		return reactiveDelegate.buildSingleIdEntityLoader();