From 89088f9480e8fab8f2afd06e1aa13e98f19059e3 Mon Sep 17 00:00:00 2001 From: Robin Bygrave Date: Mon, 20 Jul 2015 11:18:51 +1200 Subject: [PATCH] #340 - Remove deprecated method - update(Collection beans) ... migrate to updateAll() --- src/main/java/com/avaje/ebean/Ebean.java | 10 ---------- src/main/java/com/avaje/ebean/EbeanServer.java | 17 ----------------- .../server/core/DefaultServer.java | 14 +------------- .../ebeaninternal/api/TDSpiEbeanServer.java | 10 ---------- 4 files changed, 1 insertion(+), 50 deletions(-) diff --git a/src/main/java/com/avaje/ebean/Ebean.java b/src/main/java/com/avaje/ebean/Ebean.java index 4c0873192..8d1e6f94b 100644 --- a/src/main/java/com/avaje/ebean/Ebean.java +++ b/src/main/java/com/avaje/ebean/Ebean.java @@ -639,16 +639,6 @@ public final class Ebean { serverMgr.getDefaultServer().update(bean); } - /** - * Deprecate - please migrate to updateAll(). - * - * Update the beans in the collection. - */ - @Deprecated - public static void update(Collection beans) throws OptimisticLockException { - serverMgr.getDefaultServer().updateAll(beans); - } - /** * Update the beans in the collection. */ diff --git a/src/main/java/com/avaje/ebean/EbeanServer.java b/src/main/java/com/avaje/ebean/EbeanServer.java index 336f3a497..08c3f2d11 100644 --- a/src/main/java/com/avaje/ebean/EbeanServer.java +++ b/src/main/java/com/avaje/ebean/EbeanServer.java @@ -1478,29 +1478,12 @@ public interface EbeanServer { */ void update(Object bean, Transaction transaction, boolean deleteMissingChildren) throws OptimisticLockException; - /** - * Deprecated - please migrate to updateAll(). - * - * Update a collection of beans. If there is no current transaction one is created and used to - * update all the beans in the collection. - */ - @Deprecated - void update(Collection beans) throws OptimisticLockException; - /** * Update a collection of beans. If there is no current transaction one is created and used to * update all the beans in the collection. */ void updateAll(Collection beans) throws OptimisticLockException; - /** - * Deprecated - please migrate to updateAll(). - * - * Update a collection of beans with an explicit transaction. - */ - @Deprecated - void update(Collection beans, Transaction transaction) throws OptimisticLockException; - /** * Update 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 50d1abe9a..65c437da3 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java +++ b/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java @@ -1491,23 +1491,11 @@ public final class DefaultServer implements SpiEbeanServer { persister.update(checkEntityBean(bean), t, deleteMissingChildren); } - /** - * Update all beans in the collection. - */ - public void update(Collection beans) { - updateAll(beans, null); - } - @Override public void updateAll(Collection beans) throws OptimisticLockException { updateAll(beans, null); } - - @Override - public void update(Collection beans, Transaction transaction) throws OptimisticLockException { - updateAll(beans, transaction); - } - + /** * Update all beans in the collection with an explicit transaction. */ diff --git a/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java b/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java index b6db31431..fec1eb346 100644 --- a/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java +++ b/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java @@ -553,16 +553,6 @@ public class TDSpiEbeanServer implements SpiEbeanServer { } - @Override - public void update(Collection beans) throws OptimisticLockException { - - } - - @Override - public void update(Collection beans, Transaction transaction) throws OptimisticLockException { - - } - @Override public void insert(Object bean) {