[#6196] Override Iterable.forEach(Consumer) in ResultQuery to provide Javadoc

This commit is contained in:
lukaseder 2017-05-09 15:30:51 +02:00
parent 00aafce1ab
commit 79d4b8b58f
3 changed files with 37 additions and 13 deletions

View File

@ -44,9 +44,11 @@ import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.Spliterator;
import java.util.concurrent.CompletionStage;
import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService;
import java.util.function.Consumer;
import java.util.stream.Stream;
import javax.sql.DataSource;
@ -130,11 +132,8 @@ public interface ResultQuery<R extends Record> extends Query, Iterable<R> {
ResultSet fetchResultSet() throws DataAccessException;
/**
* Execute the query and return the generated result.
* <p>
* This is essentially the same as {@link #fetch()}, except that being
* declared in {@link Iterable}, this method can be used in Java 5 foreach
* statements.
* Execute the query using {@link #fetch()} and return the generated result
* as an {@link Iterator}.
* <p>
* {@inheritDoc}
*/
@ -142,6 +141,31 @@ public interface ResultQuery<R extends Record> extends Query, Iterable<R> {
Iterator<R> iterator() throws DataAccessException;
/**
* Execute the query using {@link #fetch()} and pass all results to a
* consumer.
* <p>
* This is essentially the same as {@link #fetch()}.
* <p>
* {@inheritDoc}
*/
@Override
default void forEach(Consumer<? super R> action) {
Iterable.super.forEach(action);
}
/**
* Execute the query using {@link #fetch()} and return the generated result
* as an {@link Spliterator}.
* <p>
* {@inheritDoc}
*/
@Override
default Spliterator<R> spliterator() {
return Iterable.super.spliterator();
}
/**
* Stream this query.
* <p>

View File

@ -103,7 +103,7 @@ public interface SelectLimitAfterOffsetStep<R extends Record> extends SelectForU
* function and nested <code>SELECT</code> statements.
*/
@Support
SelectForUpdateStep<R> limit(int numberOfRows);
SelectWithTiesAfterOffsetStep<R> limit(int numberOfRows);
/**
* Add a <code>LIMIT</code> clause to the query using named parameters
@ -118,6 +118,6 @@ public interface SelectLimitAfterOffsetStep<R extends Record> extends SelectForU
* statements.
*/
@Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
SelectForUpdateStep<R> limit(Param<Integer> numberOfRows);
SelectWithTiesAfterOffsetStep<R> limit(Param<Integer> numberOfRows);
}

View File

@ -107,7 +107,7 @@ public interface SelectLimitStep<R extends Record> extends SelectForUpdateStep<R
* calling <code>.limit(numberOfRows).offset(0)</code>
*/
@Support
SelectOffsetStep<R> limit(int numberOfRows);
SelectWithTiesStep<R> limit(int numberOfRows);
/**
* Add a <code>LIMIT</code> clause to the query using named parameters
@ -125,7 +125,7 @@ public interface SelectLimitStep<R extends Record> extends SelectForUpdateStep<R
* calling <code>.limit(numberOfRows).offset(0)</code>
*/
@Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
SelectOffsetStep<R> limit(Param<Integer> numberOfRows);
SelectWithTiesStep<R> limit(Param<Integer> numberOfRows);
/**
* Add a <code>LIMIT</code> clause to the query
@ -139,7 +139,7 @@ public interface SelectLimitStep<R extends Record> extends SelectForUpdateStep<R
* <code>SELECT</code> statements.
*/
@Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
SelectForUpdateStep<R> limit(int offset, int numberOfRows);
SelectWithTiesAfterOffsetStep<R> limit(int offset, int numberOfRows);
/**
* Add a <code>LIMIT</code> clause to the query using named parameters
@ -154,7 +154,7 @@ public interface SelectLimitStep<R extends Record> extends SelectForUpdateStep<R
* and nested <code>SELECT</code> statements.
*/
@Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
SelectForUpdateStep<R> limit(int offset, Param<Integer> numberOfRows);
SelectWithTiesAfterOffsetStep<R> limit(int offset, Param<Integer> numberOfRows);
/**
* Add a <code>LIMIT</code> clause to the query using named parameters
@ -169,7 +169,7 @@ public interface SelectLimitStep<R extends Record> extends SelectForUpdateStep<R
* and nested <code>SELECT</code> statements.
*/
@Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
SelectForUpdateStep<R> limit(Param<Integer> offset, int numberOfRows);
SelectWithTiesAfterOffsetStep<R> limit(Param<Integer> offset, int numberOfRows);
/**
* Add a <code>LIMIT</code> clause to the query using named parameters
@ -184,7 +184,7 @@ public interface SelectLimitStep<R extends Record> extends SelectForUpdateStep<R
* and nested <code>SELECT</code> statements.
*/
@Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
SelectForUpdateStep<R> limit(Param<Integer> offset, Param<Integer> numberOfRows);
SelectWithTiesAfterOffsetStep<R> limit(Param<Integer> offset, Param<Integer> numberOfRows);
/**
* Add an <code>OFFSET</code> clause to the query