#679 - Remove SqlQuery.setListener() ... migrate to SqlQuery.findEach() or SqlQuery.findEachWhile()

This commit is contained in:
Robin Bygrave committed 2016-04-29 08:43:30 +12:00
1 parent f867cd4c01
commit 840c5f8992
6 files changed
+1 -105

No files matched your search

@@ -3,7 +3,6 @@ package com.avaje.ebeaninternal.api;
import java.sql.PreparedStatement;
import com.avaje.ebean.SqlQuery;
import com.avaje.ebean.SqlQueryListener;
/**
* SQL query - Internal extension to SqlQuery.
@@ -20,11 +19,6 @@ public interface SpiSqlQuery extends SqlQuery {
*/
String getQuery();
/**
* Return the queryListener.
*/
SqlQueryListener getListener();
/**
* Return the first row to fetch.
*/
@@ -2,7 +2,6 @@ package com.avaje.ebeaninternal.server.query;
import com.avaje.ebean.QueryEachConsumer;
import com.avaje.ebean.QueryEachWhileConsumer;
import com.avaje.ebean.SqlQueryListener;
import com.avaje.ebean.SqlRow;
import com.avaje.ebeaninternal.api.SpiSqlQuery;
import com.avaje.ebeaninternal.server.core.Message;
@@ -90,7 +89,6 @@ public class DefaultRelationalQueryEngine implements RelationalQueryEngine {
List<SqlRow> rows = new ArrayList<SqlRow>();
SpiSqlQuery query = request.getQuery();
SqlQueryListener listener = query.getListener();
while (request.next()) {
SqlRow bean;
@@ -101,11 +99,7 @@ public class DefaultRelationalQueryEngine implements RelationalQueryEngine {
bean = readRow(request);
}
if (bean != null) {
if (listener != null) {
listener.process(bean);
} else {
rows.add(bean);
}
rows.add(bean);
loadRowCount++;
if (loadRowCount == maxRows) {
// break, as we have hit the max rows to fetch...
@@ -4,7 +4,6 @@ import com.avaje.ebean.EbeanServer;
import com.avaje.ebean.QueryEachConsumer;
import com.avaje.ebean.QueryEachWhileConsumer;
import com.avaje.ebean.SqlFutureList;
import com.avaje.ebean.SqlQueryListener;
import com.avaje.ebean.SqlRow;
import com.avaje.ebeaninternal.api.BindParams;
import com.avaje.ebeaninternal.api.SpiSqlQuery;
@@ -23,8 +22,6 @@ public class DefaultRelationalQuery implements SpiSqlQuery {
private final transient EbeanServer server;
private transient SqlQueryListener queryListener;
private String query;
private int firstRow;
@@ -94,26 +91,6 @@ public class DefaultRelationalQuery implements SpiSqlQuery {
return this;
}
/**
* Return the findListener is one has been set.
*/
public SqlQueryListener getListener() {
return queryListener;
}
/**
* Set a listener. This is designed for large fetches
* where lots are rows are to be processed and instead of
* returning all the rows they are processed one at a time.
* <p>
* Note that the returning List Set or Map will be empty.
* </p>
*/
public DefaultRelationalQuery setListener(SqlQueryListener queryListener) {
this.queryListener = queryListener;
return this;
}
public String toString() {
return "SqlQuery [" + query + "]";
}