From b3b4c72a7799f24b3491f51da6f4840055ed0bd5 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Mon, 20 Jul 2015 10:39:15 +1200
Subject: [PATCH] #332 - Remove deprecated method - save(Collection<?> beans)
 ... migrate to saveAll(beans)

---
 src/main/java/com/avaje/ebean/Ebean.java               | 10 ----------
 src/main/java/com/avaje/ebean/EbeanServer.java         |  8 --------
 .../avaje/ebeaninternal/server/core/DefaultServer.java |  8 --------
 .../com/avaje/ebeaninternal/api/TDSpiEbeanServer.java  |  5 -----
 .../avaje/tests/batchinsert/TestBatchInsertSimple.java |  4 ++--
 .../com/avaje/tests/insert/TestInsertCollection.java   |  2 +-
 .../avaje/tests/transaction/TestInsertManyAndRef.java  |  2 +-
 7 files changed, 4 insertions(+), 35 deletions(-)

diff --git a/src/main/java/com/avaje/ebean/Ebean.java b/src/main/java/com/avaje/ebean/Ebean.java
index e63cfcc52..91499a30d 100644
--- a/src/main/java/com/avaje/ebean/Ebean.java
+++ b/src/main/java/com/avaje/ebean/Ebean.java
@@ -666,16 +666,6 @@ public final class Ebean {
     return serverMgr.getDefaultServer().save(iterator);
   }
 
-  /**
-   * Deprecated - please migrate to saveAll().
-   *
-   * Save all the beans from a Collection.
-   */
-  @Deprecated
-  public static int save(Collection<?> beans) throws OptimisticLockException {
-    return serverMgr.getDefaultServer().saveAll(beans);
-  }
-
   /**
    * Save all the beans from a Collection.
    */
diff --git a/src/main/java/com/avaje/ebean/EbeanServer.java b/src/main/java/com/avaje/ebean/EbeanServer.java
index 945448204..d3eb57459 100644
--- a/src/main/java/com/avaje/ebean/EbeanServer.java
+++ b/src/main/java/com/avaje/ebean/EbeanServer.java
@@ -1217,14 +1217,6 @@ public interface EbeanServer {
   @Deprecated
   int save(Iterator<?> it) throws OptimisticLockException;
 
-  /**
-   * Deprecated - please migrate to saveAll().
-   *
-   * Save all the beans in the collection.
-   */
-  @Deprecated
-  int save(Collection<?> beans) throws OptimisticLockException;
-
   /**
    * Save all the beans in the collection.
    */
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 049cd0d3d..13ad6c77d 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java
@@ -1689,14 +1689,6 @@ public final class DefaultServer implements SpiEbeanServer {
     return saveAllInternal(it, null);
   }
 
-  /**
-   * Perform an update or insert on each bean in the collection. Returns the
-   * number of beans that where saved.
-   */
-  public int save(Collection<?> c) {
-    return saveAllInternal(c.iterator(), null);
-  }
-
   /**
    * Perform an update or insert on each bean in the collection. Returns the
    * number of beans that where saved.
diff --git a/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java b/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java
index 7b9965e09..dae2ef661 100644
--- a/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java
+++ b/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java
@@ -488,11 +488,6 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
     return 0;
   }
 
-  @Override
-  public int save(Collection<?> beans) throws OptimisticLockException {
-    return 0;
-  }
-
   @Override
   public void delete(Object bean) throws OptimisticLockException {
 
diff --git a/src/test/java/com/avaje/tests/batchinsert/TestBatchInsertSimple.java b/src/test/java/com/avaje/tests/batchinsert/TestBatchInsertSimple.java
index 0cde6e621..3d3a6a3ed 100644
--- a/src/test/java/com/avaje/tests/batchinsert/TestBatchInsertSimple.java
+++ b/src/test/java/com/avaje/tests/batchinsert/TestBatchInsertSimple.java
@@ -99,7 +99,7 @@ public class TestBatchInsertSimple extends BaseTestCase {
       transaction.setBatchSize(20);
 
       // escalate based on batchOnCascade value
-      Ebean.save(masters);
+      Ebean.saveAll(masters);
 
       transaction.commit();
 
@@ -119,7 +119,7 @@ public class TestBatchInsertSimple extends BaseTestCase {
     }
 
     // escalate based on batchOnCascade value
-    Ebean.save(masters);
+    Ebean.saveAll(masters);
 
   }
 
diff --git a/src/test/java/com/avaje/tests/insert/TestInsertCollection.java b/src/test/java/com/avaje/tests/insert/TestInsertCollection.java
index 078ba233f..5e1e41260 100644
--- a/src/test/java/com/avaje/tests/insert/TestInsertCollection.java
+++ b/src/test/java/com/avaje/tests/insert/TestInsertCollection.java
@@ -54,7 +54,7 @@ public class TestInsertCollection extends BaseTestCase {
     saveList.add(cust1Check2);
     saveList.add(cust3);
     
-    Ebean.save(saveList);
+    Ebean.saveAll(saveList);
     
 
     Customer cust1Check3 = Ebean.find(Customer.class, cust1.getId());
diff --git a/src/test/java/com/avaje/tests/transaction/TestInsertManyAndRef.java b/src/test/java/com/avaje/tests/transaction/TestInsertManyAndRef.java
index 2e2a050a7..3726099f8 100644
--- a/src/test/java/com/avaje/tests/transaction/TestInsertManyAndRef.java
+++ b/src/test/java/com/avaje/tests/transaction/TestInsertManyAndRef.java
@@ -51,6 +51,6 @@ public class TestInsertManyAndRef extends BaseTestCase {
     bookmarks.add(b1);
     bookmarks.add(b2);
 
-    Ebean.save(bookmarks);
+    Ebean.saveAll(bookmarks);
   }
 }