HHH-17377 - Migrate to JPA 3.2

https://hibernate.atlassian.net/browse/HHH-17377 Now on to 73 test compile errors :)
hibernate · Mar 28, 2024 · 83d29e2 · 83d29e2
1 parent c54da51
commit 83d29e2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 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
@@ -554,12 +554,12 @@ public <T> List<EntityGraph<? super T>> getEntityGraphs(Class<T> entityClass) {
 
 	@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
@@ -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
@@ -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/...amodel-generator/src/main/java/org/hibernate/processor/validation/MockSessionFactory.java b/...amodel-generator/src/main/java/org/hibernate/processor/validation/MockSessionFactory.java
@@ -773,7 +773,7 @@ public MockJpaMetamodelImpl() {
 		}
 
 		@Override
-		public <X> EntityDomainType<X> entity(String entityName) {
+		public EntityDomainType<?> entity(String entityName) {
 			if ( isEntityDefined(entityName) ) {
 				return new MockEntityDomainType<>(entityName);
 			}