DATAREST-1280 Add support sort collection resource by associated prop…

…erty. Closes spring-projects#1641 Related tickets spring-projects#1386 spring-projects#1343
mikoto2000 · Nov 13, 2023 · e60bdac · e60bdac
1 parent 2b207b1
commit e60bdac
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/...ain/java/org/springframework/data/rest/webmvc/json/JacksonMappingAwareSortTranslator.java b/...ain/java/org/springframework/data/rest/webmvc/json/JacksonMappingAwareSortTranslator.java
@@ -192,10 +192,6 @@ private List<String> mapPropertyPath(PersistentEntity<?, ?> rootEntity, List<Str
 
 				for (PersistentProperty<?> persistentProperty : persistentProperties) {
 
-					if (associations.isLinkableAssociation(persistentProperty)) {
-						return Collections.emptyList();
-					}
-
 					persistentPropertyPath.add(persistentProperty.getName());
 				}
 

diff --git a/...bmvc/src/test/java/org/springframework/data/rest/webmvc/json/SortTranslatorUnitTests.java b/...bmvc/src/test/java/org/springframework/data/rest/webmvc/json/SortTranslatorUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 original author or authors.
+ * Copyright 2016-2023 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.
@@ -117,19 +117,19 @@ void shouldMapKnownNestedProperties() {
 		assertThat(translatedSort.getOrderFor("embedded.someInterface")).isNotNull();
 	}
 
-	@Test // DATAREST-910
-	void shouldSkipWrongNestedProperties() {
+	@Test // DATAREST-1280
+	void shouldKnownAssociationProperties() {
 
-		Sort translatedSort = sortTranslator.translateSort(Sort.by("embedded.unknown"),
+		Sort translatedSort = sortTranslator.translateSort(Sort.by("association.name"),
 				mappingContext.getRequiredPersistentEntity(Plain.class));
 
-		assertThat(translatedSort).isEqualTo(Sort.unsorted());
+		assertTrue(translatedSort.isSorted());
 	}
 
-	@Test // DATAREST-910, DATAREST-976
-	void shouldSkipKnownAssociationProperties() {
+	@Test // DATAREST-910
+	void shouldSkipWrongNestedProperties() {
 
-		Sort translatedSort = sortTranslator.translateSort(Sort.by("association.name"),
+		Sort translatedSort = sortTranslator.translateSort(Sort.by("embedded.unknown"),
 				mappingContext.getRequiredPersistentEntity(Plain.class));
 
 		assertThat(translatedSort).isEqualTo(Sort.unsorted());