Merge changes from master

Author: devnied

springdoc-openapi-webmvc-core/src/main/java/org/springdoc/api/MultipleOpenApiResource.java

@@ -25,6 +25,7 @@
 import static org.springdoc.core.Constants.API_DOCS_URL;
 import static org.springdoc.core.Constants.APPLICATION_OPENAPI_YAML;
 import static org.springdoc.core.Constants.DEFAULT_API_DOCS_URL_YAML;
+import static org.springdoc.core.Constants.SPRINGDOC_CACHE_DISABLED_VALUE;
 import static org.springframework.util.AntPathMatcher.DEFAULT_PATH_SEPARATOR;
 
 @RestController

springdoc-openapi-webmvc-core/src/main/java/org/springdoc/api/OpenApiResource.java

@@ -8,7 +8,11 @@
 import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.models.OpenAPI;
-import org.springdoc.core.*;
+import org.springdoc.core.AbstractRequestBuilder;
+import org.springdoc.core.AbstractResponseBuilder;
+import org.springdoc.core.OpenAPIBuilder;
+import org.springdoc.core.OperationBuilder;
+import org.springdoc.core.SecurityOAuth2Provider;
 import org.springdoc.core.customizers.OpenApiCustomiser;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.annotation.AnnotationUtils;
@@ -94,7 +98,7 @@ protected void getPaths(Map<String, Object> restControllers) {
             SecurityOAuth2Provider securityOAuth2Provider = securityOAuth2ProviderOptional.get();
             Map<RequestMappingInfo, HandlerMethod> mapOauth = securityOAuth2Provider.getHandlerMethods();
             Map<String, Object> requestMappingMapSec = securityOAuth2Provider.getFrameworkEndpoints();
-            calculatePath(requestMappingMapSec, mapOauth);
+            calculatePath(requestMappingMapSec, mapOauth, Optional.empty());
         }
     }
 

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app68/SpringDocApp68Test.java

@@ -19,8 +19,6 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-import static test.org.springdoc.utils.FileUtils.getContent;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
 import static test.org.springdoc.api.app68.FileUtils.getContent;
 
 @RunWith(SpringRunner.class)