Upgrade Hibernate ORM to 7.0.0.Alpha2

DavideD · DavideD · commit d35f44532089 · 2024-06-06T14:25:56.000+02:00
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/metamodel/mapping/internal/ReactiveToOneAttributeMapping.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/metamodel/mapping/internal/ReactiveToOneAttributeMapping.java
@@ -81,13 +81,15 @@ protected EntityFetch buildEntityDelayedFetch(
 			ToOneAttributeMapping fetchedAttribute,
 			NavigablePath navigablePath,
 			DomainResult<?> keyResult,
-			boolean selectByUniqueKey) {
+			boolean selectByUniqueKey,
+			DomainResultCreationState creationState) {
 		return new ReactiveEntityDelayedFetchImpl(
 				fetchParent,
 				fetchedAttribute,
 				navigablePath,
 				keyResult,
-				selectByUniqueKey
+				selectByUniqueKey,
+				creationState
 		);
 	}
 
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/internal/ReactiveNamedObjectRepositoryImpl.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/internal/ReactiveNamedObjectRepositoryImpl.java
@@ -22,6 +22,8 @@
 import org.hibernate.reactive.query.sql.spi.ReactiveNamedNativeQueryMemento;
 import org.hibernate.reactive.query.sql.spi.ReactiveNamedSqmQueryMemento;
 
