two fixes to Session API

1. add Session.getFactory() and StatelessSession.getFactory()
2. fix the signature of mergeAll()

Author: gavinking

hibernate-reactive-core/src/main/java/org/hibernate/reactive/mutiny/Mutiny.java

@@ -684,7 +684,7 @@ default <T> Uni<T> find(Class<T> entityClass, Object id, LockModeType lockModeTy
 		 *
 		 * @see #merge(Object)
 		 */
-		<T> Uni<Void> mergeAll(T... entities);
+		Uni<Void> mergeAll(Object... entities);
 
 		/**
 		 * Re-read the state of the given instance from the underlying database.
@@ -1352,6 +1352,11 @@ default Session setCacheRetrieveMode(CacheRetrieveMode cacheRetrieveMode) {
 		 * @return false if {@link #close()} has been called
 		 */
 		boolean isOpen();
+
+		/**
+		 * The {@link SessionFactory} which created this session.
+		 */
+		SessionFactory getFactory();
 	}
 
 	/**
@@ -1755,6 +1760,11 @@ default Uni<Void> refresh(Object entity, LockModeType lockModeType) {
 		 * connection.
 		 */
 		Uni<Void> close();
+
+		/**
+		 * The {@link SessionFactory} which created this session.
+		 */
+		SessionFactory getFactory();
 	}
 
 	/**

hibernate-reactive-core/src/main/java/org/hibernate/reactive/mutiny/impl/MutinySessionImpl.java

@@ -258,8 +258,7 @@ public <T> Uni<T> merge(T entity) {
 	}
 
 	@Override
-	@SafeVarargs
-	public final <T> Uni<Void> mergeAll(T... entity) {
+	public final Uni<Void> mergeAll(Object... entity) {
 		return uni( () -> applyToAll( delegate::reactiveMerge, entity ) );
 	}
 
@@ -523,6 +522,11 @@ public boolean isOpen() {
 		return delegate.isOpen();
 	}
 
+	@Override
+	public Mutiny.SessionFactory getFactory() {
+		return factory;
+	}
+
 	@Override
 	public <T> ResultSetMapping<T> getResultSetMapping(Class<T> resultType, String mappingName) {
 		return delegate.getResultSetMapping( resultType, mappingName );

hibernate-reactive-core/src/main/java/org/hibernate/reactive/mutiny/impl/MutinyStatelessSessionImpl.java

@@ -268,6 +268,11 @@ public boolean isOpen() {
 		return delegate.isOpen();
 	}
 
+	@Override
+	public MutinySessionFactoryImpl getFactory() {
+		return factory;
+	}
+
 	@Override
 	public <T> ResultSetMapping<T> getResultSetMapping(Class<T> resultType, String mappingName) {
 		return delegate.getResultSetMapping( resultType, mappingName );

hibernate-reactive-core/src/main/java/org/hibernate/reactive/stage/Stage.java

@@ -701,7 +701,7 @@ default <T> CompletionStage<T> find(Class<T> entityClass, Object id, LockModeTyp
 		 *
 		 * @see #merge(Object)
 		 */
-		<T> CompletionStage<Void> merge(T... entities);
+		CompletionStage<Void> merge(Object... entities);
 
 		/**
 		 * Re-read the state of the given instance from the underlying database.
@@ -1390,6 +1390,11 @@ default Session setCacheRetrieveMode(CacheRetrieveMode cacheRetrieveMode) {
 		 * @return false if {@link #close()} has been called
 		 */
 		boolean isOpen();
+
+		/**
+		 * The {@link SessionFactory} which created this session.
+		 */
+		SessionFactory getFactory();
 	}
 
 	/**
@@ -1802,6 +1807,11 @@ default CompletionStage<Void> refresh(Object entity, LockModeType lockModeType)
 		 * connection.
 		 */
 		CompletionStage<Void> close();
+
+		/**
+		 * The {@link SessionFactory} which created this session.
+		 */
+		SessionFactory getFactory();
 	}
 
 	/**

hibernate-reactive-core/src/main/java/org/hibernate/reactive/stage/impl/StageSessionImpl.java

@@ -179,8 +179,8 @@ public <T> CompletionStage<T> merge(T entity) {
 		return delegate.reactiveMerge( entity );
 	}
 
-	@Override @SafeVarargs
-	public final <T> CompletionStage<Void> merge(T... entity) {
+	@Override
+	public final CompletionStage<Void> merge(Object... entity) {
 		return applyToAll( delegate::reactiveMerge, entity );
 	}
 
@@ -460,6 +460,11 @@ public boolean isOpen() {
 		return delegate.isOpen();
 	}
 
+	@Override
+	public Stage.SessionFactory getFactory() {
+		return delegate.getFactory().unwrap( Stage.SessionFactory.class );
+	}
+
 	@Override
 	public <T> ResultSetMapping<T> getResultSetMapping(Class<T> resultType, String mappingName) {
 		return delegate.getResultSetMapping( resultType, mappingName );

hibernate-reactive-core/src/main/java/org/hibernate/reactive/stage/impl/StageStatelessSessionImpl.java

@@ -141,6 +141,11 @@ public boolean isOpen() {
 		return delegate.isOpen();
 	}
 
+	@Override
+	public Stage.SessionFactory getFactory() {
+		return delegate.getFactory().unwrap( Stage.SessionFactory.class );
+	}
+
 	private Transaction<?> currentTransaction;
 
 	@Override

hibernate-reactive-core/src/test/java/org/hibernate/reactive/MutinySessionTest.java

@@ -520,6 +520,16 @@ public void reactiveClose(VertxTestContext context) {
 		);
 	}
 
+	@Test void testFactory(VertxTestContext context) {
+		test( context, getMutinySessionFactory().withSession( session -> {
+			session.getFactory().getCache().evictAll();
+			session.getFactory().getMetamodel().entity(GuineaPig.class);
+			session.getFactory().getCriteriaBuilder().createQuery(GuineaPig.class);
+			session.getFactory().getStatistics().isStatisticsEnabled();
+			return Uni.createFrom().voidItem();
+		} ) );
+	}
+
 	@Test
 	public void testMetamodel() {
 		EntityType<GuineaPig> pig = getSessionFactory().getMetamodel().entity(GuineaPig.class);

hibernate-reactive-core/src/test/java/org/hibernate/reactive/ReactiveSessionTest.java

@@ -14,6 +14,7 @@
 import org.hibernate.reactive.common.AffectedEntities;
 import org.hibernate.reactive.stage.Stage;
 
+import org.hibernate.reactive.util.impl.CompletionStages;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
@@ -770,6 +771,16 @@ public void testMetamodel() {
 		assertEquals( "GuineaPig", pig.getName() );
 	}
 
+	@Test void testFactory(VertxTestContext context) {
+		test( context, getSessionFactory().withSession( session -> {
+			session.getFactory().getCache().evictAll();
+			session.getFactory().getMetamodel().entity(GuineaPig.class);
+			session.getFactory().getCriteriaBuilder().createQuery(GuineaPig.class);
+			session.getFactory().getStatistics().isStatisticsEnabled();
+			return CompletionStages.voidFuture();
+		} ) );
+	}
+
 	@Test
 	public void testTransactionPropagation(VertxTestContext context) {
 		test( context, getSessionFactory().withTransaction(