From 2dbb2d991155b5904f09aae8ea06432a8c393b5a Mon Sep 17 00:00:00 2001 From: Robin Bygrave Date: Mon, 20 Jul 2015 10:43:37 +1200 Subject: [PATCH] #333 - Remove deprecated method - save(Iterator it) ... change to iterate yourself and save() --- src/main/java/com/avaje/ebean/Ebean.java | 10 ---------- src/main/java/com/avaje/ebean/EbeanServer.java | 8 -------- .../avaje/ebeaninternal/server/core/DefaultServer.java | 8 -------- .../com/avaje/ebeaninternal/api/TDSpiEbeanServer.java | 5 ----- 4 files changed, 31 deletions(-) diff --git a/src/main/java/com/avaje/ebean/Ebean.java b/src/main/java/com/avaje/ebean/Ebean.java index 91499a30d..b01595123 100644 --- a/src/main/java/com/avaje/ebean/Ebean.java +++ b/src/main/java/com/avaje/ebean/Ebean.java @@ -656,16 +656,6 @@ public final class Ebean { serverMgr.getDefaultServer().updateAll(beans); } - /** - * Deprecated - please change to iterate yourself and save(). - * - * Save all the beans from an Iterator. - */ - @Deprecated - public static int save(Iterator iterator) throws OptimisticLockException { - return serverMgr.getDefaultServer().save(iterator); - } - /** * Save 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 d3eb57459..f65c6978b 100644 --- a/src/main/java/com/avaje/ebean/EbeanServer.java +++ b/src/main/java/com/avaje/ebean/EbeanServer.java @@ -1209,14 +1209,6 @@ public interface EbeanServer { */ void save(Object bean) throws OptimisticLockException; - /** - * Deprecated - please change to iterate yourself and save. - * - * Save all the beans in the iterator. - */ - @Deprecated - int save(Iterator it) throws OptimisticLockException; - /** * Save all the beans in the collection. */ 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 13ad6c77d..c1ba6530a 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java +++ b/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java @@ -1681,14 +1681,6 @@ public final class DefaultServer implements SpiEbeanServer { } } - /** - * Perform an update or insert on each bean in the iterator. Returns the - * number of beans that where saved. - */ - public int save(Iterator it) { - return saveAllInternal(it, null); - } - /** * Perform an update or insert on each bean in the collection. Returns the * number of beans that where saved. diff --git a/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java b/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java index dae2ef661..f9032cb15 100644 --- a/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java +++ b/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java @@ -483,11 +483,6 @@ public class TDSpiEbeanServer implements SpiEbeanServer { } - @Override - public int save(Iterator it) throws OptimisticLockException { - return 0; - } - @Override public void delete(Object bean) throws OptimisticLockException {