Update to Spring Boot 2.6.0, fixes #93, #92, #91

Also see spring-projects/spring-framework#27715
qaware · Nov 24, 2021 · 587df6a · 587df6a
1 parent aa70c65
commit 587df6a
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 5 deletions.
diff --git a/demo/openapi-generator-for-spring-demo-webflux/pom.xml b/demo/openapi-generator-for-spring-demo-webflux/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.5.6</version>
+        <version>2.6.0</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>de.qaware.tools.openapi-generator-for-spring.demo</groupId>

diff --git a/demo/openapi-generator-for-spring-demo-webmvc/pom.xml b/demo/openapi-generator-for-spring-demo-webmvc/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.5.6</version>
+        <version>2.6.0</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>de.qaware.tools.openapi-generator-for-spring.demo</groupId>

diff --git a/...ware/openapigeneratorforspring/autoconfigure/OpenApiGeneratorWebMvcAutoConfiguration.java b/...ware/openapigeneratorforspring/autoconfigure/OpenApiGeneratorWebMvcAutoConfiguration.java
@@ -27,6 +27,7 @@
 import de.qaware.openapigeneratorforspring.common.web.OpenApiResource;
 import de.qaware.openapigeneratorforspring.webmvc.HandlerMethodsProviderForWebMvc;
 import de.qaware.openapigeneratorforspring.webmvc.OpenApiRequestAwareSupplierForWebMvc;
+import lombok.val;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
@@ -50,12 +51,27 @@ public InitializingBean openApiResourceRegistration(
             RequestMappingHandlerMapping requestMappingHandlerMapping
     ) {
         return () -> openApiResource.registerMapping(
-                (path, produces) -> RequestMappingInfo.paths(path).methods(GET).produces(produces).build(),
+                (path, produces) -> RequestMappingInfo.paths(path).methods(GET).produces(produces).options(buildRequestMappingInfoOptions(requestMappingHandlerMapping)).build(),
                 requestMappingHandlerMapping::registerMapping,
                 openApiResource
         );
     }
 
+    private RequestMappingInfo.BuilderConfiguration buildRequestMappingInfoOptions(RequestMappingHandlerMapping requestMappingHandlerMapping) {
+        val config = new RequestMappingInfo.BuilderConfiguration();
+        config.setTrailingSlashMatch(requestMappingHandlerMapping.useTrailingSlashMatch());
+        config.setContentNegotiationManager(requestMappingHandlerMapping.getContentNegotiationManager());
+
+        if (requestMappingHandlerMapping.getPatternParser() != null) {
+            config.setPatternParser(requestMappingHandlerMapping.getPatternParser());
+        } else {
+            config.setSuffixPatternMatch(requestMappingHandlerMapping.useSuffixPatternMatch());
+            config.setRegisteredSuffixPatternMatch(requestMappingHandlerMapping.useRegisteredSuffixPatternMatch());
+            config.setPathMatcher(requestMappingHandlerMapping.getPathMatcher());
+        }
+        return config;
+    }
+
     @Bean
     @ConditionalOnMissingBean
     public HandlerMethodsProvider handlerMethodsProviderFromWebMvc(

diff --git a/...main/java/de/qaware/openapigeneratorforspring/webmvc/HandlerMethodsProviderForWebMvc.java b/...main/java/de/qaware/openapigeneratorforspring/webmvc/HandlerMethodsProviderForWebMvc.java
@@ -25,9 +25,15 @@
 import de.qaware.openapigeneratorforspring.common.paths.SpringWebHandlerMethodBuilder;
 import de.qaware.openapigeneratorforspring.common.paths.SpringWebRequestMethodEnumMapper;
 import lombok.RequiredArgsConstructor;
+import org.springframework.web.servlet.mvc.condition.PathPatternsRequestCondition;
+import org.springframework.web.servlet.mvc.condition.PatternsRequestCondition;
+import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
+import org.springframework.web.util.pattern.PathPattern;
 
+import java.util.Collections;
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 @RequiredArgsConstructor
@@ -42,9 +48,22 @@ public List<HandlerMethodWithInfo> getHandlerMethods() {
         return requestMappingHandlerMapping.getHandlerMethods().entrySet().stream()
                 .map(entry -> new HandlerMethodWithInfo(
                         springWebHandlerMethodBuilder.build(entry.getValue()),
-                        entry.getKey().getPatternsCondition().getPatterns(),
+                        findPatterns(entry.getKey()),
                         springWebRequestMethodEnumMapper.map(entry.getKey().getMethodsCondition().getMethods())
                 ))
                 .collect(Collectors.toList());
     }
+
+    private Set<String> findPatterns(RequestMappingInfo requestMappingInfo) {
+        PatternsRequestCondition patternsCondition = requestMappingInfo.getPatternsCondition();
+        PathPatternsRequestCondition pathPatternsCondition = requestMappingInfo.getPathPatternsCondition();
+        if (patternsCondition != null) {
+            return patternsCondition.getPatterns();
+        } else if (pathPatternsCondition != null) {
+            return pathPatternsCondition.getPatterns().stream()
+                    .map(PathPattern::getPatternString)
+                    .collect(Collectors.toSet());
+        }
+        return Collections.emptySet();
+    }
 }
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.5.6</version>
+        <version>2.6.0</version>
     </parent>
 
     <groupId>de.qaware.tools.openapi-generator-for-spring</groupId>