|
@@ -416,7 +416,7 @@ public class QueryHelper implements Serializable {
|
|
}
|
|
}
|
|
SortOrder sortOrder;
|
|
SortOrder sortOrder;
|
|
if (values.length == 2) {
|
|
if (values.length == 2) {
|
|
- sortOrder = SortOrder.DESC.toString().equalsIgnoreCase(values[1])?SortOrder.DESC:SortOrder.ASC;
|
|
|
|
|
|
+ sortOrder = SortOrder.DESC.toString().equalsIgnoreCase(values[1]) ? SortOrder.DESC : SortOrder.ASC;
|
|
if (sortOrder == null) {
|
|
if (sortOrder == null) {
|
|
throw new InvalidQueryException(messages -> messages.addErrorsInvalidQueryUnsupportedSortOrder(
|
|
throw new InvalidQueryException(messages -> messages.addErrorsInvalidQueryUnsupportedSortOrder(
|
|
ActionMessages.GLOBAL_PROPERTY_KEY, values[1]), "Invalid sort order: " + termQuery);
|
|
ActionMessages.GLOBAL_PROPERTY_KEY, values[1]), "Invalid sort order: " + termQuery);
|
|
@@ -734,7 +734,8 @@ public class QueryHelper implements Serializable {
|
|
if (defaultSortBuilders != null) {
|
|
if (defaultSortBuilders != null) {
|
|
StreamUtil.of(defaultSortBuilders).forEach(builder -> list.add(builder));
|
|
StreamUtil.of(defaultSortBuilders).forEach(builder -> list.add(builder));
|
|
}
|
|
}
|
|
- list.add(SortBuilders.fieldSort(fieldName).order(SortOrder.DESC.toString().equalsIgnoreCase(order) ? SortOrder.DESC : SortOrder.ASC));
|
|
|
|
|
|
+ list.add(SortBuilders.fieldSort(fieldName)
|
|
|
|
+ .order(SortOrder.DESC.toString().equalsIgnoreCase(order) ? SortOrder.DESC : SortOrder.ASC));
|
|
defaultSortBuilders = list.toArray(new SortBuilder[list.size()]);
|
|
defaultSortBuilders = list.toArray(new SortBuilder[list.size()]);
|
|
}
|
|
}
|
|
|
|
|