diff --git a/src/main/java/com/avaje/ebean/Ebean.java b/src/main/java/com/avaje/ebean/Ebean.java index b01595123..d1777b792 100644 --- a/src/main/java/com/avaje/ebean/Ebean.java +++ b/src/main/java/com/avaje/ebean/Ebean.java @@ -750,14 +750,6 @@ public final class Ebean { serverMgr.getDefaultServer().deleteAll(beanType, ids); } - /** - * Delete all the beans from an Iterator. - */ - @Deprecated - public static int delete(Iterator it) throws OptimisticLockException { - return serverMgr.getDefaultServer().delete(it); - } - /** * Delete all the beans from a Collection. */ diff --git a/src/main/java/com/avaje/ebean/EbeanServer.java b/src/main/java/com/avaje/ebean/EbeanServer.java index f65c6978b..fea19cfef 100644 --- a/src/main/java/com/avaje/ebean/EbeanServer.java +++ b/src/main/java/com/avaje/ebean/EbeanServer.java @@ -1223,14 +1223,6 @@ public interface EbeanServer { */ void delete(Object bean) throws OptimisticLockException; - /** - * Deprecated - please change to iterate yourself and delete. - * - * Delete all the beans from an Iterator. - */ - @Deprecated - int delete(Iterator it) throws OptimisticLockException; - /** * Deprecated - please migrate to deleteAll(). * 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 c1ba6530a..8499bfae3 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java +++ b/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java @@ -1795,14 +1795,6 @@ public final class DefaultServer implements SpiEbeanServer { persister.delete(checkEntityBean(bean), t); } - /** - * Delete all the beans in the iterator. - */ - @Override - public int delete(Iterator it) { - return deleteAllInternal(it, null); - } - /** * 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 f9032cb15..d4f7ba0c7 100644 --- a/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java +++ b/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java @@ -488,11 +488,6 @@ public class TDSpiEbeanServer implements SpiEbeanServer { } - @Override - public int delete(Iterator it) throws OptimisticLockException { - return 0; - } - @Override public int delete(Collection c) throws OptimisticLockException { return 0;