#717 - Remove findIterate() ... migrate to findEach() or findEachWhile()

src/main/java/com/avaje/ebean/EbeanServer.java

@@ -696,24 +696,6 @@ public interface EbeanServer {
    */
   <T> List<Object> findIds(Query<T> query, Transaction transaction);
 
-  /**
-   * Return a QueryIterator for the query.
-   * <p>
-   * Generally using {@link #findEach(Query, QueryEachConsumer, Transaction)} or
-   * {@link #findEachWhile(Query, QueryEachWhileConsumer, Transaction)} is preferred
-   * to findIterate(). The reason is that those methods automatically take care of
-   * closing the queryIterator (and the underlying jdbc statement and resultSet).
-   * </p>
-   * <p>
-   * This is similar to findEach in that not all the result beans need to be held
-   * in memory at the same time and as such is good for processing large queries.
-   * </p>
-   *
-   * @see Query#findEach(QueryEachConsumer)
-   * @see Query#findEachWhile(QueryEachWhileConsumer)
-   */
-  <T> QueryIterator<T> findIterate(Query<T> query, Transaction transaction);
-
   /**
    * Execute the query visiting the each bean one at a time.
    * <p>

src/main/java/com/avaje/ebean/ExpressionList.java

@@ -139,13 +139,6 @@ public interface ExpressionList<T> {
    */
   int delete();
 
-  /**
-   * Execute the query iterating over the results.
-   * 
-   * @see Query#findIterate()
-   */
-  QueryIterator<T> findIterate();
-
   /**
    * Execute the query process the beans one at a time.
    *

src/main/java/com/avaje/ebean/Query.java

@@ -547,25 +547,6 @@ public interface Query<T> {
    */
   List<Object> findIds();
 
-  /**
-   * Execute the query iterating over the results.
-   * <p>
-   * Remember that with {@link QueryIterator} you must call
-   * {@link QueryIterator#close()} when you have finished iterating the results
-   * (typically in a finally block).
-   * </p>
-   * <p>
-   * findEach() and findEachWhile() are preferred to findIterate() as they ensure
-   * the jdbc statement and resultSet are closed at the end of the iteration.
-   * </p>
-   * <p>
-   * This query will execute against the EbeanServer that was used to create it.
-   * </p>
-   */
-  QueryIterator<T> findIterate();
-
-
-
   /**
    * Execute the query processing the beans one at a time.
    * <p>

src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java

@@ -1249,7 +1249,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
 
     request.initTransIfRequired();
     request.findEach(consumer);
-    // no try finally - findVisit guarantee's cleanup of the transaction if required
+    // no try finally - findEach guarantee's cleanup of the transaction if required
   }
 
   public <T> void findEachWhile(Query<T> query, QueryEachWhileConsumer<T> consumer, Transaction t) {
@@ -1262,21 +1262,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
 
     request.initTransIfRequired();
     request.findEachWhile(consumer);
-    // no try finally - findVisit guarantee's cleanup of the transaction if required
-  }
-
-  public <T> QueryIterator<T> findIterate(Query<T> query, Transaction t) {
-
-    SpiOrmQueryRequest<T> request = createQueryRequest(Type.ITERATE, query, t);
-
-    try {
-      request.initTransIfRequired();
-      return request.findIterate();
-      
-    } catch (RuntimeException ex) {
-      request.endTransIfRequired();
-      throw ex;
-    }
+    // no try finally - findEachWhile guarantee's cleanup of the transaction if required
   }
 
   @Override

src/main/java/com/avaje/ebeaninternal/server/core/OrmQueryEngine.java

@@ -1,6 +1,5 @@
 package com.avaje.ebeaninternal.server.core;
 
-import com.avaje.ebean.QueryIterator;
 import com.avaje.ebean.Version;
 import com.avaje.ebean.bean.BeanCollection;
 import com.avaje.ebeaninternal.api.BeanIdList;

src/main/java/com/avaje/ebeaninternal/server/core/OrmQueryRequest.java

@@ -3,7 +3,6 @@ package com.avaje.ebeaninternal.server.core;
 import com.avaje.ebean.PersistenceContextScope;
 import com.avaje.ebean.QueryEachConsumer;
 import com.avaje.ebean.QueryEachWhileConsumer;
-import com.avaje.ebean.QueryIterator;
 import com.avaje.ebean.RawSql;
 import com.avaje.ebean.Version;
 import com.avaje.ebean.bean.BeanCollection;

src/main/java/com/avaje/ebeaninternal/server/core/QueryIterator.java

@@ -1,4 +1,4 @@
-package com.avaje.ebean;
+package com.avaje.ebeaninternal.server.core;
 
 import java.util.Iterator;
 

src/main/java/com/avaje/ebeaninternal/server/core/SpiOrmQueryRequest.java

@@ -2,7 +2,6 @@ package com.avaje.ebeaninternal.server.core;
 
 import com.avaje.ebean.QueryEachConsumer;
 import com.avaje.ebean.QueryEachWhileConsumer;
-import com.avaje.ebean.QueryIterator;
 import com.avaje.ebean.Version;
 import com.avaje.ebean.bean.BeanCollection;
 import com.avaje.ebeaninternal.api.SpiQuery;

src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionList.java

@@ -322,11 +322,6 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
     query.findEachWhile(consumer);
   }
 
-  @Override
-  public QueryIterator<T> findIterate() {
-    return query.findIterate();
-  }
-
   @Override
   public List<T> findList() {
     return query.findList();

src/main/java/com/avaje/ebeaninternal/server/expression/JunctionExpression.java

@@ -12,7 +12,6 @@ import com.avaje.ebean.PagedList;
 import com.avaje.ebean.Query;
 import com.avaje.ebean.QueryEachConsumer;
 import com.avaje.ebean.QueryEachWhileConsumer;
-import com.avaje.ebean.QueryIterator;
 import com.avaje.ebean.Version;
 import com.avaje.ebean.event.BeanQueryRequest;
 import com.avaje.ebean.search.Match;
@@ -345,11 +344,6 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
     exprList.findEachWhile(consumer);
   }
 
-  @Override
-  public QueryIterator<T> findIterate() {
-    return exprList.findIterate();
-  }
-
   @Override
   public List<T> findList() {
     return exprList.findList();

src/main/java/com/avaje/ebeaninternal/server/query/CQuery.java

@@ -1,6 +1,6 @@
 package com.avaje.ebeaninternal.server.query;
 
-import com.avaje.ebean.QueryIterator;
+import com.avaje.ebeaninternal.server.core.QueryIterator;
 import com.avaje.ebean.Version;
 import com.avaje.ebean.bean.BeanCollection;
 import com.avaje.ebean.bean.EntityBean;

src/main/java/com/avaje/ebeaninternal/server/query/CQueryEngine.java

@@ -1,6 +1,6 @@
 package com.avaje.ebeaninternal.server.query;
 
-import com.avaje.ebean.QueryIterator;
+import com.avaje.ebeaninternal.server.core.QueryIterator;
 import com.avaje.ebean.ValuePair;
 import com.avaje.ebean.Version;
 import com.avaje.ebean.bean.BeanCollection;

src/main/java/com/avaje/ebeaninternal/server/query/CQueryIteratorSimple.java

@@ -4,7 +4,7 @@ import java.sql.SQLException;
 
 import javax.persistence.PersistenceException;
 
-import com.avaje.ebean.QueryIterator;
+import com.avaje.ebeaninternal.server.core.QueryIterator;
 import com.avaje.ebeaninternal.server.core.OrmQueryRequest;
 
 /**

src/main/java/com/avaje/ebeaninternal/server/query/CQueryIteratorWithBuffer.java

@@ -5,7 +5,7 @@ import java.util.ArrayList;
 
 import javax.persistence.PersistenceException;
 
-import com.avaje.ebean.QueryIterator;
+import com.avaje.ebeaninternal.server.core.QueryIterator;
 import com.avaje.ebeaninternal.server.core.OrmQueryRequest;
 
 /**

src/main/java/com/avaje/ebeaninternal/server/query/DefaultOrmQueryEngine.java

@@ -1,6 +1,6 @@
 package com.avaje.ebeaninternal.server.query;
 
-import com.avaje.ebean.QueryIterator;
+import com.avaje.ebeaninternal.server.core.QueryIterator;
 import com.avaje.ebean.Version;
 import com.avaje.ebean.bean.BeanCollection;
 import com.avaje.ebean.bean.EntityBean;

src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java

@@ -1084,11 +1084,6 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     return server.findVersions(this, null);
   }
 
-  @Override
-  public QueryIterator<T> findIterate() {
-    return server.findIterate(this, null);
-  }
-
   @Override
   public List<T> findList() {
     return server.findList(this, null);