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

Allow ResponseBodyAdvice to implement RequestBodyAdvice

Browse Source 
Prior to this commit, if a @ControllerAdvice bean implemented both
RequestBodyAdvice and ResponseBodyAdvice, it was only supported as
RequestBodyAdvice, meaning it was never invoked as ResponseBodyAdvice.

This commit revises RequestResponseBodyAdviceChain to ensure that a
single bean implementing both types of body advice is in fact handled
as both types of advice.

See gh-22638
This commit is contained in:
Sam Brannen
2019-03-26 13:46:29 +01:00
parent aa575c374a
commit e6fd7abdb9
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyAdviceChain.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2017 the original author or authors. * Copyright 2002-2019 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -38,6 +38,7 @@ import org.springframework.web.method.ControllerAdviceBean;
* {@link org.springframework.web.method.ControllerAdviceBean ControllerAdviceBean}. * {@link org.springframework.web.method.ControllerAdviceBean ControllerAdviceBean}.
* *
* @author Rossen Stoyanchev * @author Rossen Stoyanchev
* @author Sam Brannen
* @since 4.2 * @since 4.2
*/ */
class RequestResponseBodyAdviceChain implements RequestBodyAdvice, ResponseBodyAdvice<Object> { class RequestResponseBodyAdviceChain implements RequestBodyAdvice, ResponseBodyAdvice<Object> {
@@ -49,7 +50,7 @@ class RequestResponseBodyAdviceChain implements RequestBodyAdvice, ResponseBodyA
/** /**
* Create an instance from a list of objects that are either of type * Create an instance from a list of objects that are either of type
* {@code ControllerAdviceBean} or {@code RequestBodyAdvice}. * {@code RequestBodyAdvice} or {@code ResponseBodyAdvice}.
*/ */
public RequestResponseBodyAdviceChain(@Nullable List<Object> requestResponseBodyAdvice) { public RequestResponseBodyAdviceChain(@Nullable List<Object> requestResponseBodyAdvice) {
if (requestResponseBodyAdvice != null) { if (requestResponseBodyAdvice != null) {
@@ -60,7 +61,7 @@ class RequestResponseBodyAdviceChain implements RequestBodyAdvice, ResponseBodyA
if (RequestBodyAdvice.class.isAssignableFrom(beanType)) { if (RequestBodyAdvice.class.isAssignableFrom(beanType)) {
this.requestBodyAdvice.add(advice); this.requestBodyAdvice.add(advice);
} }
else if (ResponseBodyAdvice.class.isAssignableFrom(beanType)) { if (ResponseBodyAdvice.class.isAssignableFrom(beanType)) {
this.responseBodyAdvice.add(advice); this.responseBodyAdvice.add(advice);
} }
} }