From 3495461a9c2957cfd09eefacb83b4e52b489b22c Mon Sep 17 00:00:00 2001
From: Steve Ebersole <steve@hibernate.org>
Date: Wed, 1 Nov 2023 19:54:34 -0500
Subject: [PATCH] HHH-17377 - Migrate to JPA 3.2

https://hibernate.atlassian.net/browse/HHH-17377

Now on to 73 test compile errors :)
---
 .../java/org/hibernate/engine/spi/SessionLazyDelegator.java   | 4 ++--
 .../src/main/java/org/hibernate/query/QueryProducer.java      | 2 +-
 .../org/hibernate/query/spi/QueryProducerImplementor.java     | 2 +-
 .../hibernate/processor/validation/MockSessionFactory.java    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionLazyDelegator.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionLazyDelegator.java
index 2ac5a28a27..ef1bfc9318 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionLazyDelegator.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionLazyDelegator.java
@@ -554,12 +554,12 @@ public class SessionLazyDelegator implements Session {
 
 	@Override
 	public <C> void runWithConnection(ConnectionConsumer<C> action) {
-
+		this.lazySession.get().runWithConnection( action );
 	}
 
 	@Override
 	public <C, T> T callWithConnection(ConnectionFunction<C, T> function) {
-		return null;
+		return this.lazySession.get().callWithConnection( function );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/query/QueryProducer.java b/hibernate-core/src/main/java/org/hibernate/query/QueryProducer.java
index fdc20dcdb2..d46f101aa7 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/QueryProducer.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/QueryProducer.java
@@ -164,7 +164,7 @@ public interface QueryProducer {
 	 *
 	 * @see jakarta.persistence.EntityManager#createNativeQuery(String,Class)
 	 */
-	<R> NativeQuery<R> createNativeQuery(String sqlString, Class<R> resultClass);
+	NativeQuery<?> createNativeQuery(String sqlString, Class<?> resultClass);
 
 	/**
 	 * Create a {@link NativeQuery} instance for the given native SQL query
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryProducerImplementor.java b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryProducerImplementor.java
index bc4d1bf984..62e5871457 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryProducerImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryProducerImplementor.java
@@ -48,7 +48,7 @@ public interface QueryProducerImplementor extends QueryProducer {
 	NativeQueryImplementor createNativeQuery(String sqlString);
 
 	@Override
-	<R> NativeQueryImplementor<R> createNativeQuery(String sqlString, Class<R> resultClass);
+	NativeQueryImplementor<?> createNativeQuery(String sqlString, Class<?> resultClass);
 
 	@Override
 	<R> NativeQueryImplementor<R> createNativeQuery(String sqlString, Class<R> resultClass, String tableAlias);
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockSessionFactory.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockSessionFactory.java
index 103cd5c579..9408230e83 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockSessionFactory.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockSessionFactory.java
@@ -794,7 +794,7 @@ public abstract class MockSessionFactory
 		}
 
 		@Override
-		public <X> EntityDomainType<X> entity(String entityName) {
+		public EntityDomainType<?> entity(String entityName) {
 			if ( isEntityDefined(entityName) ) {
 				return new MockEntityDomainType<>(entityName);
 			}