upgrade to spring-boot 2.4.3

Author: bnasslahsen

pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.2</version>
+		<version>2.4.3</version>
 	</parent>
 
 	<licenses>

springdoc-openapi-data-rest/src/main/java/org/springdoc/data/rest/core/DataRestRouterOperationService.java

@@ -48,8 +48,10 @@
 import org.springframework.data.rest.core.mapping.ResourceType;
 import org.springframework.http.HttpMethod;
 import org.springframework.util.AntPathMatcher;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.servlet.mvc.condition.PathPatternsRequestCondition;
 import org.springframework.web.servlet.mvc.condition.PatternsRequestCondition;
 import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
 
@@ -176,9 +178,8 @@ private void buildRouterOperationList(List<RouterOperation> routerOperationList,
 
 		for (RequestMethod requestMethod : requestMethods) {
 			if (!UNDOCUMENTED_REQUEST_METHODS.contains(requestMethod)) {
-				PatternsRequestCondition patternsRequestCondition = requestMappingInfo.getPatternsCondition();
-				if (patternsRequestCondition != null) {
-					Set<String> patterns = patternsRequestCondition.getPatterns();
+				Set<String> patterns = getActivePatterns(requestMappingInfo);
+				if (!CollectionUtils.isEmpty(patterns)) {
 					Map<String, String> regexMap = new LinkedHashMap<>();
 					String relationName = dataRestRepository.getRelationName();
 					String operationPath = calculateOperationPath(path, subPath, patterns, regexMap, controllerType, relationName);
@@ -273,8 +274,8 @@ private Optional<Entry<RequestMappingInfo, HandlerMethod>> getSearchEntry(Map<Re
 	private boolean isSearchControllerPresent(RequestMappingInfo requestMappingInfo, HandlerMethod handlerMethod, RequestMethod requestMethod) {
 		if (!UNDOCUMENTED_REQUEST_METHODS.contains(requestMethod)) {
 			PatternsRequestCondition patternsRequestCondition = requestMappingInfo.getPatternsCondition();
-			if (patternsRequestCondition != null) {
-				Set<String> patterns = patternsRequestCondition.getPatterns();
+			Set<String> patterns = getActivePatterns(requestMappingInfo);
+			if (!CollectionUtils.isEmpty(patterns)) {
 				Map<String, String> regexMap = new LinkedHashMap<>();
 				String operationPath;
 				for (String pattern : patterns) {
@@ -291,4 +292,22 @@ private boolean isSearchControllerPresent(RequestMappingInfo requestMappingInfo,
 		return false;
 	}
 
+	/**
+	 * Gets active patterns.
+	 *
+	 * @param requestMappingInfo the request mapping info
+	 * @return the active patterns
+	 */
+	private Set<String> getActivePatterns(RequestMappingInfo requestMappingInfo) {
+		Set<String> patterns = null;
+		PatternsRequestCondition patternsRequestCondition = requestMappingInfo.getPatternsCondition();
+		if (patternsRequestCondition != null)
+			patterns = patternsRequestCondition.getPatterns();
+		else {
+			PathPatternsRequestCondition pathPatternsRequestCondition = requestMappingInfo.getPathPatternsCondition();
+			if (pathPatternsRequestCondition != null)
+				patterns = pathPatternsRequestCondition.getPatternValues();
+		}
+		return patterns;
+	}
 }