From b8f8cb5ae7288990f3a20d603a2c9e6b6f0be88c Mon Sep 17 00:00:00 2001 From: Robin Bygrave Date: Mon, 20 Jul 2015 11:07:52 +1200 Subject: [PATCH] #337 - Remove deprecated method - delete(Class beanType, Collection ids) ... migrate to deleteAll() --- src/main/java/com/avaje/ebean/Ebean.java | 10 -- .../java/com/avaje/ebean/EbeanServer.java | 17 --- .../server/core/DefaultServer.java | 10 -- .../ebeaninternal/api/TDSpiEbeanServer.java | 12 +- .../tests/basic/TestDeleteByIdCollection.java | 109 +++++++++--------- .../basic/delete/TestDeleteByIdList.java | 2 +- ...ascadeDeleteChildrenWithCompositeKeys.java | 3 +- .../TestDeleteByIdWithPersistenceContext.java | 2 +- 8 files changed, 60 insertions(+), 105 deletions(-) diff --git a/src/main/java/com/avaje/ebean/Ebean.java b/src/main/java/com/avaje/ebean/Ebean.java index eb0427eb7..4c0873192 100644 --- a/src/main/java/com/avaje/ebean/Ebean.java +++ b/src/main/java/com/avaje/ebean/Ebean.java @@ -733,16 +733,6 @@ public final class Ebean { return serverMgr.getDefaultServer().delete(beanType, id); } - /** - * Deprecated - please migrate to deleteAll(). - * - * Delete several beans given their type and id values. - */ - @Deprecated - public static void delete(Class beanType, Collection ids) { - serverMgr.getDefaultServer().deleteAll(beanType, ids); - } - /** * Delete several beans given their type and id values. */ diff --git a/src/main/java/com/avaje/ebean/EbeanServer.java b/src/main/java/com/avaje/ebean/EbeanServer.java index 534bd1252..417a855c8 100644 --- a/src/main/java/com/avaje/ebean/EbeanServer.java +++ b/src/main/java/com/avaje/ebean/EbeanServer.java @@ -1238,28 +1238,11 @@ public interface EbeanServer { */ int delete(Class beanType, Object id, Transaction transaction); - /** - * Deprecated - please migrate to deleteAll(). - * - * Delete several beans given their type and id values. - */ - @Deprecated - void delete(Class beanType, Collection ids); - /** * Delete several beans given their type and id values. */ void deleteAll(Class beanType, Collection ids); - /** - * Deprecated - please migrate to deleteAll(). - * - * Delete several beans given their type and id values with an explicit - * transaction. - */ - @Deprecated - void delete(Class beanType, Collection ids, Transaction transaction); - /** * Delete several beans given their type and id values 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 5aab4c2af..cf54032bd 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java +++ b/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java @@ -1750,16 +1750,6 @@ public final class DefaultServer implements SpiEbeanServer { } } - @Override - public void delete(Class beanType, Collection ids) { - deleteAll(beanType, ids, null); - } - - @Override - public void delete(Class beanType, Collection ids, Transaction transaction) { - deleteAll(beanType, ids, transaction); - } - @Override public void deleteAll(Class beanType, Collection ids) { deleteAll(beanType, ids, null); diff --git a/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java b/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java index 4d701b412..18b49e5f6 100644 --- a/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java +++ b/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java @@ -498,16 +498,6 @@ public class TDSpiEbeanServer implements SpiEbeanServer { return 0; } - @Override - public void delete(Class beanType, Collection ids) { - - } - - @Override - public void delete(Class beanType, Collection ids, Transaction transaction) { - - } - @Override public int execute(SqlUpdate updSql) { return 0; @@ -637,7 +627,7 @@ public class TDSpiEbeanServer implements SpiEbeanServer { public void delete(Object bean, Transaction t) throws OptimisticLockException { } - + @Override public int execute(SqlUpdate updSql, Transaction t) { return 0; diff --git a/src/test/java/com/avaje/tests/basic/TestDeleteByIdCollection.java b/src/test/java/com/avaje/tests/basic/TestDeleteByIdCollection.java index 2b029e45f..60167f2c4 100644 --- a/src/test/java/com/avaje/tests/basic/TestDeleteByIdCollection.java +++ b/src/test/java/com/avaje/tests/basic/TestDeleteByIdCollection.java @@ -15,63 +15,64 @@ import com.avaje.tests.model.basic.ResetBasicData; public class TestDeleteByIdCollection extends BaseTestCase { @Test - public void test() { - - ResetBasicData.reset(); - - Customer c0 = ResetBasicData.createCustomer("del1", "del1 ship", "del1 bill", 1); - Customer c1 = ResetBasicData.createCustomer("del2", "del2 ship", "del2 bill", 2); - - Ebean.save(c0); - Ebean.save(c1); + public void test() { - Customer c0Back = Ebean.find(Customer.class, c0.getId()); - Customer c1Back = Ebean.find(Customer.class, ""+c1.getId()); + ResetBasicData.reset(); - Assert.assertNotNull(c0Back); - Assert.assertNotNull(c1Back); - - List ids = new ArrayList(); - // also test id type conversion - ids.add(""+c0.getId()); - ids.add(""+c1.getId()); - - - Ebean.delete(Customer.class, ids); - - c0Back = Ebean.find(Customer.class, c0.getId()); - c1Back = Ebean.find(Customer.class, ""+c1.getId()); - - Assert.assertNull(c0Back); - Assert.assertNull(c1Back); - } - - public void testDelByStatement() { + Customer c0 = ResetBasicData.createCustomer("del1", "del1 ship", "del1 bill", 1); + Customer c1 = ResetBasicData.createCustomer("del2", "del2 ship", "del2 bill", 2); - ResetBasicData.reset(); - - Order order0 = ResetBasicData.createOrderCustAndOrder("delBySql 0"); - Order order1 = ResetBasicData.createOrderCustAndOrder("delBySql 1"); - - Order o0Back = Ebean.find(Order.class, order0.getId()); - Order o1Back = Ebean.find(Order.class, order1.getId()); - - Assert.assertNotNull(o0Back); - Assert.assertNotNull(o1Back); - + Ebean.save(c0); + Ebean.save(c1); - List ids = new ArrayList(); - // also test id type conversion - ids.add(order0.getId()); - ids.add(order1.getId()); + Customer c0Back = Ebean.find(Customer.class, c0.getId()); + Customer c1Back = Ebean.find(Customer.class, "" + c1.getId()); + + Assert.assertNotNull(c0Back); + Assert.assertNotNull(c1Back); + + List ids = new ArrayList(); + // also test id type conversion + ids.add("" + c0.getId()); + ids.add("" + c1.getId()); + + + Ebean.deleteAll(Customer.class, ids); + + c0Back = Ebean.find(Customer.class, c0.getId()); + c1Back = Ebean.find(Customer.class, "" + c1.getId()); + + Assert.assertNull(c0Back); + Assert.assertNull(c1Back); + } + + @Test + public void testDelByStatement() { + + ResetBasicData.reset(); + + Order order0 = ResetBasicData.createOrderCustAndOrder("delBySql 0"); + Order order1 = ResetBasicData.createOrderCustAndOrder("delBySql 1"); + + Order o0Back = Ebean.find(Order.class, order0.getId()); + Order o1Back = Ebean.find(Order.class, order1.getId()); + + Assert.assertNotNull(o0Back); + Assert.assertNotNull(o1Back); + + + List ids = new ArrayList(); + // also test id type conversion + ids.add(order0.getId()); + ids.add(order1.getId()); + + Ebean.deleteAll(Order.class, ids); + + o0Back = Ebean.find(Order.class, order0.getId()); + o1Back = Ebean.find(Order.class, order1.getId()); + + Assert.assertNull(o0Back); + Assert.assertNull(o1Back); + } - Ebean.delete(Order.class, ids); - - o0Back = Ebean.find(Order.class, order0.getId()); - o1Back = Ebean.find(Order.class, order1.getId()); - - Assert.assertNull(o0Back); - Assert.assertNull(o1Back); - } - } diff --git a/src/test/java/com/avaje/tests/basic/delete/TestDeleteByIdList.java b/src/test/java/com/avaje/tests/basic/delete/TestDeleteByIdList.java index 0ddbae880..29846f2fd 100644 --- a/src/test/java/com/avaje/tests/basic/delete/TestDeleteByIdList.java +++ b/src/test/java/com/avaje/tests/basic/delete/TestDeleteByIdList.java @@ -33,7 +33,7 @@ public class TestDeleteByIdList extends BaseTestCase { Assert.assertEquals(2, orderIds.size()); - Ebean.delete(Order.class, orderIds); + Ebean.deleteAll(Order.class, orderIds); } } diff --git a/src/test/java/com/avaje/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java b/src/test/java/com/avaje/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java index 236986541..5d08e4642 100644 --- a/src/test/java/com/avaje/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java +++ b/src/test/java/com/avaje/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java @@ -30,6 +30,7 @@ import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocMany; * @see https://groups.google.com/forum/#!topic/ebean/VD1MV2-LrOc */ public class TestOnCascadeDeleteChildrenWithCompositeKeys extends BaseTestCase { + @Before public void before() { // remove all the User records first Ebean.deleteAll(Ebean.find(User.class).findList()); @@ -59,7 +60,7 @@ public class TestOnCascadeDeleteChildrenWithCompositeKeys extends BaseTestCase { ids.add(1L); ids.add(2L); - Ebean.delete(User.class, ids); // PersistenceException would be thrown here + Ebean.deleteAll(User.class, ids); // PersistenceException would be thrown here assertEquals(0, Ebean.find(User.class).findList().size()); } diff --git a/src/test/java/com/avaje/tests/delete/TestDeleteByIdWithPersistenceContext.java b/src/test/java/com/avaje/tests/delete/TestDeleteByIdWithPersistenceContext.java index e5e49f8cf..248430501 100644 --- a/src/test/java/com/avaje/tests/delete/TestDeleteByIdWithPersistenceContext.java +++ b/src/test/java/com/avaje/tests/delete/TestDeleteByIdWithPersistenceContext.java @@ -29,7 +29,7 @@ public class TestDeleteByIdWithPersistenceContext extends BaseTestCase { server.find(Product.class, prod1.getId()); server.find(Product.class, prod2.getId()); - server.delete(Product.class, Arrays.asList(prod1.getId(), prod2.getId())); + server.deleteAll(Product.class, Arrays.asList(prod1.getId(), prod2.getId())); // are these found in the persistence context? Product shadow1 = server.find(Product.class, prod1.getId());