Skip to content
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

fix(Fusion): Spring Boot 2.4 string patterns request mapping compatibility #12642

Merged
merged 1 commit into from
Jan 3, 2022
Merged

fix(Fusion): Spring Boot 2.4 string patterns request mapping compatibility #12642

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
25 changes: 22 additions & 3 deletions fusion-endpoint/src/main/java/com/vaadin/fusion/FusionControllerConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
import org.springframework.web.util.pattern.PathPatternParser;

import com.vaadin.flow.server.auth.AccessAnnotationChecker;
import com.vaadin.fusion.auth.CsrfChecker;
Expand Down Expand Up @@ -95,9 +96,27 @@ protected void registerHandlerMethod(Object handler,
*/
private RequestMappingInfo prependEndpointPrefixUrl(
RequestMappingInfo mapping) {
return mapping.mutate()
.paths(fusionEndpointProperties.getVaadinEndpointPrefix())
.build().combine(mapping);
RequestMappingInfo.Builder prefixMappingBuilder = RequestMappingInfo
.paths(fusionEndpointProperties.getVaadinEndpointPrefix());
if (mapping.getPatternsCondition() == null) {
// `getPatternsCondition()` and `getPathPatternsCondition()` are
// mutually exclusive: only one of them is active, the other
// returns null. Since patterns condition is null here, let us
// assume `mapping` uses parsed PathPatterns condition (default
// since Spring Boot 2.6).
//
// However, `prefixMappingBuilder` uses non-parsed patterns
// condition by default, which does not combine with parsed
// PathPatterns condition in `RequestMappingInfo.combine()`.
//
// Set the pattern parser option for `prefixMappingBuilder`
// to make it use parsed PathPatterns condition, so that
// `.combine(mapping)` below works.
RequestMappingInfo.BuilderConfiguration options = new RequestMappingInfo.BuilderConfiguration();
options.setPatternParser(PathPatternParser.defaultInstance);
prefixMappingBuilder.options(options);
}
return prefixMappingBuilder.build().combine(mapping);
}

/**
Expand Down