Skip to content

Commit 0a603f2

Browse files
committed
Use legacy page serialization mode if no SpringDataWebSettings are present.
Fixes GH-3101.
1 parent 19e2a1c commit 0a603f2

File tree

2 files changed

+44
-4
lines changed

2 files changed

+44
-4
lines changed

src/main/java/org/springframework/data/web/config/SpringDataJacksonConfiguration.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import org.slf4j.Logger;
1919
import org.slf4j.LoggerFactory;
20-
2120
import org.springframework.beans.factory.annotation.Autowired;
2221
import org.springframework.context.annotation.Bean;
2322
import org.springframework.data.domain.Page;
@@ -40,8 +39,7 @@
4039
*/
4140
public class SpringDataJacksonConfiguration implements SpringDataJacksonModules {
4241

43-
@Nullable
44-
@Autowired(required = false) SpringDataWebSettings settings;
42+
@Nullable @Autowired(required = false) SpringDataWebSettings settings;
4543

4644
@Bean
4745
public GeoModule jacksonGeoModule() {
@@ -84,7 +82,7 @@ public PageModule(@Nullable SpringDataWebSettings settings) {
8482

8583
addSerializer(UNPAGED_TYPE, new UnpagedAsInstanceSerializer());
8684

87-
if (settings != null && settings.pageSerializationMode() == PageSerializationMode.DIRECT) {
85+
if (settings == null || settings.pageSerializationMode() == PageSerializationMode.DIRECT) {
8886
setMixInAnnotation(PageImpl.class, WarningMixing.class);
8987
} else {
9088
setMixInAnnotation(PageImpl.class, WrappingMixing.class);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
/*
2+
* Copyright 2024 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package org.springframework.data.web.config;
17+
18+
import static org.assertj.core.api.Assertions.*;
19+
20+
import org.junit.jupiter.api.Test;
21+
import org.springframework.data.domain.PageImpl;
22+
import org.springframework.data.web.config.SpringDataJacksonConfiguration.PageModule;
23+
import org.springframework.data.web.config.SpringDataJacksonConfiguration.PageModule.WarningMixing;
24+
25+
import com.fasterxml.jackson.databind.ObjectMapper;
26+
27+
/**
28+
* Unit tests for {@link SpringDataJacksonConfiguration}.
29+
*
30+
* @author Oliver Drotbohm
31+
*/
32+
class SpringDataJacksonConfigurationUnitTests {
33+
34+
@Test // GH-3101
35+
void usesDirectRenderingIfNoSpringDataWebSettingsArePresent() {
36+
37+
ObjectMapper mapper = new ObjectMapper();
38+
mapper.registerModule(new PageModule(null));
39+
40+
assertThat(mapper.getSerializationConfig().findMixInClassFor(PageImpl.class)).isEqualTo(WarningMixing.class);
41+
}
42+
}

0 commit comments

Comments
 (0)