HHH-18689 query cache reproducer

hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityInitializerImpl.java

@@ -1087,6 +1087,12 @@ protected void resolveEntityInstance1(EntityInitializerData data) {
 			}
 			else {
 				data.setInstance( proxy );
+				/* uncommenting this branch fixes my situation (but might break others)
+				if ( data.entityHolder.isInitialized() ) {
+					data.setState( State.INITIALIZED );
+					data.entityInstanceForNotify = data.entityHolder.getEntity();
+				}
+				else */
 				if ( Hibernate.isInitialized( proxy ) ) {
 					data.setState( State.INITIALIZED );
 					data.entityInstanceForNotify = Hibernate.unproxy( proxy );

hibernate-core/src/test/java/org/hibernate/orm/test/cache/QueryCacheIncompleteTest.java

@@ -0,0 +1,114 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.cache;
+
+import org.hibernate.CacheMode;
+import org.hibernate.Session;
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+import org.hibernate.cfg.AvailableSettings;
+
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@DomainModel(annotatedClasses = {
+		QueryCacheIncompleteTest.Admin.class,
+})
+@SessionFactory
+@ServiceRegistry(
+		settings = {
+				@Setting(name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "true"),
+				@Setting(name = AvailableSettings.USE_QUERY_CACHE, value = "true"),
+				@Setting(name = AvailableSettings.QUERY_CACHE_LAYOUT, value = "FULL")
+		}
+)
+@JiraKey(value = "HHH-18689")
+public class QueryCacheIncompleteTest {
+
+	private Long adminId;
+
+	@BeforeAll
+	public void setUp(SessionFactoryScope scope) {
+		adminId = scope.fromTransaction(
+				session -> {
+					Admin admin = new Admin();
+					admin.setAge( 42 );
+					session.persist( admin );
+					return admin.getId();
+				}
+		);
+	}
+
+	@Test
+	void testQueryWithEmbeddableParameter(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+					// load uninitialized proxy
+					session.getReference( Admin.class, adminId );
+					// load entity
+					var multiLoader = session.byMultipleIds( Admin.class );
+					multiLoader.with( CacheMode.NORMAL );
+					multiLoader.multiLoad( adminId );
+
+					// store in query cache
+					Admin admin = queryAdmin( session );
+					assertThat( admin.getAge() ).isEqualTo( 42 );
+				}
+		);
+
+		scope.inTransaction(
+				session -> {
+					// use query cache
+					Admin admin = queryAdmin( session );
+					assertThat( admin.getAge() ).isEqualTo( 42 );
+				}
+		);
+	}
+
+	private Admin queryAdmin(Session s) {
+		return s.createQuery( "from Admin", Admin.class ).setCacheable( true ).getSingleResult();
+	}
+
+	@Entity(name = "Admin")
+	@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
+	public static class Admin {
+
+		@Id
+		@GeneratedValue
+		private Long id;
+
+		@Column(nullable = false)
+		private int age;
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public int getAge() {
+			return age;
+		}
+
+		public void setAge(int age) {
+			this.age = age;
+		}
+	}
+}