code review

Author: bnasslahsen

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

@@ -177,12 +177,14 @@ private void buildRouterOperationList(List<RouterOperation> routerOperationList,
 		for (RequestMethod requestMethod : requestMethods) {
 			if (!UNDOCUMENTED_REQUEST_METHODS.contains(requestMethod)) {
 				PatternsRequestCondition patternsRequestCondition = requestMappingInfo.getPatternsCondition();
-				Set<String> patterns = patternsRequestCondition.getPatterns();
-				Map<String, String> regexMap = new LinkedHashMap<>();
-				String relationName = (dataRestRepository!=null) ? dataRestRepository.getRelationName(): null;
-				String operationPath = calculateOperationPath(path, subPath, patterns, regexMap, controllerType, relationName);
-				buildRouterOperation(routerOperationList, dataRestRepository, openAPI, methodResourceMapping,
-						handlerMethod, requestMethod, resourceMetadata, operationPath, controllerType);
+				if (patternsRequestCondition != null) {
+					Set<String> patterns = patternsRequestCondition.getPatterns();
+					Map<String, String> regexMap = new LinkedHashMap<>();
+					String relationName = (dataRestRepository != null) ? dataRestRepository.getRelationName() : null;
+					String operationPath = calculateOperationPath(path, subPath, patterns, regexMap, controllerType, relationName);
+					buildRouterOperation(routerOperationList, dataRestRepository, openAPI, methodResourceMapping,
+							handlerMethod, requestMethod, resourceMetadata, operationPath, controllerType);
+				}
 			}
 		}
 	}
@@ -270,16 +272,18 @@ 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();
-			Set<String> patterns = patternsRequestCondition.getPatterns();
-			Map<String, String> regexMap = new LinkedHashMap<>();
-			String operationPath;
-			for (String pattern : patterns) {
-				operationPath = PathUtils.parsePath(pattern, regexMap);
-				if (operationPath.contains(REPOSITORY_PATH) && operationPath.contains(SEARCH_PATH)) {
-					MethodAttributes methodAttributes = new MethodAttributes(springDocConfigProperties.getDefaultConsumesMediaType(), springDocConfigProperties.getDefaultProducesMediaType());
-					methodAttributes.calculateConsumesProduces(handlerMethod.getMethod());
-					if (springDocConfigProperties.getDefaultProducesMediaType().equals(methodAttributes.getMethodProduces()[0]))
-						return true;
+			if (patternsRequestCondition != null) {
+				Set<String> patterns = patternsRequestCondition.getPatterns();
+				Map<String, String> regexMap = new LinkedHashMap<>();
+				String operationPath;
+				for (String pattern : patterns) {
+					operationPath = PathUtils.parsePath(pattern, regexMap);
+					if (operationPath.contains(REPOSITORY_PATH) && operationPath.contains(SEARCH_PATH)) {
+						MethodAttributes methodAttributes = new MethodAttributes(springDocConfigProperties.getDefaultConsumesMediaType(), springDocConfigProperties.getDefaultProducesMediaType());
+						methodAttributes.calculateConsumesProduces(handlerMethod.getMethod());
+						if (springDocConfigProperties.getDefaultProducesMediaType().equals(methodAttributes.getMethodProduces()[0]))
+							return true;
+					}
 				}
 			}
 		}

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

@@ -242,21 +242,23 @@ protected void calculatePath(Map<String, Object> restControllers, Map<RequestMap
 			RequestMappingInfo requestMappingInfo = entry.getKey();
 			HandlerMethod handlerMethod = entry.getValue();
 			PatternsRequestCondition patternsRequestCondition = requestMappingInfo.getPatternsCondition();
-			Set<String> patterns = patternsRequestCondition.getPatterns();
-			Map<String, String> regexMap = new LinkedHashMap<>();
-			for (String pattern : patterns) {
-				String operationPath = PathUtils.parsePath(pattern, regexMap);
-				String[] produces = requestMappingInfo.getProducesCondition().getProducibleMediaTypes().stream().map(MimeType::toString).toArray(String[]::new);
-				String[] consumes = requestMappingInfo.getConsumesCondition().getConsumableMediaTypes().stream().map(MimeType::toString).toArray(String[]::new);
-				String[] headers = requestMappingInfo.getHeadersCondition().getExpressions().stream().map(Object::toString).toArray(String[]::new);
-				if (((actuatorProvider.isPresent() && actuatorProvider.get().isRestController(operationPath, handlerMethod.getBeanType()))
-						|| isRestController(restControllers, handlerMethod, operationPath))
-						&& isFilterCondition(handlerMethod, operationPath, produces, consumes, headers)) {
-					Set<RequestMethod> requestMethods = requestMappingInfo.getMethodsCondition().getMethods();
-					// default allowed requestmethods
-					if (requestMethods.isEmpty())
-						requestMethods = this.getDefaultAllowedHttpMethods();
-					calculatePath(handlerMethod, operationPath, requestMethods);
+			if (patternsRequestCondition != null) {
+				Set<String> patterns = patternsRequestCondition.getPatterns();
+				Map<String, String> regexMap = new LinkedHashMap<>();
+				for (String pattern : patterns) {
+					String operationPath = PathUtils.parsePath(pattern, regexMap);
+					String[] produces = requestMappingInfo.getProducesCondition().getProducibleMediaTypes().stream().map(MimeType::toString).toArray(String[]::new);
+					String[] consumes = requestMappingInfo.getConsumesCondition().getConsumableMediaTypes().stream().map(MimeType::toString).toArray(String[]::new);
+					String[] headers = requestMappingInfo.getHeadersCondition().getExpressions().stream().map(Object::toString).toArray(String[]::new);
+					if (((actuatorProvider.isPresent() && actuatorProvider.get().isRestController(operationPath, handlerMethod.getBeanType()))
+							|| isRestController(restControllers, handlerMethod, operationPath))
+							&& isFilterCondition(handlerMethod, operationPath, produces, consumes, headers)) {
+						Set<RequestMethod> requestMethods = requestMappingInfo.getMethodsCondition().getMethods();
+						// default allowed requestmethods
+						if (requestMethods.isEmpty())
+							requestMethods = this.getDefaultAllowedHttpMethods();
+						calculatePath(handlerMethod, operationPath, requestMethods);
+					}
 				}
 			}
 		}