code review

Author: bnasslahsen

springdoc-openapi-data-rest/src/main/java/org/springdoc/data/rest/SpringRepositoryRestResourceProvider.java

@@ -230,7 +230,8 @@ else if (handlerMapping instanceof BasePathAwareHandlerMapping) {
 										.getValue().getBeanType()) || AlpsController.class.equals(requestMappingInfoHandlerMethodEntry
 										.getValue().getBeanType()))
 								.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (a1, a2) -> a1));
-						findControllers(routerOperationList, handlerMethodMapFiltered, resourceMetadata, null, openAPI);
+						dataRestRepository.setControllerType(ControllerType.GENERAL);
+						findControllers(routerOperationList, handlerMethodMapFiltered, resourceMetadata, dataRestRepository, openAPI);
 					}
 				}
 			}

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

@@ -43,5 +43,9 @@ public enum ControllerType {
 	/**
 	 *PROPERTY controller type.
 	 */
-	PROPERTY
+	PROPERTY,
+	/**
+	 *GENERAL controller type.
+	 */
+	GENERAL
 }

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

@@ -124,7 +124,7 @@ public Operation buildOperation(HandlerMethod handlerMethod, DataRestRepository
 		Operation operation = null;
 		if (ControllerType.ENTITY.equals(controllerType)
 				|| ControllerType.PROPERTY.equals(controllerType)
-				|| ControllerType.SCHEMA.equals(controllerType)) {
+				|| ControllerType.SCHEMA.equals(controllerType) || ControllerType.GENERAL.equals(controllerType)) {
 			operation = buildEntityOperation(handlerMethod, dataRestRepository,
 					openAPI, requestMethod, operationPath, methodAttributes, resourceMetadata);
 		}
@@ -151,7 +151,7 @@ private Operation buildEntityOperation(HandlerMethod handlerMethod, DataRestRepo
 			OpenAPI openAPI, RequestMethod requestMethod, String operationPath, MethodAttributes methodAttributes,
 			ResourceMetadata resourceMetadata) {
 		Class<?> domainType = null;
-		if (dataRestRepository != null)
+		if (!ControllerType.GENERAL.equals(dataRestRepository.getControllerType()))
 			domainType = dataRestRepository.getDomainType();
 		Operation operation = initOperation(handlerMethod, domainType, requestMethod);
 		dataRestRequestService.buildParameters(domainType, openAPI, handlerMethod, requestMethod, methodAttributes, operation, resourceMetadata);
@@ -312,7 +312,7 @@ private void addOperationDescription(Operation operation, RequestMethod requestM
 	 */
 	private String createDescription( String action, String entity, DataRestRepository dataRestRepository) {
 		String description;
-		if (dataRestRepository != null && ControllerType.PROPERTY.equals(dataRestRepository.getControllerType()))
+		if (ControllerType.PROPERTY.equals(dataRestRepository.getControllerType()))
 			description = action + dataRestRepository.getPropertyType().getSimpleName().toLowerCase()+ "-by-"+ entity +"-Id";
 		else
 			description = action + entity;

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

@@ -214,7 +214,7 @@ private Type getType(MethodParameter methodParameterReturn, Class<?> domainType,
 		Type returnType = ReturnTypeParser.resolveType(methodParameterReturn.getGenericParameterType(), methodParameterReturn.getContainingClass());
 		Class returnedEntityType = domainType;
 
-		if (dataRestRepository != null && ControllerType.PROPERTY.equals(dataRestRepository.getControllerType()))
+		if (ControllerType.PROPERTY.equals(dataRestRepository.getControllerType()))
 			returnedEntityType = dataRestRepository.getPropertyType();
 
 		if (returnType instanceof ParameterizedType) {
@@ -268,10 +268,10 @@ else if ((CollectionModel.class.equals(parameterizedType.getRawType())
 	 * @return the class
 	 */
 	private Class findType(RequestMethod requestMethod, DataRestRepository dataRestRepository) {
-		if (dataRestRepository != null && ControllerType.ENTITY.equals(dataRestRepository.getControllerType())
+		if (ControllerType.ENTITY.equals(dataRestRepository.getControllerType())
 				&& Arrays.stream(requestMethodsEntityModel).anyMatch(requestMethod::equals))
 			return EntityModel.class;
-		else if (dataRestRepository != null && ControllerType.PROPERTY.equals(dataRestRepository.getControllerType())) {
+		else if (ControllerType.PROPERTY.equals(dataRestRepository.getControllerType())) {
 			if (dataRestRepository.isCollectionLike())
 				return CollectionModel.class;
 			else if (dataRestRepository.isMap())

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

@@ -113,7 +113,7 @@ public void buildEntityRouterOperationList(List<RouterOperation> routerOperation
 			Map<RequestMappingInfo, HandlerMethod> handlerMethodMap, ResourceMetadata resourceMetadata,
 			DataRestRepository dataRestRepository, OpenAPI openAPI) {
 		String path = resourceMetadata.getPath().toString();
-		ControllerType controllerType = (dataRestRepository == null) ? ControllerType.SCHEMA : dataRestRepository.getControllerType();
+		ControllerType controllerType = dataRestRepository.getControllerType();
 		for (Entry<RequestMappingInfo, HandlerMethod> entry : handlerMethodMap.entrySet()) {
 			buildRouterOperationList(routerOperationList, resourceMetadata, dataRestRepository, openAPI, path, entry, null, controllerType, null);
 		}
@@ -180,7 +180,7 @@ private void buildRouterOperationList(List<RouterOperation> routerOperationList,
 				if (patternsRequestCondition != null) {
 					Set<String> patterns = patternsRequestCondition.getPatterns();
 					Map<String, String> regexMap = new LinkedHashMap<>();
-					String relationName = (dataRestRepository != null) ? dataRestRepository.getRelationName() : null;
+					String relationName = dataRestRepository.getRelationName();
 					String operationPath = calculateOperationPath(path, subPath, patterns, regexMap, controllerType, relationName);
 					buildRouterOperation(routerOperationList, dataRestRepository, openAPI, methodResourceMapping,
 							handlerMethod, requestMethod, resourceMetadata, operationPath, controllerType);

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

@@ -98,7 +98,7 @@ private void buildTags(Operation operation, HandlerMethod handlerMethod,
 			tagName = ProfileController.class.getSimpleName();
 			operation.addTagsItem(OpenAPIService.splitCamelCase(tagName));
 		}
-		else if (dataRestRepository != null && dataRestRepository.getDomainType() != null) {
+		else {
 			Class<?> domainType = dataRestRepository.getDomainType();
 			Set<Tag> tags = new HashSet<>();
 			Set<String> tagsStr = new HashSet<>();