root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch '5.3.x'

This commit is contained in:
Sébastien Deleuze 2022-11-02 11:16:35 +01:00
parent 21414bc265 58bb6e7181
commit aa2d7dba5b
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-webflux/src/main/java/org/springframework/web/reactive/result/method/RequestMappingInfoHandlerMapping.java
View File

@ -142,11 +142,14 @@ public abstract class RequestMappingInfoHandlerMapping extends AbstractHandlerMe
exchange.getAttributes().put(URI_TEMPLATE_VARIABLES_ATTRIBUTE, uriVariables); exchange.getAttributes().put(URI_TEMPLATE_VARIABLES_ATTRIBUTE, uriVariables);
exchange.getAttributes().put(MATRIX_VARIABLES_ATTRIBUTE, matrixVariables); exchange.getAttributes().put(MATRIX_VARIABLES_ATTRIBUTE, matrixVariables);
if (!info.getProducesCondition().getProducibleMediaTypes().isEmpty()) { ProducesRequestCondition producesCondition = info.getProducesCondition();
Set<MediaType> mediaTypes = info.getProducesCondition().getProducibleMediaTypes(); if (!producesCondition.isEmpty()) {
Set<MediaType> mediaTypes = producesCondition.getProducibleMediaTypes();
if (!mediaTypes.isEmpty()) {
exchange.getAttributes().put(PRODUCIBLE_MEDIA_TYPES_ATTRIBUTE, mediaTypes); exchange.getAttributes().put(PRODUCIBLE_MEDIA_TYPES_ATTRIBUTE, mediaTypes);
} }
} }
}
/** /**
* Iterate all RequestMappingInfos once again, look if any match by URL at * Iterate all RequestMappingInfos once again, look if any match by URL at

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

@ -148,11 +148,14 @@ public abstract class RequestMappingInfoHandlerMapping extends AbstractHandlerMe
extractMatchDetails((PatternsRequestCondition) condition, lookupPath, request); extractMatchDetails((PatternsRequestCondition) condition, lookupPath, request);
} }
if (!info.getProducesCondition().getProducibleMediaTypes().isEmpty()) { ProducesRequestCondition producesCondition = info.getProducesCondition();
Set<MediaType> mediaTypes = info.getProducesCondition().getProducibleMediaTypes(); if (!producesCondition.isEmpty()) {
Set<MediaType> mediaTypes = producesCondition.getProducibleMediaTypes();
if (!mediaTypes.isEmpty()) {
request.setAttribute(PRODUCIBLE_MEDIA_TYPES_ATTRIBUTE, mediaTypes); request.setAttribute(PRODUCIBLE_MEDIA_TYPES_ATTRIBUTE, mediaTypes);
} }
} }
}
private void extractMatchDetails( private void extractMatchDetails(
PathPatternsRequestCondition condition, String lookupPath, HttpServletRequest request) { PathPatternsRequestCondition condition, String lookupPath, HttpServletRequest request) {