add IdentifierLoadAccess.withReadOnly()

adding this to the other XxxxLoadAccess interfaces is much harder,
but this one is easy

Author: gavinking

hibernate-core/src/main/java/org/hibernate/IdentifierLoadAccess.java

@@ -36,6 +36,13 @@ public interface IdentifierLoadAccess<T> {
 	 */
 	IdentifierLoadAccess<T> with(CacheMode cacheMode);
 
+	/**
+	 * Specify whether the entity should be loaded in read-only mode.
+	 *
+	 * @see Session#setDefaultReadOnly(boolean)
+	 */
+	IdentifierLoadAccess<T> withReadOnly(boolean readOnly);
+
 	default IdentifierLoadAccess<T> with(RootGraph<T> graph) {
 		return with( graph, GraphSemantic.LOAD );
 	}

hibernate-core/src/main/java/org/hibernate/LockOptions.java

@@ -116,9 +116,7 @@ public LockOptions setLockMode(LockMode lockMode) {
 	 * @param lockMode The lock mode to apply to the given alias
 	 * @return this LockRequest instance for operation chaining.
 	 *
-	 * @see Query#setLockMode(String, LockMode)
-	 * @see Criteria#setLockMode(LockMode)
-	 * @see Criteria#setLockMode(String, LockMode)
+	 * @see org.hibernate.query.Query#setLockMode(String, LockMode)
 	 */
 	public LockOptions setAliasSpecificLockMode(String alias, LockMode lockMode) {
 		if ( aliasSpecificLockModes == null ) {

hibernate-core/src/main/java/org/hibernate/loader/access/IdentifierLoadAccessImpl.java

@@ -40,6 +40,7 @@ public class IdentifierLoadAccessImpl<T> implements IdentifierLoadAccess<T>, Jav
 
 	private LockOptions lockOptions;
 	private CacheMode cacheMode;
+	private Boolean readOnly;
 	private RootGraphImplementor<T> rootGraph;
 	private GraphSemantic graphSemantic;
 
@@ -60,6 +61,12 @@ public IdentifierLoadAccess<T> with(CacheMode cacheMode) {
 		return this;
 	}
 
+	@Override
+	public IdentifierLoadAccess<T> withReadOnly(boolean readOnly) {
+		this.readOnly = readOnly;
+		return this;
+	}
+
 	@Override
 	public IdentifierLoadAccess<T> with(RootGraph<T> graph, GraphSemantic semantic) {
 		this.rootGraph = (RootGraphImplementor<T>) graph;
@@ -122,21 +129,21 @@ protected T doGetReference(Object id) {
 			id = entityPersister.getIdentifierMapping().getJavaTypeDescriptor().coerce( id, this );
 		}
 
+		String entityName = entityPersister.getEntityName();
+		Boolean readOnly = this.readOnly != null ? this.readOnly : loadQueryInfluencers.getReadOnly();
+
 		if ( this.lockOptions != null ) {
-			LoadEvent event = new LoadEvent( id, entityPersister.getEntityName(), lockOptions, eventSource, loadQueryInfluencers.getReadOnly() );
+			LoadEvent event = new LoadEvent( id, entityName, lockOptions, eventSource, readOnly );
 			context.fireLoad( event, LoadEventListener.LOAD );
 			return (T) event.getResult();
 		}
 
-		LoadEvent event = new LoadEvent( id, entityPersister.getEntityName(), false, eventSource, loadQueryInfluencers.getReadOnly() );
+		LoadEvent event = new LoadEvent( id, entityName, false, eventSource, readOnly );
 		boolean success = false;
 		try {
 			context.fireLoad( event, LoadEventListener.LOAD );
 			if ( event.getResult() == null ) {
-				session.getFactory().getEntityNotFoundDelegate().handleEntityNotFound(
-						entityPersister.getEntityName(),
-						id
-				);
+				session.getFactory().getEntityNotFoundDelegate().handleEntityNotFound( entityName, id );
 			}
 			success = true;
 			return (T) event.getResult();
@@ -167,16 +174,19 @@ protected final T doLoad(Object id) {
 			id = entityPersister.getIdentifierMapping().getJavaTypeDescriptor().coerce( id, this );
 		}
 
+		String entityName = entityPersister.getEntityName();
+		Boolean readOnly = this.readOnly != null ? this.readOnly : loadQueryInfluencers.getReadOnly();
+
 		if ( this.lockOptions != null ) {
-			LoadEvent event = new LoadEvent( id, entityPersister.getEntityName(), lockOptions, eventSource, loadQueryInfluencers.getReadOnly() );
+			LoadEvent event = new LoadEvent( id, entityName, lockOptions, eventSource, readOnly );
 			context.fireLoad( event, LoadEventListener.GET );
 			final Object result = event.getResult();
 			initializeIfNecessary( result );
 
 			return (T) result;
 		}
 
-		LoadEvent event = new LoadEvent( id, entityPersister.getEntityName(), false, eventSource, loadQueryInfluencers.getReadOnly() );
+		LoadEvent event = new LoadEvent( id, entityName, false, eventSource, readOnly );
 		boolean success = false;
 		try {
 			context.fireLoad( event, LoadEventListener.GET );
@@ -206,17 +216,15 @@ private void initializeIfNecessary(Object result) {
 			if ( initializer.isUninitialized() ) {
 				initializer.initialize();
 			}
-			return;
 		}
-
-		final BytecodeEnhancementMetadata enhancementMetadata = entityPersister.getEntityMetamodel().getBytecodeEnhancementMetadata();
-		if ( ! enhancementMetadata.isEnhancedForLazyLoading() ) {
-			return;
-		}
-
-		final BytecodeLazyAttributeInterceptor interceptor = enhancementMetadata.extractLazyInterceptor( result);
-		if ( interceptor instanceof EnhancementAsProxyLazinessInterceptor ) {
-			( (EnhancementAsProxyLazinessInterceptor) interceptor ).forceInitialize( result, null );
+		else {
+			final BytecodeEnhancementMetadata enhancementMetadata = entityPersister.getEntityMetamodel().getBytecodeEnhancementMetadata();
+			if ( enhancementMetadata.isEnhancedForLazyLoading() ) {
+				final BytecodeLazyAttributeInterceptor interceptor = enhancementMetadata.extractLazyInterceptor( result);
+				if ( interceptor instanceof EnhancementAsProxyLazinessInterceptor ) {
+					( (EnhancementAsProxyLazinessInterceptor) interceptor ).forceInitialize( result, null );
+				}
+			}
 		}
 	}