Skip to content

Commit

Permalink
#335 - Remove deprecated method - delete(Collection<?> beans) ... mig…
Browse files Browse the repository at this point in the history
…rate to deleteAll()
  • Loading branch information
rbygrave committed Jul 19, 2015
1 parent b10c684 commit 7b090a6
Show file tree
Hide file tree
Showing 6 changed files with 2 additions and 31 deletions.
8 changes: 0 additions & 8 deletions src/main/java/com/avaje/ebean/Ebean.java
Original file line number Diff line number Diff line change
Expand Up @@ -750,14 +750,6 @@ public static void deleteAll(Class<?> beanType, Collection<?> ids) {
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.
*/
Expand Down
8 changes: 0 additions & 8 deletions src/main/java/com/avaje/ebean/EbeanServer.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1795,14 +1795,6 @@ public void delete(Object bean, Transaction t) {
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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -488,11 +488,6 @@ public void delete(Object bean) throws OptimisticLockException {

}

@Override
public int delete(Collection<?> c) throws OptimisticLockException {
return 0;
}

@Override
public int delete(Class<?> beanType, Object id) {
return 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
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));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public void test() {

Assert.assertEquals("roles not deleted", 2, rc);

Ebean.delete(roles);
Ebean.deleteAll(roles);

rc = Ebean.find(MRole.class).where().idIn(roleIds).findRowCount();

Expand Down

0 comments on commit 7b090a6

Please sign in to comment.