#335 - Remove deprecated method - delete(Collection<?> beans) ... migrate to deleteAll()

This commit is contained in:
Robin Bygrave
2015-07-20 10:54:18 +12:00
parent b10c68489f
commit 7b090a6346
6 changed files with 2 additions and 31 deletions
-8
View File
@@ -750,14 +750,6 @@ public final class Ebean {
serverMgr.getDefaultServer().deleteAll(beanType, ids);
}
/**
* Delete all the beans from a Collection.
*/
@Deprecated
public static int delete(Collection<?> beans) throws OptimisticLockException {
return serverMgr.getDefaultServer().deleteAll(beans);
}
/**
* Delete all the beans in the Collection.
*/
@@ -1223,14 +1223,6 @@ public interface EbeanServer {
*/
void delete(Object bean) throws OptimisticLockException;
/**
* Deprecated - please migrate to deleteAll().
*
* Delete all the beans in the collection.
*/
@Deprecated
int delete(Collection<?> beans) throws OptimisticLockException;
/**
* Delete all the beans in the collection.
*/
@@ -1795,14 +1795,6 @@ public final class DefaultServer implements SpiEbeanServer {
persister.delete(checkEntityBean(bean), t);
}
/**
* Delete all the beans in the collection.
*/
@Override
public int delete(Collection<?> beans) {
return deleteAllInternal(beans.iterator(), null);
}
@Override
public int delete(Iterator<?> it, Transaction transaction) throws OptimisticLockException {
return deleteAllInternal(it, transaction);
@@ -488,11 +488,6 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
}
@Override
public int delete(Collection<?> c) throws OptimisticLockException {
return 0;
}
@Override
public int delete(Class<?> beanType, Object id) {
return 0;
@@ -32,7 +32,7 @@ import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocMany;
public class TestOnCascadeDeleteChildrenWithCompositeKeys extends BaseTestCase {
@Before public void before() {
// remove all the User records first
Ebean.delete(Ebean.find(User.class).findList());
Ebean.deleteAll(Ebean.find(User.class).findList());
// insert 2 User records
Ebean.save(new User(1L));
@@ -44,7 +44,7 @@ public class TestM2MDeleteWithCascade extends BaseTestCase {
Assert.assertEquals("roles not deleted", 2, rc);
Ebean.delete(roles);
Ebean.deleteAll(roles);
rc = Ebean.find(MRole.class).where().idIn(roleIds).findRowCount();