Spring Data Rest: Exception while generating api doc with inheritance - NullPointerException: Cannot invoke "String.substring(int)". Fixes #1095

Author: bnasslahsen

Diff for: springdoc-openapi-common/src/main/java/org/springdoc/core/RepositoryRestResourceProvider.java

@@ -34,4 +34,11 @@ public interface RepositoryRestResourceProvider {
 	 */
 	Map getHandlerMethods();
 
+	/**
+	 * Customize.
+	 *
+	 * @param openAPI the open api
+	 */
+	void customize(OpenAPI openAPI);
+
 }

Diff for: springdoc-openapi-data-rest/src/main/java/org/springdoc/data/rest/SpringDocDataRestConfiguration.java

@@ -175,9 +175,9 @@ static class SpringRepositoryRestResourceProviderConfiguration {
 		SpringRepositoryRestResourceProvider springRepositoryRestResourceProvider(ResourceMappings mappings,
 				Repositories repositories, Associations associations, ApplicationContext applicationContext,
 				DataRestRouterOperationService dataRestRouterOperationService, PersistentEntities persistentEntities,
-				ObjectMapper mapper) {
+				ObjectMapper mapper,SpringDocDataRestUtils springDocDataRestUtils) {
 			return new SpringRepositoryRestResourceProvider(mappings, repositories, associations, applicationContext,
-					dataRestRouterOperationService, persistentEntities, mapper);
+					dataRestRouterOperationService, persistentEntities, mapper, springDocDataRestUtils);
 		}
 
 		/**

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

@@ -41,6 +41,7 @@
 import org.springdoc.data.rest.core.ControllerType;
 import org.springdoc.data.rest.core.DataRestRepository;
 import org.springdoc.data.rest.core.DataRestRouterOperationService;
+import org.springdoc.data.rest.utils.SpringDocDataRestUtils;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.core.annotation.AnnotatedElementUtils;
@@ -151,6 +152,11 @@ public class SpringRepositoryRestResourceProvider implements RepositoryRestResou
 	 */
 	private List<HandlerMapping> handlerMappingList;
 
+	/**
+	 * The Spring doc data rest utils.
+	 */
+	private SpringDocDataRestUtils springDocDataRestUtils;
+
 	/**
 	 * Instantiates a new Spring repository rest resource provider.
 	 *
@@ -162,14 +168,17 @@ public class SpringRepositoryRestResourceProvider implements RepositoryRestResou
 	 * @param persistentEntities the persistent entities
 	 * @param mapper the mapper
 	 */
