Polishing.

Add MongoDB tests for property path usage. Merge JDBC tests.

Author: mp911de

jdbc/basics/src/main/java/example/springdata/jdbc/basics/simpleentity/Category.java

@@ -43,6 +43,12 @@ public class Category {
 	private @Setter long inserted;
 	private AgeGroup ageGroup;
 
+	public Category(String name, String description) {
+		this.id = null;
+		this.name = name;
+		this.description = description;
+	}
+
 	public Category(String name, String description, AgeGroup ageGroup) {
 
 		this.id = null;
@@ -58,4 +64,9 @@ public void timeStamp() {
 			inserted = System.currentTimeMillis();
 		}
 	}
+
+	@Override
+	public String toString() {
+		return "%s %s".formatted(name, description);
+	}
 }

jdbc/basics/src/main/java/example/springdata/jdbc/basics/simpleentity/CategoryRepository.java

@@ -16,10 +16,12 @@
 package example.springdata.jdbc.basics.simpleentity;
 
 import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.ListPagingAndSortingRepository;
 
 /**
  * Repository for Categories.
  *
  * @author Jens Schauder
  */
-interface CategoryRepository extends CrudRepository<Category, Long>, WithInsert<Category> {}
+public interface CategoryRepository
+		extends CrudRepository<Category, Long>, WithInsert<Category>, ListPagingAndSortingRepository<Category, Long> {}

jdbc/basics/src/test/java/example/springdata/jdbc/basics/simpleentity/SimpleEntityTests.java

@@ -27,10 +27,9 @@
 import org.springframework.boot.test.context.SpringBootTest;
 
 /**
- * Demonstrates simple CRUD operations with a simple entity without any references.
+ * Demonstrates typed property path usage.
  *
- * @author Jens Schauder
- * @author Divya Srivastava
+ * @author Mark Paluch
  */
 @SpringBootTest(classes = CategoryConfiguration.class)
 @AutoConfigureJdbc

…propertypath/TypedPropertyPathTests.java …le/springdata/jdbc/query/QueryTests.javajdbc/typed-property-path/src/test/java/example/springdata/jdbc/typedpropertypath/TypedPropertyPathTests.java renamed to jdbc/basics/src/test/java/example/springdata/jdbc/query/QueryTests.java jdbc/typed-property-path/src/test/java/example/springdata/jdbc/typedpropertypath/TypedPropertyPathTests.java renamed to jdbc/basics/src/test/java/example/springdata/jdbc/query/QueryTests.java

@@ -1,28 +1,33 @@
 /*
- * Copyright 2026-present the original author or authors.
+ * Copyright 2025 the original author or 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
+ *      http://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 example.springdata.jdbc.typedpropertypath;
+package example.springdata.jdbc.query;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.springframework.data.relational.core.query.Criteria.where;
-import static org.springframework.data.relational.core.query.Query.query;
+import static org.assertj.core.api.Assertions.*;
+import static org.springframework.data.relational.core.query.Criteria.*;
+import static org.springframework.data.relational.core.query.Query.*;
+
+import example.springdata.jdbc.basics.simpleentity.Category;
+import example.springdata.jdbc.basics.simpleentity.CategoryConfiguration;
+import example.springdata.jdbc.basics.simpleentity.CategoryRepository;
 
 import java.util.List;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureJdbc;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -33,61 +38,94 @@
  * Demonstrates type-safe property paths with {@link Sort}.
  *
  * @author Christoph Strobl
+ * @author Mark Paluch
  */
-@SpringBootTest(classes = TypedPropertyPathJdbcConfiguration.class)
+@SpringBootTest(classes = CategoryConfiguration.class)
 @AutoConfigureJdbc
