Avoid recursive wrapping of ReactiveResultSetMappingProcessor

Author: Sanne

hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/internal/ReactiveNamedObjectRepositoryImpl.java

@@ -32,10 +32,7 @@ public ReactiveNamedObjectRepositoryImpl(NamedObjectRepository delegate) {
 
 	@Override
 	public NamedSqmQueryMemento getSqmQueryMemento(String queryName) {
-		NamedSqmQueryMemento sqmQueryMemento = delegate.getSqmQueryMemento( queryName );
-		return sqmQueryMemento == null
-				? null
-				: new ReactiveNamedSqmQueryMemento( sqmQueryMemento );
+		return wrap( delegate.getSqmQueryMemento( queryName ) );
 	}
 
 	@Override
@@ -50,10 +47,7 @@ public void registerSqmQueryMemento(String name, NamedSqmQueryMemento descriptor
 
 	@Override
 	public NamedNativeQueryMemento getNativeQueryMemento(String queryName) {
-		NamedNativeQueryMemento nativeQueryMemento = delegate.getNativeQueryMemento( queryName );
-		return nativeQueryMemento == null
-				? null
-				: new ReactiveNamedNativeQueryMemento( nativeQueryMemento );
+		return wrap( delegate.getNativeQueryMemento( queryName ) );
 	}
 
 	@Override
@@ -123,4 +117,31 @@ public void prepare(SessionFactoryImplementor sessionFactory, Metadata bootMetam
 	public void close() {
 		delegate.close();
 	}
+
+	private static NamedSqmQueryMemento wrap(final NamedSqmQueryMemento sqmQueryMemento) {
+		if ( sqmQueryMemento == null ) {
+			return null;
+		}
+		//Avoid nested wrapping!
+		else if ( sqmQueryMemento instanceof ReactiveNamedSqmQueryMemento ) {
+			return sqmQueryMemento;
+		}
+		else {
+			return new ReactiveNamedSqmQueryMemento( sqmQueryMemento );
+		}
+	}
+
+	private static NamedNativeQueryMemento wrap(final NamedNativeQueryMemento nativeQueryMemento) {
+		if ( nativeQueryMemento == null ) {
+			return null;
+		}
+		//Avoid nested wrapping!
+		else if ( nativeQueryMemento instanceof ReactiveNamedNativeQueryMemento ) {
+			return nativeQueryMemento;
+		}
+		else {
+			return new ReactiveNamedNativeQueryMemento( nativeQueryMemento );
+		}
+	}
+
 }

hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/internal/ReactiveResultSetMappingProcessor.java

@@ -18,7 +18,20 @@ public ReactiveResultSetMappingProcessor(ResultSetMapping resultSetMapping, Sess
 
 	@Override
 	public ResultSetMapping generateResultMapping(boolean queryHadAliases) {
-		ResultSetMapping resultSetMapping = super.generateResultMapping( queryHadAliases );
-		return new ReactiveResultSetMapping( resultSetMapping );
+		return wrap( super.generateResultMapping( queryHadAliases ) );
 	}
+
+	private static ResultSetMapping wrap(final ResultSetMapping resultSetMapping) {
+		if ( resultSetMapping == null ) {
+			return null;
+		}
+		//Avoid nested wrapping!
+		else if ( resultSetMapping instanceof ReactiveResultSetMapping ) {
+			return resultSetMapping;
+		}
+		else {
+			return new ReactiveResultSetMapping( resultSetMapping );
+		}
+	}
+
 }