Change class name UnifiedQueryPageable to UnifiedCriteriaPageable

Author: mazeneko

doma-spring-boot-core/src/main/java/org/seasar/doma/boot/UnifiedQueryPageable.java renamed to doma-spring-boot-core/src/main/java/org/seasar/doma/boot/UnifiedCriteriaPageable.java

@@ -23,7 +23,7 @@
  * <pre>{@code
  * public Page<Task> getPage(Pageable pageable) {
  *     final var task_ = new Task_();
- *     final var p = UnifiedQueryPageable.from(pageable, task_);
+ *     final var p = UnifiedCriteriaPageable.from(pageable, task_);
  *     final var content = this.queryDsl
  *         .from(task_)
  *         .offset(p.offset())
@@ -40,7 +40,7 @@
  *
  * @author mazeneko
  */
-public class UnifiedQueryPageable {
+public class UnifiedCriteriaPageable {
 	private final Pageable pageable;
 	private final SortConfig sortConfig;
 
@@ -54,7 +54,7 @@ public record SortConfig(
 			Consumer<OrderByNameDeclaration> defaultOrder) {
 	}
 
-	private UnifiedQueryPageable(
+	private UnifiedCriteriaPageable(
 			Pageable pageable,
 			SortConfig sortConfig) {
 		this.pageable = pageable;
@@ -70,28 +70,28 @@ public SortConfig getSortConfig() {
 	}
 
 	/**
-	 * Creates a {@link UnifiedQueryPageable}, resolving sort properties based on the entity's property names.
+	 * Creates a {@link UnifiedCriteriaPageable}, 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}
+	 * @return the {@link UnifiedCriteriaPageable}
 	 */
-	public static UnifiedQueryPageable from(
+	public static UnifiedCriteriaPageable from(
 			Pageable pageable,
 			EntityMetamodel<?> sortTargetEntity) {
-		return UnifiedQueryPageable.from(pageable, sortTargetEntity, c -> {
+		return UnifiedCriteriaPageable.from(pageable, sortTargetEntity, c -> {
 		});
 	}
 
 	/**
-	 * Creates a {@link UnifiedQueryPageable}, resolving sort properties based on the entity's property names.
+	 * Creates a {@link UnifiedCriteriaPageable}, 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}
+	 * @return the {@link UnifiedCriteriaPageable}
 	 */
-	public static UnifiedQueryPageable from(
+	public static UnifiedCriteriaPageable from(
 			Pageable pageable,
 			EntityMetamodel<?> sortTargetEntity,
 			Consumer<OrderByNameDeclaration> defaultOrder) {
@@ -102,52 +102,52 @@ public static UnifiedQueryPageable from(
 		final var sortConfig = new SortConfig(
 				propertyName -> Optional.ofNullable(nameToMetamodel.get(propertyName)),
 				defaultOrder);
-		return new UnifiedQueryPageable(
+		return new UnifiedCriteriaPageable(
 				pageable,
 				sortConfig);
 	}
 
 	/**
-	 * Creates a {@link UnifiedQueryPageable}
+	 * Creates a {@link UnifiedCriteriaPageable}
 	 *
 	 * @param pageable {@link Pageable} object to convert
 	 * @param sortConfig sort configuration
-	 * @return the {@link UnifiedQueryPageable}
+	 * @return the {@link UnifiedCriteriaPageable}
 	 */
-	public static UnifiedQueryPageable of(Pageable pageable, SortConfig sortConfig) {
-		return new UnifiedQueryPageable(pageable, sortConfig);
+	public static UnifiedCriteriaPageable of(Pageable pageable, SortConfig sortConfig) {
+		return new UnifiedCriteriaPageable(pageable, sortConfig);
 	}
 
 	/**
-	 * Creates a {@link UnifiedQueryPageable}
+	 * Creates a {@link UnifiedCriteriaPageable}
 	 *
 	 * @param pageable {@link Pageable} object to convert
 	 * @param propertyMetamodelResolver a resolver that maps property names to {@link PropertyMetamodel}
-	 * @return the {@link UnifiedQueryPageable}
+	 * @return the {@link UnifiedCriteriaPageable}
 	 */
-	public static UnifiedQueryPageable of(
+	public static UnifiedCriteriaPageable of(
 			Pageable pageable,
 			PropertyMetamodelResolver propertyMetamodelResolver) {
-		return UnifiedQueryPageable.of(pageable, propertyMetamodelResolver, c -> {
+		return UnifiedCriteriaPageable.of(pageable, propertyMetamodelResolver, c -> {
 		});
 	}
 
 	/**
-	 * Creates a {@link UnifiedQueryPageable}
+	 * Creates a {@link UnifiedCriteriaPageable}
 	 *
 	 * @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}
+	 * @return the {@link UnifiedCriteriaPageable}
 	 */
-	public static UnifiedQueryPageable of(
+	public static UnifiedCriteriaPageable of(
 			Pageable pageable,
 			PropertyMetamodelResolver propertyMetamodelResolver,
 			Consumer<OrderByNameDeclaration> defaultOrder) {
 		final var sortConfig = new SortConfig(
 				propertyMetamodelResolver,
 				defaultOrder);
-		return new UnifiedQueryPageable(pageable, sortConfig);
+		return new UnifiedCriteriaPageable(pageable, sortConfig);
 	}
 
 	/**

doma-spring-boot-core/src/test/java/org/seasar/doma/boot/UnifiedQueryPageableTest.java renamed to doma-spring-boot-core/src/test/java/org/seasar/doma/boot/UnifiedCriteriaPageableTest.java

@@ -26,7 +26,7 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 
-public class UnifiedQueryPageableTest {
+public class UnifiedCriteriaPageableTest {
 	@ParameterizedTest
 	@CsvSource(value = {
 			"0 | 10 | 0 | 10",
@@ -36,7 +36,7 @@ public class UnifiedQueryPageableTest {
 	public void testOffsetAndLimit(
 			int pageNumber, int pageSize, int expectedOffset, int expectedLimit) {
 		Pageable pageable = PageRequest.of(pageNumber, pageSize);
-		UnifiedQueryPageable p = UnifiedQueryPageable.of(pageable, c -> Optional.empty());
+		UnifiedCriteriaPageable p = UnifiedCriteriaPageable.of(pageable, c -> Optional.empty());
 
 		Integer offset = p.offset();
 		Integer limit = p.limit();
@@ -48,7 +48,7 @@ public void testOffsetAndLimit(
 	@Test
 	public void testOffsetAndLimitWhenUnpaged() {
 		Pageable pageable = Pageable.unpaged();
-		UnifiedQueryPageable p = UnifiedQueryPageable.of(pageable, c -> Optional.empty());
+		UnifiedCriteriaPageable p = UnifiedCriteriaPageable.of(pageable, c -> Optional.empty());
 
 		Integer offset = p.offset();
 		Integer limit = p.limit();
@@ -61,7 +61,7 @@ public void testOffsetAndLimitWhenUnpaged() {
 	public void testOrderBy() {
 		Pageable pageable = PageRequest.of(0, 10, Sort.by("name").ascending());
 		Person_ entity = new Person_();
-		UnifiedQueryPageable p = UnifiedQueryPageable.of(
+		UnifiedCriteriaPageable p = UnifiedCriteriaPageable.of(
 				pageable,
 				propertyName -> switch (propertyName) {
 				case "name" -> Optional.of(entity.name);
@@ -80,7 +80,7 @@ public void testOrderBy2() {
 		Pageable pageable = PageRequest.of(0, 10,
 				Sort.by("name").descending().and(Sort.by("age").ascending()));
 		Person_ entity = new Person_();
-		UnifiedQueryPageable p = UnifiedQueryPageable.of(
+		UnifiedCriteriaPageable p = UnifiedCriteriaPageable.of(
 				pageable,
 				propertyName -> switch (propertyName) {
 				case "name" -> Optional.of(entity.name);
@@ -100,7 +100,7 @@ public void testOrderBy2() {
 	@Test
 	public void testOrderByWhenNonSort() {
 		Pageable pageable = PageRequest.of(0, 10);
-		UnifiedQueryPageable p = UnifiedQueryPageable.of(
+		UnifiedCriteriaPageable p = UnifiedCriteriaPageable.of(
 				pageable,
 				propertyName -> Optional.empty());
 
@@ -116,7 +116,7 @@ public void testOrderByWhenNonSortAndSetDefault() {
 		Pageable pageable = PageRequest.of(0, 10);
 		Person_ entity = new Person_();
 		Consumer<OrderByNameDeclaration> defaultOrder = c -> c.asc(entity.id);
-		UnifiedQueryPageable p = UnifiedQueryPageable.of(
+		UnifiedCriteriaPageable p = UnifiedCriteriaPageable.of(
 				pageable,
 				propertyName -> Optional.empty(),
 				defaultOrder);
@@ -131,7 +131,7 @@ public void testOrderBySingleEntity() {
 		Pageable pageable = PageRequest.of(0, 10,
 				Sort.by("name").descending().and(Sort.by("age").ascending()));
 		Person_ entity = new Person_();
-		UnifiedQueryPageable p = UnifiedQueryPageable.from(pageable, entity);
+		UnifiedCriteriaPageable p = UnifiedCriteriaPageable.from(pageable, entity);
 
 		Consumer<OrderByNameDeclaration> consumer = p.orderBy();
 
@@ -147,7 +147,7 @@ public void testOrderByWhenMissingProperties() {
 		Pageable pageable = PageRequest.of(0, 10,
 				Sort.by("dog").and(Sort.by("name")).and(Sort.by("cat")));
 		Person_ entity = new Person_();
-		UnifiedQueryPageable p = UnifiedQueryPageable.from(pageable, entity);
+		UnifiedCriteriaPageable p = UnifiedCriteriaPageable.from(pageable, entity);
 
 		Consumer<OrderByNameDeclaration> consumer = p.orderBy();
 
@@ -162,7 +162,7 @@ public void testOrderByWhenMissingAllProperties() {
 				Sort.by("dog").and(Sort.by("cat")));
 		Person_ entity = new Person_();
 		Consumer<OrderByNameDeclaration> defaultOrder = c -> c.desc(entity.age);
-		UnifiedQueryPageable p = UnifiedQueryPageable.from(pageable, entity, defaultOrder);
+		UnifiedCriteriaPageable p = UnifiedCriteriaPageable.from(pageable, entity, defaultOrder);
 
 		Consumer<OrderByNameDeclaration> consumer = p.orderBy();
 
@@ -174,7 +174,7 @@ public void testOrderByWhenMissingPropertiesHandle() {
 		Pageable pageable = PageRequest.of(0, 10,
 				Sort.by("dog").and(Sort.by("name")).and(Sort.by("cat")));
 		Person_ entity = new Person_();
-		UnifiedQueryPageable p = UnifiedQueryPageable.from(pageable, entity);
+		UnifiedCriteriaPageable p = UnifiedCriteriaPageable.from(pageable, entity);
 
 		assertThatThrownBy(() -> p.orderBy(missingProperties -> {
 			throw new IllegalArgumentException(