Spring/spring-data-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATACMNS-755 - Fixed QSort property translation for plain paths.

Browse Source 
If standard Querydsl StringPaths are used without any reference to a query class tree, we previously dropped the first segment of the path expression.

Moved to a completely different algorithm to determine the path by just using the Path's toString() representation and the root removed if necessary.
This commit is contained in:
Oliver Gierke
2015-08-18 13:53:02 +02:00
parent d61b687cd6
commit cc2696fcc4
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/org/springframework/data/querydsl/QSort.java
View File

@@ -22,12 +22,10 @@ import java.util.List;
import org.springframework.data.domain.Sort;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
import com.mysema.query.types.Expression;
import com.mysema.query.types.OrderSpecifier;
import com.mysema.query.types.Path;
import com.mysema.query.types.PathMetadata;
/**
* Sort option for queries that wraps a querydsl {@link OrderSpecifier}.
@@ -154,16 +152,9 @@ public class QSort extends Sort implements Serializable {
*/
private static String preparePropertyPath(Path<?> path) {
PathMetadata<?> metadata = path.getMetadata();
Path<?> parent = metadata.getParent();
Path<?> root = path.getRoot();
if (parent == null) {
return "";
}
String basPath = preparePropertyPath(parent);
String element = metadata.getElement().toString();
return StringUtils.hasText(basPath) ? basPath.concat(".").concat(element) : basPath.concat(element);
return root == null || path.equals(root) ? path.toString()
: path.toString().substring(root.toString().length() + 1);
}
}