Spring/spring-data-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use legacy page serialization mode if no SpringDataWebSettings are present.

Browse Source 
Fixes GH-3101.
This commit is contained in:
Oliver Drotbohm
2024-05-30 23:34:43 +02:00
parent 19e2a1c925
commit 0a603f2e57
2 changed files with 44 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/springframework/data/web/config/SpringDataJacksonConfiguration.java
View File

@@ -17,7 +17,6 @@ package org.springframework.data.web.config;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.data.domain.Page;
@@ -40,8 +39,7 @@ import com.fasterxml.jackson.databind.util.StdConverter;
*/
public class SpringDataJacksonConfiguration implements SpringDataJacksonModules {
@Nullable
@Autowired(required = false) SpringDataWebSettings settings;
@Nullable @Autowired(required = false) SpringDataWebSettings settings;
@Bean
public GeoModule jacksonGeoModule() {
@@ -84,7 +82,7 @@ public class SpringDataJacksonConfiguration implements SpringDataJacksonModules
addSerializer(UNPAGED_TYPE, new UnpagedAsInstanceSerializer());
if (settings != null && settings.pageSerializationMode() == PageSerializationMode.DIRECT) {
if (settings == null || settings.pageSerializationMode() == PageSerializationMode.DIRECT) {
setMixInAnnotation(PageImpl.class, WarningMixing.class);
} else {
setMixInAnnotation(PageImpl.class, WrappingMixing.class);