From b8a2aac95a2dab3bb3f6ae205cee39dec8d391c6 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Mon, 20 Jul 2015 10:59:52 +1200
Subject: [PATCH] #336 - Remove deprecated method - delete(Iterator<?> it,
 Transaction transaction)

---
 src/main/java/com/avaje/ebean/EbeanServer.java            | 8 --------
 .../avaje/ebeaninternal/server/core/DefaultServer.java    | 5 -----
 .../com/avaje/ebeaninternal/api/TDSpiEbeanServer.java     | 7 +------
 3 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/src/main/java/com/avaje/ebean/EbeanServer.java b/src/main/java/com/avaje/ebean/EbeanServer.java
index 89c7c04cf..534bd1252 100644
--- a/src/main/java/com/avaje/ebean/EbeanServer.java
+++ b/src/main/java/com/avaje/ebean/EbeanServer.java
@@ -1271,14 +1271,6 @@ public interface EbeanServer {
    */
   void delete(Object bean, Transaction transaction) throws OptimisticLockException;
 
-  /**
-   * Deprecated - please migrate to iterate yourself and delete().
-   *
-   * Delete all the beans from an iterator.
-   */
-  @Deprecated
-  int delete(Iterator<?> it, Transaction transaction) throws OptimisticLockException;
-
   /**
    * Execute a Sql Update Delete or Insert statement. This returns the number of
    * rows that where updated, deleted or inserted. If is executed in batch then
diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java b/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java
index 303591dc3..5aab4c2af 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java
@@ -1795,11 +1795,6 @@ public final class DefaultServer implements SpiEbeanServer {
     persister.delete(checkEntityBean(bean), t);
   }
 
-  @Override
-  public int delete(Iterator<?> it, Transaction transaction) throws OptimisticLockException {
-    return deleteAllInternal(it, transaction);
-  }
-
   /**
    * Delete all the beans in the collection.
    */
diff --git a/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java b/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java
index e95c95178..4d701b412 100644
--- a/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java
+++ b/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java
@@ -637,12 +637,7 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
   public void delete(Object bean, Transaction t) throws OptimisticLockException {
 
   }
-
-  @Override
-  public int delete(Iterator<?> it, Transaction t) throws OptimisticLockException {
-    return 0;
-  }
-
+  
   @Override
   public int execute(SqlUpdate updSql, Transaction t) {
     return 0;