Commit 855194a

committed

Polishing.

Introduce method to obtain a position function from OffsetScrollPosition. Tweak documentation wording. See #3070 Original pull request: #3072

1 parent eb18466 commit 855194aCopy full SHA for 855194a

File tree

2 files changed

+18

-7

lines changed

src/main
- antora/modules/ROOT/pages/repositories
  - scrolling.adoc
- java/org/springframework/data/domain
  - OffsetScrollPosition.java

2 files changed

+18

-7

lines changed

`‎src/main/antora/modules/ROOT/pages/repositories/scrolling.adoc`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ Scrolling consists of a stable sort, a scroll type (Offset- or Keyset-based scro`
`6`	`6`	You can define simple sorting expressions by using property names and define static result limiting using the xref:repositories/query-methods-details.adoc#repositories.limit-query-result[`Top` or `First` keyword] through query derivation.
`7`	`7`	`You can concatenate expressions to collect multiple criteria into one expression.`
`8`	`8`
`9`		-Scroll queries return a `Window<T>` that allows obtaining the elements scroll position which can be used to fetch the next `Window<T>` until your application has consumed the entire query result.
	`9`	+Scroll queries return a `Window<T>` that allows obtaining the element's scroll position to fetch the next `Window<T>` until your application has consumed the entire query result.
`10`	`10`	Similar to consuming a Java `Iterator<List<...>>` by obtaining the next batch of results, query result scrolling lets you access the a `ScrollPosition` through `Window.positionAt(...)`.
`11`	`11`
`12`	`12`	`[source,java]`
`@@ -26,8 +26,8 @@ do {`
`26`	`26`	`[NOTE]`
`27`	`27`	`====`
`28`	`28`	The `ScrollPosition` identifies the exact position of an element with the entire query result.
`29`		`-Query execution treats the position parameter as _exclusive_, which means results will start _after_ the given position.`
`30`		-`ScrollPosition#offset` and `ScrollPosition#keyset()` as special incarnations of a `ScrollPosition` indicating the start of a scroll operation.
	`29`	`+Query execution treats the position parameter _exclusive_, results will start _after_ the given position.`
	`30`	+`ScrollPosition#offset()` and `ScrollPosition#keyset()` as special incarnations of a `ScrollPosition` indicating the start of a scroll operation.
`31`	`31`	`====`
`32`	`32`
`33`	`33`	`WindowIterator` provides a utility to simplify scrolling across ``Window``s by removing the need to check for the presence of a next `Window` and applying the `ScrollPosition`.
`@@ -69,8 +69,8 @@ WindowIterator<User> users = WindowIterator.of(position -> repository.findFirst1`
`69`	`69`	`[CAUTION]`
`70`	`70`	`====`
`71`	`71`	There is a difference between `ScollPosition.offset()` and `ScollPosition.offset(0L)`.
`72`		-The former indicates the start of scroll operation, pointing to no specific offset where as the latter identifies the first element (at position `0`) of the result.
`73`		-Given the _exclusive_ nature of scrolling using `ScollPosition.offset(0)` will skip the first element and translate to an offset of 1.
	`72`	+The former indicates the start of scroll operation, pointing to no specific offset whereas the latter identifies the first element (at position `0`) of the result.
	`73`	+Given the _exclusive_ nature of scrolling, using `ScollPosition.offset(0)` skips the first element and translate to an offset of `1`.
`74`	`74`	`====`
`75`	`75`
`76`	`76`	`[[repositories.scrolling.keyset]]`

`‎src/main/java/org/springframework/data/domain/OffsetScrollPosition.java`

Lines changed: 13 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,8 @@`
`24`	`24`	`/**`
`25`	`25`	`* A {@link ScrollPosition} based on the offsets within query results.`
`26`	`26`	`* <p>`
`27`		`- * An initial {@link OffsetScrollPosition} does not point to a specific element and is different to a the Po`
	`27`	`+ * An initial {@link OffsetScrollPosition} does not point to a specific element and is different to a position`
	`28`	`+ * {{@link ScrollPosition#offset(long)}.`
`28`	`29`	`*`
`29`	`30`	`* @author Mark Paluch`
`30`	`31`	`* @author Oliver Drotbohm`
`@@ -69,7 +70,7 @@ static OffsetScrollPosition of(long offset) {`
`69`	`70`	`}`
`70`	`71`
`71`	`72`	`/**`
`72`		`- * Returns the {@link IntFunction position function} to calculate.`
	`73`	`+ * Returns a {@link IntFunction position function} starting at {@code startOffset}.`
`73`	`74`	`*`
`74`	`75`	`* @param startOffset the start offset to be used. Must not be negative.`
`75`	`76`	`* @return the offset-based position function.`
`@@ -81,6 +82,16 @@ public static IntFunction<OffsetScrollPosition> positionFunction(long startOffse`
`81`	`82`	`return startOffset == 0 ? OffsetPositionFunction.ZERO : new OffsetPositionFunction(startOffset);`
`82`	`83`	`}`
`83`	`84`
	`85`	`+ /**`
	`86`	`+ * Returns the {@link IntFunction position function} starting after the current {@code offset}.`
	`87`	`+ *`
	`88`	`+ * @return the offset-based position function.`
	`89`	`+ * @since 3.3`
	`90`	`+ */`
	`91`	`+ public IntFunction<OffsetScrollPosition> positionFunction() {`
	`92`	`+ return positionFunction(isInitial() ? 0 : getOffset() + 1);`
	`93`	`+ }`
	`94`	`+`
`84`	`95`	`/**`
`85`	`96`	`* The zero or positive offset.`
`86`	`97`	`* <p>`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 855194a

File tree

2 files changed

2 files changed

`‎src/main/antora/modules/ROOT/pages/repositories/scrolling.adoc`

`‎src/main/java/org/springframework/data/domain/OffsetScrollPosition.java`

0 commit comments