-
Couldn't load subscription status.
- Fork 26
Add utilities for Pageable to be used with Doma Criteria. #275
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
backpaper0
merged 20 commits into
domaframework:master
from
mazeneko:add-pagebles-for-criteria
Mar 30, 2025
Merged
Changes from all commits
Commits
Show all changes
20 commits
Select commit
Hold shift + click to select a range
c776c68
Add utilities for Pageable to be used with Doma Criteria.
mazeneko 18b1a4d
Apply format
mazeneko 5f6fe5c
Even if a sort order is specified, use the default order when there a…
mazeneko 547691d
Change class name
mazeneko 9f9d9b8
Create fields
mazeneko 121f407
Create static Constructors
mazeneko c02a12d
WIP: Remove orderBy variations
mazeneko c8796d9
Recreate methods
mazeneko 152ad5f
Create getters
mazeneko 74ed41c
Make the sort configuration required instead of optional
mazeneko e7a08ff
Fix test name
mazeneko 9c0694e
Use @ParameterizedTest
mazeneko a7159f4
Removed an unused @throws tag from the Javadoc of orderBy
mazeneko 275499e
Injectable a handler for missing sort properties in orderBy
mazeneko 18c5122
Use the actual metamodel instead of a mock in the test
mazeneko dd97640
Fixed an issue where the call order of sort specifications was not be…
mazeneko 3d37c73
To better testOrderByWhenNonSort
mazeneko 0522fdf
Add missing tests for `missing properties`
mazeneko cb4e97e
Remove stream side effects
mazeneko 1ed99cc
Fix missing closing bracket in Javadoc
mazeneko File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
21 changes: 21 additions & 0 deletions
21
doma-spring-boot-core/src/main/java/org/seasar/doma/boot/PropertyMetamodelResolver.java
This file contains hidden or 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,21 @@ | ||
| package org.seasar.doma.boot; | ||
|
|
||
| import java.util.Optional; | ||
|
|
||
| import org.seasar.doma.jdbc.criteria.metamodel.PropertyMetamodel; | ||
|
|
||
| /** | ||
| * A resolver that maps property names to {@link PropertyMetamodel} | ||
| */ | ||
| @FunctionalInterface | ||
| public interface PropertyMetamodelResolver { | ||
| /** | ||
| * Resolves the specified property name into a {@link PropertyMetamodel}. | ||
| * | ||
| * @param propertyName the name of the property to resolve | ||
| * @return an {@link Optional} containing the resolved {@link PropertyMetamodel} | ||
| * if found, | ||
| * or an empty {@link Optional} if the property name cannot be resolved | ||
| */ | ||
| Optional<PropertyMetamodel<?>> resolve(String propertyName); | ||
| } |
230 changes: 230 additions & 0 deletions
230
doma-spring-boot-core/src/main/java/org/seasar/doma/boot/UnifiedQueryPageable.java
This file contains hidden or 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,230 @@ | ||
| package org.seasar.doma.boot; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.Optional; | ||
| import java.util.function.Consumer; | ||
| import java.util.function.Function; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| import org.seasar.doma.jdbc.criteria.declaration.OrderByNameDeclaration; | ||
| import org.seasar.doma.jdbc.criteria.metamodel.EntityMetamodel; | ||
| import org.seasar.doma.jdbc.criteria.metamodel.PropertyMetamodel; | ||
| import org.seasar.doma.jdbc.criteria.statement.EntityQueryable; | ||
| import org.springframework.data.domain.Pageable; | ||
|
|
||
| /** | ||
| * An adapter that integrates {@link Pageable} with Doma Criteria API. | ||
| * <p> | ||
| * This class allows converting {@link Pageable} pagination and sort information | ||
| * into Doma Criteria API's limit, offset, and order-by specifications. | ||
| * <p> | ||
| * Example usage: | ||
| * <pre>{@code | ||
| * public Page<Task> getPage(Pageable pageable) { | ||
| * final var task_ = new Task_(); | ||
| * final var p = UnifiedQueryPageable.from(pageable, task_); | ||
| * final var content = this.queryDsl | ||
| * .from(task_) | ||
| * .offset(p.offset()) | ||
| * .limit(p.limit()) | ||
| * .orderBy(p.orderBy()) | ||
| * .fetch(); | ||
| * final var total = this.queryDsl | ||
| * .from(task_) | ||
| * .select(Expressions.count()) | ||
| * .fetchOne(); | ||
| * return new PageImpl<>(content, pageable, total); | ||
| * } | ||
| * }</pre> | ||
| * | ||
| * @author mazeneko | ||
| */ | ||
| public class UnifiedQueryPageable { | ||
| private final Pageable pageable; | ||
| private final SortConfig sortConfig; | ||
|
|
||
| /** | ||
| * A configuration holder for sort resolution. | ||
| */ | ||
| public record SortConfig( | ||
| /** a resolver that maps property names to {@link PropertyMetamodel} */ | ||
| PropertyMetamodelResolver propertyMetamodelResolver, | ||
| /** a consumer that applies default ordering when no valid sort can be determined */ | ||
| Consumer<OrderByNameDeclaration> defaultOrder) { | ||
| } | ||
|
|
||
| private UnifiedQueryPageable( | ||
| Pageable pageable, | ||
| SortConfig sortConfig) { | ||
| this.pageable = pageable; | ||
| this.sortConfig = sortConfig; | ||
| } | ||
|
|
||
| public Pageable getPageable() { | ||
backpaper0 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| return pageable; | ||
| } | ||
|
|
||
| public SortConfig getSortConfig() { | ||
| return sortConfig; | ||
| } | ||
|
|
||
| /** | ||
| * Creates a {@link UnifiedQueryPageable}, resolving sort properties based on the entity's property names. | ||
| * | ||
| * @param pageable {@link Pageable} object to convert | ||
| * @param sortTargetEntity the target entity whose properties are used for sorting | ||
| * @return the {@link UnifiedQueryPageable} | ||
| */ | ||
| public static UnifiedQueryPageable from( | ||
| Pageable pageable, | ||
| EntityMetamodel<?> sortTargetEntity) { | ||
| return UnifiedQueryPageable.from(pageable, sortTargetEntity, c -> { | ||
| }); | ||
| } | ||
|
|
||
| /** | ||
| * Creates a {@link UnifiedQueryPageable}, resolving sort properties based on the entity's property names. | ||
| * | ||
| * @param pageable {@link Pageable} object to convert | ||
| * @param sortTargetEntity the target entity whose properties are used for sorting | ||
| * @param defaultOrder a consumer that applies default ordering when no valid sort can be determined | ||
| * @return the {@link UnifiedQueryPageable} | ||
| */ | ||
| public static UnifiedQueryPageable from( | ||
| Pageable pageable, | ||
| EntityMetamodel<?> sortTargetEntity, | ||
| Consumer<OrderByNameDeclaration> defaultOrder) { | ||
| final var nameToMetamodel = sortTargetEntity | ||
| .allPropertyMetamodels() | ||
| .stream() | ||
| .collect(Collectors.toMap(PropertyMetamodel::getName, Function.identity())); | ||
| final var sortConfig = new SortConfig( | ||
| propertyName -> Optional.ofNullable(nameToMetamodel.get(propertyName)), | ||
| defaultOrder); | ||
| return new UnifiedQueryPageable( | ||
| pageable, | ||
| sortConfig); | ||
| } | ||
|
|
||
| /** | ||
| * Creates a {@link UnifiedQueryPageable} | ||
| * | ||
| * @param pageable {@link Pageable} object to convert | ||
| * @param sortConfig sort configuration | ||
| * @return the {@link UnifiedQueryPageable} | ||
| */ | ||
| public static UnifiedQueryPageable of(Pageable pageable, SortConfig sortConfig) { | ||
| return new UnifiedQueryPageable(pageable, sortConfig); | ||
| } | ||
|
|
||
| /** | ||
| * Creates a {@link UnifiedQueryPageable} | ||
| * | ||
| * @param pageable {@link Pageable} object to convert | ||
| * @param propertyMetamodelResolver a resolver that maps property names to {@link PropertyMetamodel} | ||
| * @return the {@link UnifiedQueryPageable} | ||
| */ | ||
| public static UnifiedQueryPageable of( | ||
| Pageable pageable, | ||
| PropertyMetamodelResolver propertyMetamodelResolver) { | ||
| return UnifiedQueryPageable.of(pageable, propertyMetamodelResolver, c -> { | ||
| }); | ||
| } | ||
|
|
||
| /** | ||
| * Creates a {@link UnifiedQueryPageable} | ||
| * | ||
| * @param pageable {@link Pageable} object to convert | ||
| * @param propertyMetamodelResolver a resolver that maps property names to {@link PropertyMetamodel} | ||
| * @param defaultOrder a consumer that applies default ordering when no valid sort can be determined | ||
| * @return the {@link UnifiedQueryPageable} | ||
| */ | ||
| public static UnifiedQueryPageable of( | ||
| Pageable pageable, | ||
| PropertyMetamodelResolver propertyMetamodelResolver, | ||
| Consumer<OrderByNameDeclaration> defaultOrder) { | ||
| final var sortConfig = new SortConfig( | ||
| propertyMetamodelResolver, | ||
| defaultOrder); | ||
| return new UnifiedQueryPageable(pageable, sortConfig); | ||
| } | ||
|
|
||
| /** | ||
| * Converts {@link Pageable} to {@link EntityQueryable#limit(Integer)} | ||
| * | ||
| * @return the limit. | ||
| * if {@link Pageable#isUnpaged()} is {@code true} then null. | ||
| */ | ||
| public Integer limit() { | ||
| return pageable.isUnpaged() ? null : pageable.getPageSize(); | ||
| } | ||
|
|
||
| /** | ||
| * Converts {@link Pageable} to {@link EntityQueryable#offset(Integer)} | ||
| * | ||
| * @return the offset. | ||
| * if {@link Pageable#isUnpaged()} is {@code true} then null. | ||
| */ | ||
| public Integer offset() { | ||
| return pageable.isUnpaged() | ||
| ? null | ||
| : Math.multiplyExact(pageable.getPageNumber(), pageable.getPageSize()); | ||
| } | ||
|
|
||
| /** | ||
| * Creates an {@link OrderByNameDeclaration} consumer based on the | ||
| * {@link Pageable}'s sort information using the provided {@link PropertyMetamodelResolver}. | ||
| * <p> | ||
| * If the {@link Pageable} is unsorted or no matching {@link PropertyMetamodel} is found, | ||
| * a default ordering is applied. | ||
| * | ||
| * @return a consumer that configures ordering based on the resolved {@link PropertyMetamodel} instances | ||
| */ | ||
| public Consumer<OrderByNameDeclaration> orderBy() { | ||
| return orderBy(missingProperties -> { | ||
| }); | ||
| } | ||
|
|
||
| /** | ||
| * Creates an {@link OrderByNameDeclaration} consumer based on the | ||
| * {@link Pageable}'s sort information using the provided {@link PropertyMetamodelResolver}. | ||
| * <p> | ||
| * If the {@link Pageable} is unsorted, or if no {@link PropertyMetamodel} can be resolved | ||
| * for a given sort property, a default ordering is applied. | ||
| * <p> | ||
| * The provided {@code handleMissingProperties} consumer is called with a list of | ||
| * property names that could not be resolved. This can be used to throw an exception, | ||
| * log a warning, or handle the situation in a custom way. | ||
| * | ||
| * @param handleMissingProperties a callback that handles property names which could not be resolved | ||
| * @return a consumer that configures ordering based on the resolved {@link PropertyMetamodel} instances | ||
| */ | ||
| public Consumer<OrderByNameDeclaration> orderBy( | ||
| Consumer<List<String>> handleMissingProperties) { | ||
| if (pageable.getSort().isUnsorted()) { | ||
| return sortConfig.defaultOrder(); | ||
| } | ||
| final var orderSpecifiers = new ArrayList<Consumer<OrderByNameDeclaration>>(); | ||
| final var missingProperties = new ArrayList<String>(); | ||
| for (final var order : pageable.getSort()) { | ||
| sortConfig | ||
| .propertyMetamodelResolver() | ||
| .resolve(order.getProperty()) | ||
| .ifPresentOrElse( | ||
| propertyMetamodel -> orderSpecifiers.add( | ||
| switch (order.getDirection()) { | ||
| case ASC -> c -> c.asc(propertyMetamodel); | ||
| case DESC -> c -> c.desc(propertyMetamodel); | ||
| }), | ||
| () -> missingProperties.add(order.getProperty())); | ||
| } | ||
| if (!missingProperties.isEmpty()) { | ||
| handleMissingProperties.accept(missingProperties); | ||
| } | ||
| if (orderSpecifiers.isEmpty()) { | ||
| return sortConfig.defaultOrder(); | ||
| } | ||
| return c -> orderSpecifiers.forEach(orderSpecifier -> orderSpecifier.accept(c)); | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.