Commit a0d8c7f

christophstroblmp911de

authored and

committed

Move off deprecated API.

See #3305 Original pull request: #3307

1 parent b97cc46 commit a0d8c7fCopy full SHA for a0d8c7f

File tree

-5

lines changed

-5

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`import java.util.function.Predicate;`
`23`	`23`	`import java.util.stream.Stream;`
`24`	`24`
	`25`	`+import org.jspecify.annotations.Nullable;`
`25`	`26`	`import org.springframework.data.domain.Limit;`
`26`	`27`	`import org.springframework.data.domain.Page;`
`27`	`28`	`import org.springframework.data.domain.Pageable;`
`@@ -41,7 +42,6 @@`
`41`	`42`	`import org.springframework.data.util.ReactiveWrappers;`
`42`	`43`	`import org.springframework.data.util.ReflectionUtils;`
`43`	`44`	`import org.springframework.data.util.TypeInformation;`
`44`		`-import org.springframework.lang.Nullable;`
`45`	`45`	`import org.springframework.util.Assert;`
`46`	`46`	`import org.springframework.util.ClassUtils;`
`47`	`47`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`
`20`	`20`	`import java.lang.annotation.ElementType;`
`21`	`21`	`import java.lang.reflect.Method;`
	`22`	`+import java.util.Arrays;`
`22`	`23`	`import java.util.Map;`
`23`	`24`	`import java.util.concurrent.ConcurrentHashMap;`
`24`	`25`
`@@ -245,8 +246,8 @@ public boolean equals(@Nullable Object o) {`
`245`	`246`	`@Override`
`246`	`247`	`public int hashCode() {`
`247`	`248`	`int result = (nullableReturn ? 1 : 0);`
`248`		`- result = (31 * result) + ObjectUtils.nullSafeHashCode(nullableParameters);`
`249`		`- result = (31 * result) + ObjectUtils.nullSafeHashCode(methodParameters);`
	`249`	`+ result = (31 * result) + Arrays.hashCode(nullableParameters);`
	`250`	`+ result = (31 * result) + Arrays.hashCode(methodParameters);`
`250`	`251`	`return result;`
`251`	`252`	`}`
`252`	`253`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,6 @@`
`23`	`23`	`import java.util.function.Consumer;`
`24`	`24`
`25`	`25`	`import org.jspecify.annotations.Nullable;`
`26`		`-`
`27`	`26`	`import org.springframework.core.MethodParameter;`
`28`	`27`	`import org.springframework.core.annotation.MergedAnnotation;`
`29`	`28`	`import org.springframework.core.annotation.MergedAnnotations;`
`@@ -126,7 +125,7 @@ public void setFallbackSort(Sort fallbackSort) {`
`126`	`125`	`protected Sort getDefaultFromAnnotationOrFallback(MethodParameter parameter) {`
`127`	`126`
`128`	`127`	`MergedAnnotations mergedAnnotations = MergedAnnotations.from(parameter, parameter.getParameterAnnotations(),`
`129`		`- RepeatableContainers.of(SortDefault.class, SortDefaults.class));`
	`128`	`+ RepeatableContainers.explicitRepeatable(SortDefault.class, SortDefaults.class));`
`130`	`129`
`131`	`130`	`List<MergedAnnotation<SortDefault>> annotations = mergedAnnotations.stream(SortDefault.class).toList();`
`132`	`131`

Comments

(0)