-	public SpringRepositoryRestResourceProvider(ResourceMappings mappings, Repositories repositories, Associations associations, ApplicationContext applicationContext, DataRestRouterOperationService dataRestRouterOperationService, PersistentEntities persistentEntities, ObjectMapper mapper) {
+	public SpringRepositoryRestResourceProvider(ResourceMappings mappings, Repositories repositories,
+			Associations associations, ApplicationContext applicationContext, DataRestRouterOperationService dataRestRouterOperationService,
+			PersistentEntities persistentEntities, ObjectMapper mapper, SpringDocDataRestUtils springDocDataRestUtils) {
 		this.mappings = mappings;
 		this.repositories = repositories;
 		this.associations = associations;
 		this.applicationContext = applicationContext;
 		this.dataRestRouterOperationService = dataRestRouterOperationService;
 		this.persistentEntities = persistentEntities;
 		this.mapper = mapper;
+		this.springDocDataRestUtils = springDocDataRestUtils;
 	}
 
 
@@ -266,6 +275,17 @@ public Map getHandlerMethods() {
 				.filter(entry -> !entry.getValue().getBeanType().getName().startsWith(SPRING_DATA_REST_PACKAGE) && AnnotatedElementUtils.hasAnnotation(entry.getValue().getBeanType(), RepositoryRestController.class))
 				.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
 	}
+
+	/**
+	 * Customize.
+	 *
+	 * @param openAPI the open api
+	 */
+	@Override
+	public void customize(OpenAPI openAPI) {
+		springDocDataRestUtils.customise(openAPI, mappings, persistentEntities);
+	}
+
 	/**
 	 * Gets handler mapping list.
 	 *

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

@@ -156,7 +156,7 @@ private Operation buildEntityOperation(HandlerMethod handlerMethod, DataRestRepo
 			domainType = dataRestRepository.getDomainType();
 		Operation operation = initOperation(handlerMethod, domainType, requestMethod);
 		dataRestRequestService.buildParameters(openAPI, handlerMethod, requestMethod, methodAttributes, operation, resourceMetadata, dataRestRepository);
-		dataRestResponseService.buildEntityResponse(operation, handlerMethod, openAPI, requestMethod, operationPath, domainType, methodAttributes, dataRestRepository, resourceMetadata);
+		dataRestResponseService.buildEntityResponse(operation, handlerMethod, openAPI, requestMethod, operationPath, methodAttributes, dataRestRepository, resourceMetadata);
 		tagsBuilder.buildEntityTags(operation, handlerMethod, dataRestRepository);
 		if (domainType != null)
 			addOperationDescription(operation, requestMethod, domainType.getSimpleName().toLowerCase(), dataRestRepository);

Diff for: springdoc-openapi-data-rest/src/main/java/org/springdoc/data/rest/core/DataRestRequestService.java

@@ -233,7 +233,7 @@ else if (!RequestMethod.GET.equals(requestMethod)) {
 			requestBuilder.applyBeanValidatorAnnotations(requestBodyInfo.getRequestBody(), parameterAnnotations, methodParameter.isOptional());
 			operation.setRequestBody(requestBodyInfo.getRequestBody());
 			Content content = operation.getRequestBody().getContent();
-			springDocDataRestUtils.enhanceRequestBodyContent(openAPI, resourceMetadata, content, dataRestRepository);
+			springDocDataRestUtils.buildTextUriContent(content);
 			operation.getRequestBody().setRequired(true);
 		}
 	}

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

@@ -120,7 +120,7 @@ public void buildSearchResponse(Operation operation, HandlerMethod handlerMethod
 			ApiResponse apiResponse = new ApiResponse();
 			Type returnType = findSearchReturnType(methodResourceMapping, domainType);
 			Content content = genericResponseService.buildContent(openAPI.getComponents(), methodParameterReturn.getParameterAnnotations(), methodAttributes.getMethodProduces(), null, returnType);
-			springDocDataRestUtils.enhanceResponseContent(openAPI, resourceMetadata, content, dataRestRepository);
+			springDocDataRestUtils.buildTextUriContent(content);
 			apiResponse.setContent(content);
 			addResponse200(apiResponses, apiResponse);
 			addResponse404(apiResponses);
@@ -136,19 +136,18 @@ public void buildSearchResponse(Operation operation, HandlerMethod handlerMethod
 	 * @param openAPI the open api
 	 * @param requestMethod the request method
 	 * @param operationPath the operation path
-	 * @param domainType the domain type
 	 * @param methodAttributes the method attributes
 	 * @param dataRestRepository the data rest repository
 	 * @param resourceMetadata the resource metadata
 	 */
 	public void buildEntityResponse(Operation operation, HandlerMethod handlerMethod, OpenAPI openAPI, RequestMethod requestMethod,
-			String operationPath, Class<?> domainType, MethodAttributes methodAttributes, DataRestRepository dataRestRepository, ResourceMetadata resourceMetadata) {
+			String operationPath, MethodAttributes methodAttributes, DataRestRepository dataRestRepository, ResourceMetadata resourceMetadata) {
 		MethodParameter methodParameterReturn = handlerMethod.getReturnType();
 		Type returnType = getType(methodParameterReturn, requestMethod, dataRestRepository, resourceMetadata);
 		ApiResponses apiResponses = new ApiResponses();
 		ApiResponse apiResponse = new ApiResponse();
 		Content content = genericResponseService.buildContent(openAPI.getComponents(), methodParameterReturn.getParameterAnnotations(), methodAttributes.getMethodProduces(), null, returnType);
-		springDocDataRestUtils.enhanceResponseContent(openAPI, resourceMetadata, content, dataRestRepository);
+		springDocDataRestUtils.buildTextUriContent(content);
 		apiResponse.setContent(content);
 		addResponse(requestMethod, operationPath, apiResponses, apiResponse);
 		operation.setResponses(apiResponses);

Diff for: springdoc-openapi-data-rest/src/main/java/org/springdoc/data/rest/utils/EntityInfo.java

@@ -0,0 +1,79 @@
+package org.springdoc.data.rest.utils;
+
+import java.util.List;
+
+/**
+ * The type Entity info.
+ * @author bnasslashen
+ */
+public class EntityInfo {
+
+	/**
+	 * The Ignored fields.
+	 */
+	private List<String> ignoredFields;
+
+	/**
+	 * The Associations fields.
+	 */
+	private List<String> associationsFields;
+
+	/**
+	 * The Domain type.
+	 */
+	private Class<?> domainType;
+
+	/**
+	 * Gets ignored fields.
+	 *
+	 * @return the ignored fields
+	 */
+	public List<String> getIgnoredFields() {
+		return ignoredFields;
+	}
+
+	/**
+	 * Sets ignored fields.
+	 *
+	 * @param ignoredFields the ignored fields
+	 */
+	public void setIgnoredFields(List<String> ignoredFields) {
+		this.ignoredFields = ignoredFields;
+	}
+
+	/**
+	 * Gets associations fields.
+	 *
+	 * @return the associations fields
+	 */
+	public List<String> getAssociationsFields() {
+		return associationsFields;
+	}
+
+	/**
+	 * Sets associations fields.
+	 *
+	 * @param associationsFields the associations fields
+	 */
+	public void setAssociationsFields(List<String> associationsFields) {
+		this.associationsFields = associationsFields;
+	}
+
+	/**
+	 * Gets domain type.
+	 *
+	 * @return the domain type
+	 */
+	public Class<?> getDomainType() {
+		return domainType;
+	}
+
+	/**
+	 * Sets domain type.
+	 *
+	 * @param domainType the domain type
+	 */
+	public void setDomainType(Class<?> domainType) {
+		this.domainType = domainType;
+	}
+}