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

DATACMNS-1827 - Pageable and Sort arguments with empty qualifier value shouldn't be prefixed with delimiter.

Browse Source 
Original pull request: #473.
This commit is contained in:
Vedran Pavic
2020-11-09 20:19:44 +01:00
committed by Mark Paluch
parent 1d146da048
commit e758dd3a84
4 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/springframework/data/web/PageableHandlerMethodArgumentResolverSupport.java
View File

@@ -230,7 +230,7 @@ public abstract class PageableHandlerMethodArgumentResolverSupport {
Qualifier qualifier = parameter == null ? null : parameter.getParameterAnnotation(Qualifier.class);
if (qualifier != null) {
if (qualifier != null && StringUtils.hasLength(qualifier.value())) {
builder.append(qualifier.value());
builder.append(qualifierDelimiter);
}

5
src/main/java/org/springframework/data/web/SortHandlerMethodArgumentResolverSupport.java
View File

@@ -186,8 +186,9 @@ public abstract class SortHandlerMethodArgumentResolverSupport {
Qualifier qualifier = parameter != null ? parameter.getParameterAnnotation(Qualifier.class) : null;
if (qualifier != null) {
builder.append(qualifier.value()).append(qualifierDelimiter);
if (qualifier != null && StringUtils.hasLength(qualifier.value())) {
builder.append(qualifier.value());
builder.append(qualifierDelimiter);
}
return builder.append(sortParameter).toString();