From bfe30341873052118ec5157fa966799bc838ca5c Mon Sep 17 00:00:00 2001 From: lukaseder Date: Wed, 21 Oct 2015 12:24:00 +0200 Subject: [PATCH] [#4687] Add ResultQuery.fetchStream() as a alias for stream() --- jOOQ/src/main/java/org/jooq/ResultQuery.java | 11 +++++++++++ .../main/java/org/jooq/impl/AbstractResultQuery.java | 10 +++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/ResultQuery.java b/jOOQ/src/main/java/org/jooq/ResultQuery.java index 360aa91ca8..bb0e1c87e6 100644 --- a/jOOQ/src/main/java/org/jooq/ResultQuery.java +++ b/jOOQ/src/main/java/org/jooq/ResultQuery.java @@ -146,6 +146,17 @@ public interface ResultQuery extends Query, Iterable { Iterator iterator() throws DataAccessException; /* [java-8] */ + /** + * Stream this query. + *

+ * This is just a synonym for {@link #stream()}. + * + * @return The result. + * @throws DataAccessException if something went wrong executing the query + * @see #stream() + */ + Stream fetchStream() throws DataAccessException; + /** * Stream this query. *

diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java b/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java index 5002a5281c..635abe30f2 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java @@ -48,8 +48,8 @@ import static java.util.concurrent.Executors.newSingleThreadExecutor; import static org.jooq.SQLDialect.CUBRID; import static org.jooq.SQLDialect.POSTGRES; // ... -import static org.jooq.impl.Utils.DataKey.DATA_LOCK_ROWS_FOR_UPDATE; import static org.jooq.impl.Utils.consumeResultSets; +import static org.jooq.impl.Utils.DataKey.DATA_LOCK_ROWS_FOR_UPDATE; import java.lang.reflect.Array; import java.sql.ResultSet; @@ -79,7 +79,6 @@ import org.jooq.Result; import org.jooq.ResultQuery; import org.jooq.Results; import org.jooq.Table; -import org.jooq.exception.DataAccessException; import org.jooq.tools.Convert; import org.jooq.tools.JooqLogger; @@ -318,7 +317,12 @@ abstract class AbstractResultQuery extends AbstractQuery imple /* [java-8] */ @Override - public final Stream stream() throws DataAccessException { + public final Stream fetchStream() { + return fetchLazy().stream(); + } + + @Override + public final Stream stream() { return fetchLazy().stream(); } /* [/java-8] */