HHH-19825 - Add methods and change method access for Hibernate Reactive

Author: dreab8

hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/EnhancementAsProxyLazinessInterceptor.java

@@ -298,6 +298,13 @@ public boolean hasWrittenFieldNames() {
 		return writtenFieldNames != null && !writtenFieldNames.isEmpty();
 	}
 
+	/*
+	 * Used by Hibernate Reactive
+	 */
+	protected boolean isIdentifier(String attributeName) {
+		return meta.identifierAttributeNames.contains( attributeName );
+	}
+
 	private enum Status {
 		UNINITIALIZED,
 		INITIALIZING,

hibernate-core/src/main/java/org/hibernate/bytecode/internal/BytecodeEnhancementMetadataPojoImpl.java

@@ -40,11 +40,11 @@
  *
  * @author Steve Ebersole
  */
-public final class BytecodeEnhancementMetadataPojoImpl implements BytecodeEnhancementMetadata {
+public class BytecodeEnhancementMetadataPojoImpl implements BytecodeEnhancementMetadata {
 	/**
 	 * Static constructor
 	 */
-	public static BytecodeEnhancementMetadata from(
+	public static BytecodeEnhancementMetadataPojoImpl from(
 			PersistentClass persistentClass,
 			Set<String> identifierAttributeNames,
 			CompositeType nonAggregatedCidMapper,
@@ -75,7 +75,10 @@ public static BytecodeEnhancementMetadata from(
 	private final LazyAttributeLoadingInterceptor.EntityRelatedState lazyAttributeLoadingInterceptorState;
 	private volatile transient EnhancementAsProxyLazinessInterceptor.EntityRelatedState enhancementAsProxyInterceptorState;
 
-	BytecodeEnhancementMetadataPojoImpl(
+	/*
+	 * Used by Hibernate Reactive
+	 */
+	protected BytecodeEnhancementMetadataPojoImpl(
 			String entityName,
 			Class<?> entityClass,
 			Set<String> identifierAttributeNames,
@@ -248,9 +251,12 @@ public void injectEnhancedEntityAsProxyInterceptor(
 		);
 	}
 
+	/*
+	 * Used by Hibernate Reactive
+	 */
 	//This state object needs to be lazily initialized as it needs access to the Persister, but once
 	//initialized it can be reused across multiple sessions.
-	private EnhancementAsProxyLazinessInterceptor.EntityRelatedState getEnhancementAsProxyLazinessInterceptorMetastate(SharedSessionContractImplementor session) {
+	public EnhancementAsProxyLazinessInterceptor.EntityRelatedState getEnhancementAsProxyLazinessInterceptorMetastate(SharedSessionContractImplementor session) {
 		EnhancementAsProxyLazinessInterceptor.EntityRelatedState state = this.enhancementAsProxyInterceptorState;
 		if ( state == null ) {
 			final EntityPersister entityPersister = session.getFactory().getMappingMetamodel()
@@ -311,4 +317,17 @@ public void injectInterceptor(
 		return (BytecodeLazyAttributeInterceptor) interceptor;
 	}
 
+	/*
+	 * Used by Hibernate Reactive
+	 */
+	public Class<?> getEntityClass() {
+		return entityClass;
+	}
+
+	/*
+	 * Used by Hibernate Reactive
+	 */
+	public LazyAttributeLoadingInterceptor.EntityRelatedState getLazyAttributeLoadingInterceptorState() {
+		return lazyAttributeLoadingInterceptorState;
+	}
 }

hibernate-core/src/main/java/org/hibernate/metamodel/internal/AbstractEntityInstantiatorPojo.java

@@ -64,4 +64,18 @@ public boolean isInstance(Object object) {
 			// this one needed only for guessEntityMode()
 			|| proxyInterface!=null && proxyInterface.isInstance(object);
 	}
+
+	/*
+	 * Used by Hibernate Reactive
+	 */
+	protected boolean isApplyBytecodeInterception() {
+		return applyBytecodeInterception;
+	}
+
+	/*
+	 * Used by Hibernate Reactive
+	 */
+	protected LazyAttributeLoadingInterceptor.EntityRelatedState getLoadingInterceptorState() {
+		return loadingInterceptorState;
+	}
 }

hibernate-core/src/main/java/org/hibernate/metamodel/internal/EntityRepresentationStrategyPojoStandard.java

@@ -159,7 +159,10 @@ private Map<String, PropertyAccess> buildPropertyAccessMap(PersistentClass bootD
 		return propertyAccessMap;
 	}
 
-	private EntityInstantiator determineInstantiator(PersistentClass bootDescriptor, EntityPersister persister) {
+	/*
+	 * Used by Hibernate Reactive
+	 */
+	protected EntityInstantiator determineInstantiator(PersistentClass bootDescriptor, EntityPersister persister) {
 		if ( reflectionOptimizer != null && reflectionOptimizer.getInstantiationOptimizer() != null ) {
 			return new EntityInstantiatorPojoOptimized(
 					persister,

hibernate-core/src/main/java/org/hibernate/tuple/entity/EntityMetamodel.java

@@ -528,7 +528,7 @@ private static boolean isLazy(
 		);
 	}
 
-	private static BytecodeEnhancementMetadata bytecodeEnhancementMetadata(
+	private BytecodeEnhancementMetadata bytecodeEnhancementMetadata(
 			PersistentClass persistentClass,
 			IdentifierProperty identifierAttribute,
 			RuntimeModelCreationContext creationContext,
@@ -550,19 +550,32 @@ private static BytecodeEnhancementMetadata bytecodeEnhancementMetadata(
 				idAttributeNames = singleton( identifierAttribute.getName() );
 			}
 
-			return BytecodeEnhancementMetadataPojoImpl.from(
+			return getBytecodeEnhancementMetadataPojo(
 					persistentClass,
+					creationContext,
 					idAttributeNames,
 					nonAggregatedCidMapper,
-					collectionsInDefaultFetchGroupEnabled,
-					creationContext.getMetadata()
+					collectionsInDefaultFetchGroupEnabled
 			);
 		}
 		else {
 			return new BytecodeEnhancementMetadataNonPojoImpl( persistentClass.getEntityName() );
 		}
 	}
 
+	/*
+	 * Used by Hibernate Reactive
+	 */
+	protected BytecodeEnhancementMetadata getBytecodeEnhancementMetadataPojo(PersistentClass persistentClass, RuntimeModelCreationContext creationContext, Set<String> idAttributeNames, CompositeType nonAggregatedCidMapper, boolean collectionsInDefaultFetchGroupEnabled) {
+		return BytecodeEnhancementMetadataPojoImpl.from(
+				persistentClass,
+				idAttributeNames,
+				nonAggregatedCidMapper,
+				collectionsInDefaultFetchGroupEnabled,
+				creationContext.getMetadata()
+		);
+	}
+
 	private static boolean writePropertyValue(OnExecutionGenerator generator) {
 		final boolean writePropertyValue = generator.writePropertyValue();
 		// TODO: move this validation somewhere else!