From edbe173546b61ea4edd71aa72abed4ef93c601ac Mon Sep 17 00:00:00 2001
From: Davide D'Alto <davide@hibernate.org>
Date: Tue, 31 Oct 2023 15:26:24 +0100
Subject: [PATCH] [#36582] Minor clean up around lambdas

---
 .../panache/common/runtime/SessionOperations.java  | 14 +++++---------
 .../reactive/panache/TransactionalUniAsserter.java |  2 +-
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/extensions/panache/hibernate-reactive-panache-common/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/common/runtime/SessionOperations.java b/extensions/panache/hibernate-reactive-panache-common/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/common/runtime/SessionOperations.java
index 5f9dcc14f15872..d2345e63cb5f74 100644
--- a/extensions/panache/hibernate-reactive-panache-common/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/common/runtime/SessionOperations.java
+++ b/extensions/panache/hibernate-reactive-panache-common/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/common/runtime/SessionOperations.java
@@ -85,9 +85,7 @@ static <T> Uni<T> withSessionOnDemand(Supplier<Uni<T>> work) {
      * @return a new {@link Uni}
      */
     public static <T> Uni<T> withTransaction(Supplier<Uni<T>> work) {
-        return withSession(s -> {
-            return s.withTransaction(t -> work.get());
-        });
+        return withSession(s -> s.withTransaction(t -> work.get()));
     }
 
     /**
@@ -98,9 +96,7 @@ public static <T> Uni<T> withTransaction(Supplier<Uni<T>> work) {
      * @return a new {@link Uni}
      */
     public static <T> Uni<T> withTransaction(Function<Transaction, Uni<T>> work) {
-        return withSession(s -> {
-            return s.withTransaction(t -> work.apply(t));
-        });
+        return withSession(s -> s.withTransaction(work));
     }
 
     /**
@@ -122,8 +118,8 @@ public static <T> Uni<T> withSession(Function<Mutiny.Session, Uni<T>> work) {
             return getSessionFactory()
                     .openSession()
                     .invoke(s -> context.putLocal(key, s))
-                    .chain(s -> work.apply(s))
-                    .eventually(() -> closeSession());
+                    .chain(work::apply)
+                    .eventually(SessionOperations::closeSession);
         }
     }
 
@@ -152,7 +148,7 @@ public static Uni<Mutiny.Session> getSession() {
             if (context.getLocal(SESSION_ON_DEMAND_KEY) != null) {
                 if (context.getLocal(SESSION_ON_DEMAND_OPENED_KEY) != null) {
                     // a new reactive session is opened in a previous stage
-                    return Uni.createFrom().item(() -> getCurrentSession());
+                    return Uni.createFrom().item(SessionOperations::getCurrentSession);
                 } else {
                     // open a new reactive session and store it in the vertx duplicated context
                     // the context was marked as "lazy" which means that the session will be eventually closed
diff --git a/test-framework/hibernate-reactive-panache/src/main/java/io/quarkus/test/hibernate/reactive/panache/TransactionalUniAsserter.java b/test-framework/hibernate-reactive-panache/src/main/java/io/quarkus/test/hibernate/reactive/panache/TransactionalUniAsserter.java
index c93868235de1d4..9fec68942d2321 100644
--- a/test-framework/hibernate-reactive-panache/src/main/java/io/quarkus/test/hibernate/reactive/panache/TransactionalUniAsserter.java
+++ b/test-framework/hibernate-reactive-panache/src/main/java/io/quarkus/test/hibernate/reactive/panache/TransactionalUniAsserter.java
@@ -20,7 +20,7 @@ public final class TransactionalUniAsserter extends UniAsserterInterceptor {
 
     @Override
     protected <T> Supplier<Uni<T>> transformUni(Supplier<Uni<T>> uniSupplier) {
-        return () -> SessionOperations.withTransaction(() -> uniSupplier.get());
+        return () -> SessionOperations.withTransaction(uniSupplier);
     }
 
 }
\ No newline at end of file