-
Notifications
You must be signed in to change notification settings - Fork 200
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add all cursors to the page implementation and remove nextPageable an…
…d previousPageable implementation from the CursoredPageable
- Loading branch information
1 parent
019dacd
commit db7cc08
Showing
10 changed files
with
256 additions
and
153 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
132 changes: 132 additions & 0 deletions
132
data-model/src/main/java/io/micronaut/data/model/DefaultCursoredPage.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,132 @@ | ||
| /* | ||
| * Copyright 2017-2020 original authors | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package io.micronaut.data.model; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonCreator; | ||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
| import io.micronaut.core.annotation.Creator; | ||
| import io.micronaut.core.annotation.ReflectiveAccess; | ||
| import io.micronaut.data.model.Pageable.Cursor; | ||
| import io.micronaut.data.model.Pageable.Mode; | ||
| import io.micronaut.serde.annotation.Serdeable; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Objects; | ||
| import java.util.Optional; | ||
|
|
||
| /** | ||
| * Implementation of {@link Page} to return when {@link CursoredPageable} is requested. | ||
| * | ||
| * @author Andriy Dmytruk | ||
| * @since 4.8.0 | ||
| * @param <T> The generic type | ||
| */ | ||
| @Serdeable | ||
| class DefaultCursoredPage<T> extends DefaultPage<T> { | ||
|
|
||
| private final List<Cursor> cursors; | ||
|
|
||
| /** | ||
| * Default constructor. | ||
| * @param content The content | ||
| * @param pageable The pageable | ||
| * @param totalSize The total size | ||
| */ | ||
| @JsonCreator | ||
| @Creator | ||
| @ReflectiveAccess | ||
| DefaultCursoredPage( | ||
| @JsonProperty("content") | ||
| List<T> content, | ||
| @JsonProperty("pageable") | ||
| Pageable pageable, | ||
| @JsonProperty("cursors") | ||
| List<Cursor> cursors, | ||
| @JsonProperty("totalSize") | ||
| Long totalSize | ||
| ) { | ||
| super(content, pageable, totalSize); | ||
| if (content.size() != cursors.size()) { | ||
| throw new IllegalArgumentException("The number of cursors must match the number of content items for a page"); | ||
| } | ||
| this.cursors = cursors; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) { | ||
| if (this == o) { | ||
| return true; | ||
| } | ||
| if (!(o instanceof DefaultCursoredPage<?> that)) { | ||
| return false; | ||
| } | ||
| return Objects.equals(cursors, that.cursors) && super.equals(o); | ||
| } | ||
|
|
||
| @Override | ||
| public Optional<Cursor> getCursor(int i) { | ||
| return Optional.of(cursors.get(i)); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean hasNext() { | ||
| Pageable pageable = getPageable(); | ||
| if (pageable.getMode() == Mode.CURSOR_NEXT) { | ||
| return cursors.size() == pageable.getSize(); | ||
| } else { | ||
| return true; | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public boolean hasPrevious() { | ||
| Pageable pageable = getPageable(); | ||
| if (pageable.getMode() == Mode.CURSOR_PREVIOUS) { | ||
| return cursors.size() == pageable.getSize(); | ||
| } else { | ||
| return true; | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public Pageable nextPageable() { | ||
| Pageable pageable = getPageable(); | ||
| Cursor cursor = cursors.isEmpty() ? pageable.cursor().orElse(null) : cursors.get(cursors.size() - 1); | ||
| return Pageable.afterCursor(cursor, pageable.getNumber() + 1, pageable.getSize(), pageable.getSort()); | ||
| } | ||
|
|
||
| @Override | ||
| public Pageable previousPageable() { | ||
| Pageable pageable = getPageable(); | ||
| Cursor cursor = cursors.isEmpty() ? pageable.cursor().orElse(null) : cursors.get(0); | ||
| return Pageable.beforeCursor(cursor, Math.max(0, pageable.getNumber() - 1), pageable.getSize(), pageable.getSort()); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return Objects.hash(cursors, super.hashCode()); | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return "DefaultPage{" + | ||
| "totalSize=" + getTotalSize() + | ||
| ",content=" + getContent() + | ||
| ",pageable=" + getPageable() + | ||
| ",cursors=" + cursors + | ||
| '}'; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.