From dbe984c66852caf7e2df580a225a8bac998d1a73 Mon Sep 17 00:00:00 2001 From: Robin Bygrave Date: Mon, 20 Jul 2015 11:22:16 +1200 Subject: [PATCH] #341 - Remove deprecated method - insert(Collection beans); ... migrate to insertAll() --- src/main/java/com/avaje/ebean/Ebean.java | 10 ---------- src/main/java/com/avaje/ebean/EbeanServer.java | 17 ----------------- .../server/core/DefaultServer.java | 12 +----------- .../ebeaninternal/api/TDSpiEbeanServer.java | 10 ---------- 4 files changed, 1 insertion(+), 48 deletions(-) diff --git a/src/main/java/com/avaje/ebean/Ebean.java b/src/main/java/com/avaje/ebean/Ebean.java index 8d1e6f94b..88e975c60 100644 --- a/src/main/java/com/avaje/ebean/Ebean.java +++ b/src/main/java/com/avaje/ebean/Ebean.java @@ -557,16 +557,6 @@ public final class Ebean { public static void insert(Object bean) { serverMgr.getDefaultServer().insert(bean); } - - /** - * Deprecated - please migrate to insertAll(). - * - * Insert a collection of beans. - */ - @Deprecated - public static void insert(Collection beans) { - serverMgr.getDefaultServer().insertAll(beans); - } /** * Insert a collection of beans. diff --git a/src/main/java/com/avaje/ebean/EbeanServer.java b/src/main/java/com/avaje/ebean/EbeanServer.java index 08c3f2d11..1fe6b7393 100644 --- a/src/main/java/com/avaje/ebean/EbeanServer.java +++ b/src/main/java/com/avaje/ebean/EbeanServer.java @@ -1504,29 +1504,12 @@ public interface EbeanServer { */ void insert(Object bean, Transaction transaction); - /** - * Deprecated - please migrate to insertAll(). - * - * Insert a collection of beans. If there is no current transaction one is created and used to - * insert all the beans in the collection. - */ - @Deprecated - void insert(Collection beans); - /** * Insert a collection of beans. If there is no current transaction one is created and used to * insert all the beans in the collection. */ void insertAll(Collection beans); - /** - * Deprecated - please migrate to insertAll(). - * - * Insert a collection of beans with an explicit transaction. - */ - @Deprecated - void insert(Collection beans, Transaction transaction); - /** * Insert a collection of beans with an explicit transaction. */ 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 65c437da3..84ee791f9 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java +++ b/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java @@ -1495,7 +1495,7 @@ public final class DefaultServer implements SpiEbeanServer { public void updateAll(Collection beans) throws OptimisticLockException { updateAll(beans, null); } - + /** * Update all beans in the collection with an explicit transaction. */ @@ -1541,16 +1541,6 @@ public final class DefaultServer implements SpiEbeanServer { insertAll(beans, null); } - @Override - public void insert(Collection beans) { - insertAll(beans, null); - } - - @Override - public void insert(Collection beans, Transaction transaction) { - insertAll(beans, transaction); - } - /** * Insert all beans in the collection with a transaction. */ diff --git a/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java b/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java index fec1eb346..e540746df 100644 --- a/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java +++ b/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java @@ -563,16 +563,6 @@ public class TDSpiEbeanServer implements SpiEbeanServer { } - @Override - public void insert(Collection beans) { - - } - - @Override - public void insert(Collection beans, Transaction t) { - - } - @Override public int deleteManyToManyAssociations(Object ownerBean, String propertyName) { return 0;