refactor out a single buildStructuredCacheEntry() helper method

Author: gavinking

hibernate-core/src/main/java/org/hibernate/action/internal/EntityInsertAction.java

@@ -22,6 +22,8 @@
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.stat.internal.StatsHelper;
 
+import static org.hibernate.cache.spi.entry.CacheEntryHelper.buildStructuredCacheEntry;
+
 /**
  * The action for performing an entity insertion, for entities not defined to use {@code IDENTITY} generation.
  *
@@ -163,7 +165,7 @@ protected void putCacheIfNecessary() {
 		final var session = getSession();
 		if ( isCachePutEnabled( persister, session ) ) {
 			final var factory = session.getFactory();
-			cacheEntry = buildStructuredCacheEntry();
+			cacheEntry = buildStructuredCacheEntry( getInstance(), version, getState(), persister, session );
 			final var cache = persister.getCacheAccessStrategy();
 			final Object cacheKey = cache.generateCacheKey( getId(), persister, factory, session.getTenantIdentifier() );
 			final boolean put = cacheInsert( persister, cacheKey );
@@ -178,12 +180,6 @@ protected void putCacheIfNecessary() {
 		}
 	}
 
-	private Object buildStructuredCacheEntry() {
-		final var persister = getPersister();
-		final var cacheEntry = persister.buildCacheEntry( getInstance(), getState(), version, getSession() );
-		return persister.getCacheEntryStructure().structure( cacheEntry );
-	}
-
 	protected boolean cacheInsert(EntityPersister persister, Object cacheKey) {
 		final var session = getSession();
 		final var eventMonitor = session.getEventMonitor();

hibernate-core/src/main/java/org/hibernate/action/internal/EntityUpdateAction.java

@@ -27,6 +27,7 @@
 import org.hibernate.stat.internal.StatsHelper;
 import org.hibernate.type.TypeHelper;
 
+import static org.hibernate.cache.spi.entry.CacheEntryHelper.buildStructuredCacheEntry;
 import static org.hibernate.engine.internal.Versioning.getVersion;
 
 /**
@@ -224,7 +225,7 @@ protected void updateCacheItem(Object previousVersion, Object cacheKey, EntityEn
 			}
 			else if ( session.getCacheMode().isPutEnabled() ) {
 				//TODO: inefficient if that cache is just going to ignore the updated state!
-				cacheEntry = buildStructuredCacheEntry();
+				cacheEntry = buildStructuredCacheEntry( getInstance(), nextVersion, state, persister, session );
 				final boolean put = updateCache( persister, previousVersion, cacheKey );
 
 				final var statistics = session.getFactory().getStatistics();
@@ -238,12 +239,6 @@ else if ( session.getCacheMode().isPutEnabled() ) {
 		}
 	}
 
-	private Object buildStructuredCacheEntry() {
-		final var persister = getPersister();
-		final var cacheEntry = persister.buildCacheEntry( getInstance(), state, nextVersion, getSession() );
-		return persister.getCacheEntryStructure().structure( cacheEntry );
-	}
-
 	private static boolean isCacheInvalidationRequired(
 			EntityPersister persister,
 			SharedSessionContractImplementor session) {
@@ -471,7 +466,6 @@ protected void cacheAfterUpdate(EntityDataAccess cache, Object cacheKey, SharedS
 			}
 			eventListenerManager.cachePutEnd();
 		}
-
 	}
 
 }

hibernate-core/src/main/java/org/hibernate/cache/spi/entry/CacheEntryHelper.java

@@ -6,15 +6,18 @@
 
 import java.io.Serializable;
 
+import org.hibernate.Internal;
 import org.hibernate.bytecode.enhance.spi.LazyPropertyInitializer;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.property.access.internal.PropertyAccessStrategyBackRefImpl;
 import org.hibernate.type.Type;
 
 /**
  * Operations for assembly and disassembly of an array of property values.
  */
-class CacheEntryHelper {
+@Internal
+public class CacheEntryHelper {
 
 	/**
 	 * Apply the {@link Type#disassemble} operation across a series of values.
@@ -27,7 +30,7 @@ class CacheEntryHelper {
 	 *
 	 * @return The disassembled state
 	 */
-	public static Serializable[] disassemble(
+	static Serializable[] disassemble(
 			final Object[] row,
 			final Type[] types,
 			final boolean[] nonCacheable,
@@ -57,7 +60,7 @@ else if ( isPlaceholder( row[i] ) ) {
 	 * @param owner The entity "owning" the values
 	 * @return The assembled state
 	 */
-	public static Object[] assemble(
+	static Object[] assemble(
 			final Serializable[] row,
 			final Type[] types,
 			final SharedSessionContractImplementor session,
@@ -79,4 +82,13 @@ private static boolean isPlaceholder(Object value) {
 			|| value == PropertyAccessStrategyBackRefImpl.UNKNOWN;
 	}
 
+	public static Object buildStructuredCacheEntry(
+			Object entity,
+			Object version,
+			Object[] state,
+			EntityPersister persister,
+			SharedSessionContractImplementor session) {
+		return persister.getCacheEntryStructure()
+				.structure( persister.buildCacheEntry( entity, state, version, session ) );
+	}
 }

hibernate-core/src/main/java/org/hibernate/internal/OptimisticLockHelper.java

@@ -15,6 +15,8 @@
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.stat.internal.StatsHelper;
 
+import static org.hibernate.cache.spi.entry.CacheEntryHelper.buildStructuredCacheEntry;
+
 public final class OptimisticLockHelper {
 
 	private OptimisticLockHelper() {
@@ -91,16 +93,6 @@ else if ( session.getCacheMode().isPutEnabled() ) {
 		return null;
 	}
 
-	private static Object buildStructuredCacheEntry(
-			Object entity,
-			Object nextVersion,
-			Object[] state,
-			EntityPersister persister,
-			SharedSessionContractImplementor session) {
-		final var cacheEntry = persister.buildCacheEntry( entity, state, nextVersion, session );
-		return persister.getCacheEntryStructure().structure( cacheEntry );
-	}
-
 	private static boolean updateCache(
 			EntityPersister persister,
 			Object cacheEntry,