Skip to content

[#2152] Detect directions in default sort values #2159

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

Merged
merged 1 commit into from
Mar 26, 2023
Merged

[#2152] Detect directions in default sort values #2159

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
33 changes: 23 additions & 10 deletions ...main/java/org/springdoc/core/customizers/DataRestDelegatingMethodParameterCustomizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,9 @@

import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.*;
import java.util.regex.Pattern;
import java.util.stream.Collectors;

import com.fasterxml.jackson.core.JsonProcessingException;
import io.swagger.v3.core.util.ObjectMapperFactory;
Expand Down Expand Up @@ -805,11 +804,7 @@ private String getArrayDefaultValue(String parameterName, PageableDefault pageab
if ("sort".equals(parameterName)) {
DefaultSort defaultSort = getDefaultSort(pageableDefault, sortDefault);
if (defaultSort != null && ArrayUtils.isNotEmpty(defaultSort.properties)) {
List<String> sortValues = new ArrayList<>();
for (String sortValue : defaultSort.properties) {
String sortStr = String.join(",", sortValue, defaultSort.direction.name());
sortValues.add(sortStr);
}
final List<String> sortValues = defaultSort.getEffectiveProperties();
try {
defaultValue = ObjectMapperFactory.buildStrictGenericObjectMapper().writeValueAsString(sortValues);
}
Expand Down Expand Up @@ -881,6 +876,13 @@ private boolean isRepositoryRestConfigurationPresent() {
}

private static class DefaultSort {

private static final String DIRECTION_GROUP = Arrays.stream(Sort.Direction.values()).map(Enum::name).collect(Collectors.joining("|"));

private static final String DIRECTED_REGEXP = "\\w+(\\.\\w+)*,\\s*(" + DIRECTION_GROUP + ')';

private static final Pattern DIRECTED_PATTERN = Pattern.compile(DIRECTED_REGEXP, Pattern.CASE_INSENSITIVE);

private final Sort.Direction direction;

private final String[] properties;
Expand All @@ -889,5 +891,16 @@ private static class DefaultSort {
this.direction = direction;
this.properties = properties;
}

List<String> getEffectiveProperties() {
return Arrays.stream(properties)
.map(p -> {
if (DIRECTED_PATTERN.matcher(p).matches()) {
return p;
}
return p + ',' + direction.name();
})
.collect(Collectors.toList());
}
}
}
}