From f96ce11c73d90aa077e75514059303fbb80acd22 Mon Sep 17 00:00:00 2001 From: Robin Bygrave Date: Mon, 20 Jul 2015 11:11:45 +1200 Subject: [PATCH] #338 - Remove deprecated method - save(Iterator it, Transaction transaction) ... please change to iterate yourself and save. --- src/main/java/com/avaje/ebean/EbeanServer.java | 7 ------- .../com/avaje/ebeaninternal/server/core/DefaultServer.java | 5 ----- .../java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java | 7 +------ 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/src/main/java/com/avaje/ebean/EbeanServer.java b/src/main/java/com/avaje/ebean/EbeanServer.java index 417a855c8..80b1b9585 100644 --- a/src/main/java/com/avaje/ebean/EbeanServer.java +++ b/src/main/java/com/avaje/ebean/EbeanServer.java @@ -1394,13 +1394,6 @@ public interface EbeanServer { */ void save(Object bean, Transaction transaction) throws OptimisticLockException; - /** - * Deprecated - please change to iterate yourself and save. - * Save all the beans in the iterator with an explicit transaction. - */ - @Deprecated - int save(Iterator it, Transaction transaction) throws OptimisticLockException; - /** * Deprecated - please migrate to saveAll(). * 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 cf54032bd..8e4b68fdb 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java +++ b/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java @@ -1689,11 +1689,6 @@ public final class DefaultServer implements SpiEbeanServer { return saveAllInternal(c.iterator(), t); } - @Override - public int save(Iterator it, Transaction transaction) throws OptimisticLockException { - return saveAllInternal(it, transaction); - } - @Override public int saveAll(Collection beans, Transaction transaction) throws OptimisticLockException { return saveAllInternal(beans.iterator(), transaction); diff --git a/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java b/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java index 18b49e5f6..eae141912 100644 --- a/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java +++ b/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java @@ -532,12 +532,7 @@ public class TDSpiEbeanServer implements SpiEbeanServer { public void save(Object bean, Transaction transaction) throws OptimisticLockException { } - - @Override - public int save(Iterator it, Transaction transaction) throws OptimisticLockException { - return 0; - } - + @Override public int save(Collection beans, Transaction transaction) throws OptimisticLockException { return 0;