From 88a13c5416592c822a685e5e14bd0ffa0154c098 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 5 Oct 2017 01:24:53 +1300
Subject: [PATCH] #1154 - Remove deprecated TxCallable and TxRunnable - migrate
 to use Callable and Runnable

---
 src/main/java/io/ebean/Ebean.java       | 16 --------
 src/main/java/io/ebean/EbeanServer.java | 16 --------
 src/main/java/io/ebean/TxCallable.java  | 51 -------------------------
 src/main/java/io/ebean/TxRunnable.java  | 42 --------------------
 4 files changed, 125 deletions(-)
 delete mode 100644 src/main/java/io/ebean/TxCallable.java
 delete mode 100644 src/main/java/io/ebean/TxRunnable.java

diff --git a/src/main/java/io/ebean/Ebean.java b/src/main/java/io/ebean/Ebean.java
index 24b53596f..f01b74490 100644
--- a/src/main/java/io/ebean/Ebean.java
+++ b/src/main/java/io/ebean/Ebean.java
@@ -1241,14 +1241,6 @@ public final class Ebean {
     return serverMgr.getDefaultServer().executeCall(scope, c);
   }
 
-  /**
-   * Deprecated - please migrate to executeCall().
-   */
-  @Deprecated
-  public static <T> T execute(TxScope scope, TxCallable<T> c) {
-    return serverMgr.getDefaultServer().executeCall(scope, c);
-  }
-
   /**
    * Execute a Callable in a Transaction with the default scope.
    * <p>
@@ -1282,14 +1274,6 @@ public final class Ebean {
     return serverMgr.getDefaultServer().executeCall(c);
   }
 
-  /**
-   * Deprecated - please migrate to executeCall().
-   */
-  @Deprecated
-  public static <T> T execute(TxCallable<T> c) {
-    return serverMgr.getDefaultServer().execute(c);
-  }
-
   /**
    * Inform Ebean that tables have been modified externally. These could be the
    * result of from calling a stored procedure, other JDBC calls or external
diff --git a/src/main/java/io/ebean/EbeanServer.java b/src/main/java/io/ebean/EbeanServer.java
index f5ab82eeb..75316bf0f 100644
--- a/src/main/java/io/ebean/EbeanServer.java
+++ b/src/main/java/io/ebean/EbeanServer.java
@@ -1665,14 +1665,6 @@ public interface EbeanServer {
    */
   <T> T executeCall(TxScope scope, Callable<T> callable);
 
-  /**
-   * Deprecated - please migrate to executeCall().
-   */
-  @Deprecated
-  default <T> T execute(TxScope scope, TxCallable<T> callable) {
-    return executeCall(scope, callable);
-  }
-
   /**
    * Execute a TxCallable in a Transaction with the default scope.
    * <p>
@@ -1701,14 +1693,6 @@ public interface EbeanServer {
    */
   <T> T executeCall(Callable<T> callable);
 
-  /**
-   * Deprecated - please migrate to executeCall().
-   */
-  @Deprecated
-  default <T> T execute(TxCallable<T> callable) {
-    return executeCall(null, callable);
-  }
-
   /**
    * Return the manager of the server cache ("L2" cache).
    */
diff --git a/src/main/java/io/ebean/TxCallable.java b/src/main/java/io/ebean/TxCallable.java
deleted file mode 100644
index e3278b720..000000000
--- a/src/main/java/io/ebean/TxCallable.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package io.ebean;
-
-import java.util.concurrent.Callable;
-
-/**
- * Deprecated - please migrate to just using Callable instead with executeCall().
- *
- * Execute a TxCallable in a Transaction scope.
- * <p>
- * Use this with the {@link Ebean#executeCall(Callable)} method.
- * </p>
- * <p>
- * Note that this is basically the same as TxRunnable except that it returns an
- * Object (and you specify the return type via generics).
- * </p>
- * <p>
- * See also {@link TxRunnable}.
- * </p>
- * <p>
- * <pre>{@code
- *
- * Ebean.execute(new TxCallable<String>() {
- *   public String call() {
- *     User u1 = Ebean.find(User.class, 1);
- *     User u2 = Ebean.find(User.class, 2);
- *
- *     u1.setName("u1 mod");
- *     u2.setName("u2 mod");
- *
- *     Ebean.save(u1);
- *     Ebean.save(u2);
- *
- *     return u1.getEmail();
- *   }
- * });
- *
- * }</pre>
- */
-@Deprecated
-public interface TxCallable<T> extends Callable<T> {
-
-  /**
-   * Execute the method within a transaction scope returning the result.
-   * <p>
-   * If you do not want to return a result you should look to use TxRunnable
-   * instead.
-   * </p>
-   */
-  @Override
-  T call();
-}
diff --git a/src/main/java/io/ebean/TxRunnable.java b/src/main/java/io/ebean/TxRunnable.java
deleted file mode 100644
index e66a00af3..000000000
--- a/src/main/java/io/ebean/TxRunnable.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package io.ebean;
-
-/**
- * Deprecated - please migrate to using just Runnable.
- *
- *
- * Execute a TxRunnable in a Transaction scope.
- * <p>
- * Use this with the {@link Ebean#execute(Runnable)} method.
- * </p>
- * <p>
- * <pre>{@code
- *
- * // this run method runs in a transaction scope
- * // which by default is TxScope.REQUIRED
- *
- * Ebean.execute(new TxRunnable() {
- *   public void run() {
- *     User u1 = Ebean.find(User.class, 1);
- *     User u2 = Ebean.find(User.class, 2);
- *
- *     u1.setName("u1 mod");
- *     u2.setName("u2 mod");
- *
- *     Ebean.save(u1);
- *     Ebean.save(u2);
- *   }
- * });
- *
- * }</pre>
- *
- * @see TxCallable
- */
-@Deprecated
-public interface TxRunnable extends Runnable {
-
-  /**
-   * Run the method in a transaction sope.
-   */
-  @Override
-  void run();
-}