+import jakarta.persistence.TypedQueryReference;
+
 public class ReactiveNamedObjectRepositoryImpl implements NamedObjectRepository {
 
 	private final NamedObjectRepository delegate;
@@ -31,12 +33,17 @@ public ReactiveNamedObjectRepositoryImpl(NamedObjectRepository delegate) {
 	}
 
 	@Override
-	public NamedSqmQueryMemento getSqmQueryMemento(String queryName) {
+	public <R> Map<String, TypedQueryReference<R>> getNamedQueries(Class<R> resultType) {
+		return delegate.getNamedQueries( resultType );
+	}
+
+	@Override
+	public NamedSqmQueryMemento<?> getSqmQueryMemento(String queryName) {
 		return wrapSqmQueryMemento( delegate.getSqmQueryMemento( queryName ) );
 	}
 
 	@Override
-	public void visitSqmQueryMementos(Consumer<NamedSqmQueryMemento> action) {
+	public void visitSqmQueryMementos(Consumer<NamedSqmQueryMemento<?>> action) {
 		delegate.visitSqmQueryMementos( action );
 	}
 
@@ -46,12 +53,12 @@ public void registerSqmQueryMemento(String name, NamedSqmQueryMemento descriptor
 	}
 
 	@Override
-	public NamedNativeQueryMemento getNativeQueryMemento(String queryName) {
+	public NamedNativeQueryMemento<?> getNativeQueryMemento(String queryName) {
 		return wrapNativeQueryMemento( delegate.getNativeQueryMemento( queryName ) );
 	}
 
 	@Override
-	public void visitNativeQueryMementos(Consumer<NamedNativeQueryMemento> action) {
+	public void visitNativeQueryMementos(Consumer<NamedNativeQueryMemento<?>> action) {
 		delegate.visitNativeQueryMementos( action );
 	}
 
@@ -101,11 +108,11 @@ public void validateNamedQueries(QueryEngine queryEngine) {
 	}
 
 	@Override
-	public NamedQueryMemento resolve(
+	public NamedQueryMemento<?> resolve(
 			SessionFactoryImplementor sessionFactory,
 			MetadataImplementor bootMetamodel,
 			String registrationName) {
-		return wrap(delegate.resolve( sessionFactory, bootMetamodel, registrationName ));
+		return wrap( delegate.resolve( sessionFactory, bootMetamodel, registrationName ) );
 	}
 
 	@Override
@@ -118,17 +125,19 @@ public void close() {
 		delegate.close();
 	}
 
-	private static NamedQueryMemento wrap(final NamedQueryMemento namedQueryMemento) {
+	private static NamedQueryMemento<?> wrap(final NamedQueryMemento<?> namedQueryMemento) {
 		if ( namedQueryMemento == null ) {
 			return null;
-		} else if( namedQueryMemento instanceof  NamedSqmQueryMemento ) {
-			return wrapSqmQueryMemento( (NamedSqmQueryMemento) namedQueryMemento );
-		} else {
-			return wrapNativeQueryMemento( (NamedNativeQueryMemento) namedQueryMemento );
+		}
+		else if ( namedQueryMemento instanceof NamedSqmQueryMemento ) {
+			return wrapSqmQueryMemento( (NamedSqmQueryMemento<?>) namedQueryMemento );
+		}
+		else {
+			return wrapNativeQueryMemento( (NamedNativeQueryMemento<?>) namedQueryMemento );
 		}
 	}
 
-	private static NamedSqmQueryMemento wrapSqmQueryMemento(final NamedSqmQueryMemento sqmQueryMemento) {
+	private static NamedSqmQueryMemento<?> wrapSqmQueryMemento(final NamedSqmQueryMemento<?> sqmQueryMemento) {
 		if ( sqmQueryMemento == null ) {
 			return null;
 		}
@@ -141,7 +150,7 @@ else if ( sqmQueryMemento instanceof ReactiveNamedSqmQueryMemento ) {
 		}
 	}
 
-	private static NamedNativeQueryMemento wrapNativeQueryMemento(final NamedNativeQueryMemento nativeQueryMemento) {
+	private static NamedNativeQueryMemento<?> wrapNativeQueryMemento(final NamedNativeQueryMemento<?> nativeQueryMemento) {
 		if ( nativeQueryMemento == null ) {
 			return null;
 		}
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sql/spi/ReactiveNamedNativeQueryMemento.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sql/spi/ReactiveNamedNativeQueryMemento.java
@@ -19,14 +19,19 @@
 /**
  * @see NamedNativeQueryMemento
  */
-public class ReactiveNamedNativeQueryMemento implements NamedNativeQueryMemento {
+public class ReactiveNamedNativeQueryMemento<E> implements NamedNativeQueryMemento<E> {
 
-	private final NamedNativeQueryMemento delegate;
+	private final NamedNativeQueryMemento<E> delegate;
 
-	public ReactiveNamedNativeQueryMemento(NamedNativeQueryMemento delegate) {
+	public ReactiveNamedNativeQueryMemento(NamedNativeQueryMemento<E> delegate) {
 		this.delegate = delegate;
 	}
 
+	@Override
+	public Class<? extends E> getResultType() {
+		return delegate.getResultType();
+	}
+
 	@Override
 	public String getSqlString() {
 		return delegate.getSqlString();
@@ -63,23 +68,23 @@ public Integer getMaxResults() {
 	}
 
 	@Override
-	public <T> NativeQueryImplementor<T> toQuery(SharedSessionContractImplementor session) {
-		return new ReactiveNativeQueryImpl<T>( this, session );
+	public NativeQueryImplementor<E> toQuery(SharedSessionContractImplementor session) {
+		return new ReactiveNativeQueryImpl<>( this, session );
 	}
 
 	@Override
 	public <T> NativeQueryImplementor<T> toQuery(SharedSessionContractImplementor session, Class<T> resultType) {
-		return new ReactiveNativeQueryImpl<T>( this, resultType, session );
+		return new ReactiveNativeQueryImpl<>( this, resultType, session );
 	}
 
 	@Override
 	public <T> NativeQueryImplementor<T> toQuery(SharedSessionContractImplementor session, String resultSetMapping) {
-		return new ReactiveNativeQueryImpl<T>( this, resultSetMapping, session );
+		return new ReactiveNativeQueryImpl<>( this, resultSetMapping, session );
 	}
 
 	@Override
-	public NamedNativeQueryMemento makeCopy(String name) {
-		return new ReactiveNamedNativeQueryMemento( delegate.makeCopy( name ) );
+	public NamedNativeQueryMemento<E> makeCopy(String name) {
+		return new ReactiveNamedNativeQueryMemento<>( delegate.makeCopy( name ) );
 	}
 
 	@Override
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sql/spi/ReactiveNamedSqmQueryMemento.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sql/spi/ReactiveNamedSqmQueryMemento.java
@@ -26,17 +26,22 @@
 /**
  * @see org.hibernate.query.sql.spi.NamedNativeQueryMemento
  */
-public class ReactiveNamedSqmQueryMemento implements NamedSqmQueryMemento {
+public class ReactiveNamedSqmQueryMemento<E> implements NamedSqmQueryMemento<E> {
 
-	private final NamedSqmQueryMemento delegate;
+	private final NamedSqmQueryMemento<E> delegate;
 
-	public ReactiveNamedSqmQueryMemento(NamedSqmQueryMemento delegate) {
+	public ReactiveNamedSqmQueryMemento(NamedSqmQueryMemento<E> delegate) {
 		Objects.requireNonNull( delegate );
 		this.delegate = delegate;
 	}
 
 	@Override
-	public <T> SqmQueryImplementor<T> toQuery(SharedSessionContractImplementor session) {
+	public Class<? extends E> getResultType() {
+		return delegate.getResultType();
+	}
+
+	@Override
+	public SqmQueryImplementor<E> toQuery(SharedSessionContractImplementor session) {
 		return toQuery( session, null );
 	}
 
@@ -73,7 +78,7 @@ public String getHqlString() {
 	}
 
 	@Override
-	public SqmStatement<?> getSqmStatement() {
+	public SqmStatement<E> getSqmStatement() {
 		return delegate.getSqmStatement();
 	}
 
@@ -98,8 +103,8 @@ public Map<String, String> getParameterTypes() {
 	}
 
 	@Override
-	public NamedSqmQueryMemento makeCopy(String name) {
-		return new ReactiveNamedSqmQueryMemento( delegate.makeCopy( name ) );
+	public NamedSqmQueryMemento<E> makeCopy(String name) {
+		return new ReactiveNamedSqmQueryMemento<>( delegate.makeCopy( name ) );
 	}
 
 	@Override
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/results/graph/entity/internal/ReactiveEntityDelayedFetchInitializer.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/results/graph/entity/internal/ReactiveEntityDelayedFetchInitializer.java
@@ -24,6 +24,7 @@
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.results.graph.DomainResultAssembler;
 import org.hibernate.sql.results.graph.FetchParentAccess;
+import org.hibernate.sql.results.graph.basic.BasicResultAssembler;
 import org.hibernate.sql.results.graph.entity.internal.EntityDelayedFetchInitializer;
 import org.hibernate.type.Type;
 
@@ -38,8 +39,9 @@ public ReactiveEntityDelayedFetchInitializer(
 			NavigablePath fetchedNavigable,
 			ToOneAttributeMapping referencedModelPart,
 			boolean selectByUniqueKey,
-			DomainResultAssembler<?> identifierAssembler) {
-		super( parentAccess, fetchedNavigable, referencedModelPart, selectByUniqueKey, identifierAssembler );
+			DomainResultAssembler<?> identifierAssembler,
+			BasicResultAssembler<?> discriminatorAssembler) {
+		super( parentAccess, fetchedNavigable, referencedModelPart, selectByUniqueKey, identifierAssembler, discriminatorAssembler );
 		this.referencedModelPart = referencedModelPart;
 	}
 
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/results/internal/ReactiveEntityDelayedFetchImpl.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/results/internal/ReactiveEntityDelayedFetchImpl.java
@@ -10,8 +10,10 @@
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.results.graph.AssemblerCreationState;
 import org.hibernate.sql.results.graph.DomainResult;
+import org.hibernate.sql.results.graph.DomainResultCreationState;
 import org.hibernate.sql.results.graph.FetchParent;
 import org.hibernate.sql.results.graph.FetchParentAccess;
+import org.hibernate.sql.results.graph.basic.BasicResultAssembler;
 import org.hibernate.sql.results.graph.entity.EntityInitializer;
 import org.hibernate.sql.results.graph.entity.internal.EntityDelayedFetchImpl;
 
@@ -21,20 +23,25 @@ public ReactiveEntityDelayedFetchImpl(
 			ToOneAttributeMapping fetchedAttribute,
 			NavigablePath navigablePath,
 			DomainResult<?> keyResult,
-			boolean selectByUniqueKey) {
-		super( fetchParent, fetchedAttribute, navigablePath, keyResult, selectByUniqueKey );
+			boolean selectByUniqueKey,
+			DomainResultCreationState creationState) {
+		super( fetchParent, fetchedAttribute, navigablePath, keyResult, selectByUniqueKey, creationState );
 	}
 
 	@Override
 	public EntityInitializer createInitializer(FetchParentAccess parentAccess, AssemblerCreationState creationState) {
-		return new ReactiveEntityDelayedFetchInitializer( parentAccess,
-														  getNavigablePath(),
-														  getEntityValuedModelPart(),
-														  isSelectByUniqueKey(),
-														  getKeyResult().createResultAssembler(
-																  parentAccess,
-																  creationState
-														  )
+		return new ReactiveEntityDelayedFetchInitializer(
+				parentAccess,
+				getNavigablePath(),
+				getEntityValuedModelPart(),
+				isSelectByUniqueKey(),
+				getKeyResult().createResultAssembler(
+						parentAccess,
+						creationState
+				),
+				getDiscriminatorFetch() != null
+						? (BasicResultAssembler<?>) getDiscriminatorFetch().createResultAssembler( parentAccess, creationState )
+						: null
 		);
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,8 @@`
`22`	`22`	`import org.hibernate.reactive.query.sql.spi.ReactiveNamedNativeQueryMemento;`
`23`	`23`	`import org.hibernate.reactive.query.sql.spi.ReactiveNamedSqmQueryMemento;`
`24`	`24`
	`25`	`+import jakarta.persistence.TypedQueryReference;`
	`26`	`+`
`25`	`27`	`public class ReactiveNamedObjectRepositoryImpl implements NamedObjectRepository {`
`26`	`28`
`27`	`29`	`private final NamedObjectRepository delegate;`
`@@ -31,12 +33,17 @@ public ReactiveNamedObjectRepositoryImpl(NamedObjectRepository delegate) {`
`31`	`33`	`}`
`32`	`34`
`33`	`35`	`@Override`
`34`		`- public NamedSqmQueryMemento getSqmQueryMemento(String queryName) {`
	`36`	`+ public <R> Map<String, TypedQueryReference<R>> getNamedQueries(Class<R> resultType) {`
	`37`	`+ return delegate.getNamedQueries( resultType );`
	`38`	`+ }`
	`39`	`+`
	`40`	`+ @Override`
	`41`	`+ public NamedSqmQueryMemento<?> getSqmQueryMemento(String queryName) {`
`35`	`42`	`return wrapSqmQueryMemento( delegate.getSqmQueryMemento( queryName ) );`
`36`	`43`	`}`
`37`	`44`
`38`	`45`	`@Override`
`39`		`- public void visitSqmQueryMementos(Consumer<NamedSqmQueryMemento> action) {`
	`46`	`+ public void visitSqmQueryMementos(Consumer<NamedSqmQueryMemento<?>> action) {`
`40`	`47`	`delegate.visitSqmQueryMementos( action );`
`41`	`48`	`}`
`42`	`49`
`@@ -46,12 +53,12 @@ public void registerSqmQueryMemento(String name, NamedSqmQueryMemento descriptor`
`46`	`53`	`}`
`47`	`54`
`48`	`55`	`@Override`
`49`		`- public NamedNativeQueryMemento getNativeQueryMemento(String queryName) {`
	`56`	`+ public NamedNativeQueryMemento<?> getNativeQueryMemento(String queryName) {`
`50`	`57`	`return wrapNativeQueryMemento( delegate.getNativeQueryMemento( queryName ) );`
`51`	`58`	`}`
`52`	`59`
`53`	`60`	`@Override`
`54`		`- public void visitNativeQueryMementos(Consumer<NamedNativeQueryMemento> action) {`
	`61`	`+ public void visitNativeQueryMementos(Consumer<NamedNativeQueryMemento<?>> action) {`
`55`	`62`	`delegate.visitNativeQueryMementos( action );`
`56`	`63`	`}`
`57`	`64`
`@@ -101,11 +108,11 @@ public void validateNamedQueries(QueryEngine queryEngine) {`
`101`	`108`	`}`
`102`	`109`
`103`	`110`	`@Override`
`104`		`- public NamedQueryMemento resolve(`
	`111`	`+ public NamedQueryMemento<?> resolve(`
`105`	`112`	`SessionFactoryImplementor sessionFactory,`
`106`	`113`	`MetadataImplementor bootMetamodel,`
`107`	`114`	`String registrationName) {`
`108`		`- return wrap(delegate.resolve( sessionFactory, bootMetamodel, registrationName ));`
	`115`	`+ return wrap( delegate.resolve( sessionFactory, bootMetamodel, registrationName ) );`
`109`	`116`	`}`
`110`	`117`
`111`	`118`	`@Override`
`@@ -118,17 +125,19 @@ public void close() {`
`118`	`125`	`delegate.close();`
`119`	`126`	`}`
`120`	`127`
`121`		`- private static NamedQueryMemento wrap(final NamedQueryMemento namedQueryMemento) {`
	`128`	`+ private static NamedQueryMemento<?> wrap(final NamedQueryMemento<?> namedQueryMemento) {`
`122`	`129`	`if ( namedQueryMemento == null ) {`
`123`	`130`	`return null;`
`124`		`- } else if( namedQueryMemento instanceof NamedSqmQueryMemento ) {`
`125`		`- return wrapSqmQueryMemento( (NamedSqmQueryMemento) namedQueryMemento );`
`126`		`- } else {`
`127`		`- return wrapNativeQueryMemento( (NamedNativeQueryMemento) namedQueryMemento );`
	`131`	`+ }`
	`132`	`+ else if ( namedQueryMemento instanceof NamedSqmQueryMemento ) {`
	`133`	`+ return wrapSqmQueryMemento( (NamedSqmQueryMemento<?>) namedQueryMemento );`
	`134`	`+ }`
	`135`	`+ else {`
	`136`	`+ return wrapNativeQueryMemento( (NamedNativeQueryMemento<?>) namedQueryMemento );`
`128`	`137`	`}`
`129`	`138`	`}`
`130`	`139`
`131`		`- private static NamedSqmQueryMemento wrapSqmQueryMemento(final NamedSqmQueryMemento sqmQueryMemento) {`
	`140`	`+ private static NamedSqmQueryMemento<?> wrapSqmQueryMemento(final NamedSqmQueryMemento<?> sqmQueryMemento) {`
`132`	`141`	`if ( sqmQueryMemento == null ) {`
`133`	`142`	`return null;`
`134`	`143`	`}`
`@@ -141,7 +150,7 @@ else if ( sqmQueryMemento instanceof ReactiveNamedSqmQueryMemento ) {`
`141`	`150`	`}`
`142`	`151`	`}`
`143`	`152`
`144`		`- private static NamedNativeQueryMemento wrapNativeQueryMemento(final NamedNativeQueryMemento nativeQueryMemento) {`
	`153`	`+ private static NamedNativeQueryMemento<?> wrapNativeQueryMemento(final NamedNativeQueryMemento<?> nativeQueryMemento) {`
`145`	`154`	`if ( nativeQueryMemento == null ) {`
`146`	`155`	`return null;`
`147`	`156`	`}`