Skip to content

SUP-19066: Minor sorting API changes #1732

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yrucrem wants to merge 1 commit into
base: hotfix-2.1.x
Choose a base branch
from
Open

SUP-19066: Minor sorting API changes #1732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog/src/changelog/entries/2025/10/8493.SUP-19066.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Core: Some refactoring of sorting core API has been performed.
2 changes: 2 additions & 0 deletions common/src/main/resources/i18n/translations_de.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,3 +344,5 @@ cluster_coordination_master_set=Der neue Master Server wurde eingestellt.
cluster_coordination_master_set_error_not_electable=Der node "{0}" kann nicht zum master werden.

cache_clear_invoked=Das Leeren der Caches wurde gestartet.

wrong_sorting_column_name=Die folgenden Spaltennamen sind für die Sortierung nicht zulässig: [{0}]. Zulässige Spalten sind: [{1}].
2 changes: 2 additions & 0 deletions common/src/main/resources/i18n/translations_en.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,3 +342,5 @@ cluster_coordination_master_set=The coordination master has been set.
cluster_coordination_master_set_error_not_electable=The node "{0}" is not electable.

cache_clear_invoked=Clearing the caches has been invoked.

wrong_sorting_column_name=The following column names are not allowed for sorting: [{0}]. Allowed are: [{1}].
2 changes: 2 additions & 0 deletions common/src/main/resources/i18n/translations_zh.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,3 +327,5 @@ admin_plugin_error_timeout=插件{0}已超时。操作失败。
webroot_error_parent_not_found=找不到给定资源路径中的父节点。仅以下路径可以解析：{0}。确保首先创建父元素。
webroot_error_segment_field_mismatch=请求的资源路径{0}中的webroot分节与字段属性{1}中的分节不匹配。提供的值必须匹配。
webroot_error_prefix_invalid=请求路径{0}并非以所选分支的必需路径前缀{1}开头。

wrong_sorting_column_name=以下列名不允许用于排序：[{0}]。允许的列名是：[{1}]。
4 changes: 2 additions & 2 deletions mdm/api/src/main/java/com/gentics/mesh/parameter/impl/SortingParametersImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ public String getName() {

@Override
public SortingParameters putSort(String sortBy, SortOrder order) {
if (StringUtils.isNotBlank(sortBy) && order != null) {
sort.put(sortBy, order);
if (StringUtils.isNotBlank(sortBy)) {
sort.put(sortBy, Optional.ofNullable(order).orElse(SortOrder.ASCENDING));
setParameter(SORT_BY_PARAMETER_KEY, sortBy);
setParameter(SORT_ORDER_PARAMETER_KEY, order.getValue());
}
Expand Down
5 changes: 3 additions & 2 deletions rest-model/src/main/java/com/gentics/mesh/parameter/SortingParameters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.util.Collections;
import java.util.Map;
import java.util.Optional;

import org.apache.commons.lang.StringUtils;

Expand All @@ -27,8 +28,8 @@ public interface SortingParameters extends ParameterProvider {
default Map<String, SortOrder> getSort() {
String sortBy = getParameter(SortingParameters.SORT_BY_PARAMETER_KEY);
SortOrder sortOrder = SortOrder.valueOfName(getParameter(SortingParameters.SORT_ORDER_PARAMETER_KEY));
if (StringUtils.isNotBlank(sortBy) && sortOrder != null) {
return Collections.singletonMap(sortBy, sortOrder);
if (StringUtils.isNotBlank(sortBy)) {
return Collections.singletonMap(sortBy, Optional.ofNullable(sortOrder).orElse(SortOrder.ASCENDING));
} else {
return Collections.emptyMap();
}
Expand Down