|
|
|
@ -23,7 +23,6 @@ import java.util.Optional; |
|
|
|
import java.util.function.Consumer; |
|
|
|
import java.util.function.Consumer; |
|
|
|
|
|
|
|
|
|
|
|
import org.jspecify.annotations.Nullable; |
|
|
|
import org.jspecify.annotations.Nullable; |
|
|
|
|
|
|
|
|
|
|
|
import org.springframework.core.MethodParameter; |
|
|
|
import org.springframework.core.MethodParameter; |
|
|
|
import org.springframework.core.annotation.MergedAnnotation; |
|
|
|
import org.springframework.core.annotation.MergedAnnotation; |
|
|
|
import org.springframework.core.annotation.MergedAnnotations; |
|
|
|
import org.springframework.core.annotation.MergedAnnotations; |
|
|
|
@ -126,7 +125,7 @@ public abstract class SortHandlerMethodArgumentResolverSupport { |
|
|
|
protected Sort getDefaultFromAnnotationOrFallback(MethodParameter parameter) { |
|
|
|
protected Sort getDefaultFromAnnotationOrFallback(MethodParameter parameter) { |
|
|
|
|
|
|
|
|
|
|
|
MergedAnnotations mergedAnnotations = MergedAnnotations.from(parameter, parameter.getParameterAnnotations(), |
|
|
|
MergedAnnotations mergedAnnotations = MergedAnnotations.from(parameter, parameter.getParameterAnnotations(), |
|
|
|
RepeatableContainers.of(SortDefault.class, SortDefaults.class)); |
|
|
|
RepeatableContainers.explicitRepeatable(SortDefault.class, SortDefaults.class)); |
|
|
|
|
|
|
|
|
|
|
|
List<MergedAnnotation<SortDefault>> annotations = mergedAnnotations.stream(SortDefault.class).toList(); |
|
|
|
List<MergedAnnotation<SortDefault>> annotations = mergedAnnotations.stream(SortDefault.class).toList(); |
|
|
|
|
|
|
|
|
|
|
|
|