isTransactional(..) to Route, support for jooby-ebean.

imeszaros · imeszaros · commit 3499e5b5dd6a · 2020-08-31T14:12:20.000+02:00
diff --git a/jooby/src/main/java/io/jooby/Context.java b/jooby/src/main/java/io/jooby/Context.java
@@ -5,7 +5,6 @@
  */
 package io.jooby;
 
-import io.jooby.annotations.Transactional;
 import io.jooby.internal.ReadOnlyContext;
 import io.jooby.internal.WebSocketSender;
 
@@ -1284,33 +1283,6 @@ public interface Context extends Registry {
    */
   @Nonnull Context onComplete(@Nonnull Route.Complete task);
 
-  /* **********************************************************************************************
-   * Default methods
-   * **********************************************************************************************
-   */
-
-  /**
-   * Returns whether the matched route is marked as transactional, or returns
-   * {@code defaultValue} if the route has not been marked explicitly.
-   *
-   * @param defaultValue the value to return if the route was not explicitly marked
-   * @return whether the route should be considered as transactional
-   */
-  default boolean isTransactional(boolean defaultValue) {
-    Object attribute = getRoute().attribute(Transactional.ATTRIBUTE);
-
-    if (attribute == null) {
-      return defaultValue;
-    }
-
-    if (attribute instanceof Boolean) {
-      return (Boolean) attribute;
-    }
-
-    throw new RuntimeException("Invalid value for route attribute "
-        + Transactional.ATTRIBUTE + ": " + attribute);
-  }
-
   /* **********************************************************************************************
    * Factory methods
    * **********************************************************************************************
diff --git a/jooby/src/main/java/io/jooby/Route.java b/jooby/src/main/java/io/jooby/Route.java
@@ -5,6 +5,7 @@
  */
 package io.jooby;
 
+import io.jooby.annotations.Transactional;
 import io.jooby.exception.MethodNotAllowedException;
 import io.jooby.exception.NotAcceptableException;
 import io.jooby.exception.NotFoundException;
@@ -971,6 +972,28 @@ public boolean isHttpHead() {
     return setDescription(description);
   }
 
+  /**
+   * Returns whether this route is marked as transactional, or returns
+   * {@code defaultValue} if this route has not been marked explicitly.
+   *
+   * @param defaultValue the value to return if this route was not explicitly marked
+   * @return whether this route should be considered as transactional
+   */
+  public boolean isTransactional(boolean defaultValue) {
+    Object attribute = attribute(Transactional.ATTRIBUTE);
+
+    if (attribute == null) {
+      return defaultValue;
+    }
+
+    if (attribute instanceof Boolean) {
+      return (Boolean) attribute;
+    }
+
+    throw new RuntimeException("Invalid value for route attribute "
+        + Transactional.ATTRIBUTE + ": " + attribute);
+  }
+
   @Override public String toString() {
     return method + " " + pattern;
   }
diff --git a/jooby/src/main/java/io/jooby/annotations/Transactional.java b/jooby/src/main/java/io/jooby/annotations/Transactional.java
@@ -12,8 +12,8 @@
 
 /**
  * Useful together with the various route decorators like {@code TransactionalRequest}
- * provided by extensions {@code jooby-hibernate} or {@code jooby-jdbi} to toggle it's
- * effect for a single route.
+ * provided by extensions {@code jooby-hibernate}, {@code jooby-jdbi} or {@code jooby-ebean}
+ * to toggle it's effect for a single route.
  * <p>
  * Although {@code TransactionalRequest} is configured to be enabled by default,
  * for a route method annotated with {@code @Transactional(false)} it won't take effect.
diff --git a/modules/jooby-ebean/src/main/java/io/jooby/ebean/TransactionalRequest.java b/modules/jooby-ebean/src/main/java/io/jooby/ebean/TransactionalRequest.java
@@ -9,6 +9,7 @@
 import io.ebean.Transaction;
 import io.jooby.Route;
 import io.jooby.ServiceKey;
+import io.jooby.annotations.Transactional;
 
 import javax.annotation.Nonnull;
 
@@ -22,6 +23,8 @@ public class TransactionalRequest implements Route.Decorator {
 
   private ServiceKey<Database> key;
 
+  private boolean enabledByDefault = true;
+
   /**
    * Creates a transactional request.
    *
@@ -40,13 +43,33 @@ public TransactionalRequest() {
     key = ServiceKey.key(Database.class);
   }
 
+  /**
+   * Sets whether all routes in the scope of this decorator instance
+   * should be transactional or not ({@code true} by default).
+   * <p>
+   * You can use the {@link Transactional} annotation to override this
+   * option on a single route.
+   *
+   * @param enabledByDefault whether routes should be transactional by default
+   * @return this instance
+   * @see Transactional
+   */
+  public TransactionalRequest enabledByDefault(boolean enabledByDefault) {
+    this.enabledByDefault = enabledByDefault;
+    return this;
+  }
+
   @Nonnull @Override public Route.Handler apply(@Nonnull Route.Handler next) {
     return ctx -> {
-      Database db = ctx.require(key);
-      try (Transaction transaction = db.beginTransaction()) {
-        Object result = next.apply(ctx);
-        transaction.commit();
-        return result;
+      if (ctx.getRoute().isTransactional(enabledByDefault)) {
+        Database db = ctx.require(key);
+        try (Transaction transaction = db.beginTransaction()) {
+          Object result = next.apply(ctx);
+          transaction.commit();
+          return result;
+        }
+      } else {
+        return next.apply(ctx);
       }
     };
   }
diff --git a/modules/jooby-hibernate/src/main/java/io/jooby/hibernate/TransactionalRequest.java b/modules/jooby-hibernate/src/main/java/io/jooby/hibernate/TransactionalRequest.java
@@ -97,7 +97,7 @@ public TransactionalRequest enabledByDefault(boolean enabledByDefault) {
 
   @Nonnull @Override public Route.Handler apply(@Nonnull Route.Handler next) {
     return sessionRequest.apply(ctx -> {
-      if (ctx.isTransactional(enabledByDefault)) {
+      if (ctx.getRoute().isTransactional(enabledByDefault)) {
         SessionFactory sessionFactory = ctx.require(sessionRequest.getSessionFactoryKey());
         Transaction trx = null;
         try {
diff --git a/modules/jooby-jdbi/src/main/java/io/jooby/jdbi/TransactionalRequest.java b/modules/jooby-jdbi/src/main/java/io/jooby/jdbi/TransactionalRequest.java
@@ -109,7 +109,7 @@ public TransactionalRequest enabledByDefault(boolean enabledByDefault) {
 
   @Nonnull @Override public Route.Handler apply(@Nonnull Route.Handler next) {
     return ctx -> {
-      if (ctx.isTransactional(enabledByDefault)) {
+      if (ctx.getRoute().isTransactional(enabledByDefault)) {
         Jdbi jdbi = ctx.require(key);
         try (Handle handle = jdbi.open()) {
           RequestScope.bind(jdbi, handle);
