Skip to content

Migrate responseBodyAdvice test to Jackson 3 converter #36920

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

Open
froggy0m0 wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −11
Open

Migrate responseBodyAdvice test to Jackson 3 converter #36920

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
24 changes: 13 additions & 11 deletions .../springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@
import org.springframework.http.ResponseEntity;
import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.http.converter.StringHttpMessageConverter;
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
import org.springframework.http.converter.json.MappingJacksonValue;
import org.springframework.http.converter.json.JacksonJsonHttpMessageConverter;
import org.springframework.http.server.ServerHttpRequest;
import org.springframework.http.server.ServerHttpResponse;
import org.springframework.http.server.ServletServerHttpResponse;
Expand Down Expand Up @@ -279,11 +278,9 @@ void modelAttributePackageNameAdvice() throws Exception {
}

@Test // gh-15486
@SuppressWarnings("removal")
// TODO Migrate from MappingJackson2HttpMessageConverter and MappingJacksonValue to JacksonJsonHttpMessageConverter.
void responseBodyAdvice() throws Exception {
List<HttpMessageConverter<?>> converters = new ArrayList<>();
converters.add(new MappingJackson2HttpMessageConverter());
converters.add(new JacksonJsonHttpMessageConverter());
this.handlerAdapter.setMessageConverters(converters);

this.webAppContext.registerSingleton("rba", ResponseCodeSuppressingAdvice.class);
Expand Down Expand Up @@ -455,20 +452,25 @@ public void addAttributes(Model model) {
*/
@ControllerAdvice
private static class ResponseCodeSuppressingAdvice
extends AbstractMappingJacksonResponseBodyAdvice implements RequestBodyAdvice {
implements ResponseBodyAdvice<Object>, RequestBodyAdvice {

@Override
@SuppressWarnings("removal")
protected void beforeBodyWriteInternal(MappingJacksonValue bodyContainer, MediaType contentType,
MethodParameter returnType, ServerHttpRequest request, ServerHttpResponse response) {
public boolean supports(MethodParameter returnType, Class<? extends HttpMessageConverter<?>> converterType) {
return JacksonJsonHttpMessageConverter.class.equals(converterType);
}

@Override
public Object beforeBodyWrite(Object body, MethodParameter returnType,
MediaType contentType, Class<? extends HttpMessageConverter<?>> converterType,
ServerHttpRequest request, ServerHttpResponse response) {

int status = ((ServletServerHttpResponse) response).getServletResponse().getStatus();
response.setStatusCode(HttpStatus.OK);

Map<String, Object> map = new LinkedHashMap<>();
map.put("status", status);
map.put("message", bodyContainer.getValue());
bodyContainer.setValue(map);
map.put("message", body);
return map;
}

@Override
Expand Down