-class TypedPropertyPathTests {
+class QueryTests {
 
-	@Autowired
-	CategoryRepository repository;
+	@Autowired JdbcAggregateTemplate template;
 
-	@Autowired
-	JdbcAggregateTemplate jdbcAggregateTemplate;
+	@Autowired CategoryRepository repository;
 
 	@BeforeEach
 	void clearData() {
 		repository.deleteAll();
 	}
 
 	@Test
-	void queryFilterWithTypedPropertyPath() {
+	void queryFilterWithStringPropertyPath() {
 
 		repository.save(new Category("Porsche", "Sports cars"));
 		repository.save(new Category("BMW", "Luxury cars"));
 		repository.save(new Category("Porsche", "SUV series"));
 
-		List<Category> all = jdbcAggregateTemplate.findAll(
-			query(where(Category::getName).is("Porsche")),
-			Category.class);
+		List<Category> all = template.findAll(query(where("name").is("Porsche")), Category.class);
 
 		assertThat(all).hasSize(2);
 		assertThat(all).extracting(Category::getName).containsOnly("Porsche");
-		assertThat(all).extracting(Category::getDescription)
-			.containsExactlyInAnyOrder("Sports cars", "SUV series");
+		assertThat(all).extracting(Category::getDescription).containsExactlyInAnyOrder("Sports cars", "SUV series");
 	}
 
 	@Test
-	void sortBySinglePropertyWithTypedPropertyPath() {
+	void queryFilterWithTypedPropertyPath() {
 
 		repository.save(new Category("Porsche", "Sports cars"));
-		repository.save(new Category("Audi", "German luxury"));
-		repository.save(new Category("Mercedes", "Premium"));
+		repository.save(new Category("BMW", "Luxury cars"));
+		repository.save(new Category("Porsche", "SUV series"));
+
+		List<Category> all = template.findAll(query(where(Category::getName).is("Porsche")), Category.class);
+
+		assertThat(all).hasSize(2);
+		assertThat(all).extracting(Category::getName).containsOnly("Porsche");
+		assertThat(all).extracting(Category::getDescription).containsExactlyInAnyOrder("Sports cars", "SUV series");
+	}
+
+	@Test
+	void sortBySinglePropertyWithStringPropertyPath() {
+
+		insertAudiMercedesAndPorsche();
+		List<Category> all = repository.findAll(Sort.by("name"));
+
+		assertThat(all).extracting(Category::getName).containsExactly("Audi", "Mercedes", "Porsche");
+	}
 
+	@Test
+	void sortBySinglePropertyWithTypedPropertyPath() {
+
+		insertAudiMercedesAndPorsche();
 		List<Category> all = repository.findAll(Sort.by(Category::getName));
 
 		assertThat(all).extracting(Category::getName).containsExactly("Audi", "Mercedes", "Porsche");
 	}
 
+	@Test
+	void sortByMultiplePropertiesWithStringPropertyPath() {
+
+		insertBmwAndPorsche();
+		List<Category> all = repository.findAll(Sort.by("name", "description"));
+
+		assertThat(all).extracting(Category::toString).containsExactly("BMW 911", "Porsche 911", "Porsche Cayenne");
+	}
+
 	@Test
 	void sortByMultiplePropertiesWithTypedPropertyPath() {
 
+		insertBmwAndPorsche();
+		List<Category> all = repository.findAll(Sort.by(Category::getName, Category::getDescription));
+
+		assertThat(all).extracting(Category::toString).containsExactly("BMW 911", "Porsche 911", "Porsche Cayenne");
+	}
+
+	private void insertAudiMercedesAndPorsche() {
+		repository.save(new Category("Porsche", "Sports cars"));
+		repository.save(new Category("Audi", "German luxury"));
+		repository.save(new Category("Mercedes", "Premium"));
+	}
+
+	private void insertBmwAndPorsche() {
 		repository.save(new Category("Porsche", "Cayenne"));
 		repository.save(new Category("Porsche", "911"));
 		repository.save(new Category("BMW", "911"));
-
-		List<Category> all = repository.findAll(Sort.by(Category::getName, Category::getDescription));
-
-		assertThat(all).extracting(Category::toString)
-			.containsExactly("BMW 911", "Porsche 911", "Porsche Cayenne");
 	}
 }

jdbc/pom.xml

@@ -20,14 +20,13 @@
 		<module>aot-optimization</module>
 		<module>basics</module>
 		<module>composite-ids</module>
+		<module>graalvm-native</module>
 		<module>howto</module>
 		<module>immutables</module>
 		<module>jmolecules</module>
 		<module>jooq</module>
 		<module>singlequeryloading</module>
-		<module>typed-property-path</module>
 		<!-- <module>mybatis</module> -->
-		<module>graalvm-native</module>
 	</modules>
 
 	<dependencies>