code review

Author: bnasslahsen

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

@@ -179,9 +179,8 @@ private void buildRouterOperationList(List<RouterOperation> routerOperationList,
 				PatternsRequestCondition patternsRequestCondition = requestMappingInfo.getPatternsCondition();
 				Set<String> patterns = patternsRequestCondition.getPatterns();
 				Map<String, String> regexMap = new LinkedHashMap<>();
-				String operationPath = calculateOperationPath(path, subPath, patterns, regexMap, controllerType);
-				if (ControllerType.PROPERTY.equals(controllerType))
-					operationPath = operationPath.replace("{property}", dataRestRepository.getRelationName());
+				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);
 			}
@@ -199,13 +198,15 @@ private void buildRouterOperationList(List<RouterOperation> routerOperationList,
 	 * @return the string
 	 */
 	private String calculateOperationPath(String path, String subPath, Set<String> patterns,
-			Map<String, String> regexMap, ControllerType controllerType) {
+			Map<String, String> regexMap, ControllerType controllerType, String relationName) {
 		String operationPath = null;
 		for (String pattern : patterns) {
 			operationPath = PathUtils.parsePath(pattern, regexMap);
 			operationPath = operationPath.replace(REPOSITORY_PATH, path);
 			if (ControllerType.SEARCH.equals(controllerType))
 				operationPath = operationPath.replace(SEARCH_PATH, subPath);
+			else if (ControllerType.PROPERTY.equals(controllerType))
+				operationPath = operationPath.replace("{property}", relationName);
 		}
 		return operationPath;
 	}