code review

Author: bnasslahsen

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

@@ -69,7 +69,7 @@ public class DataRestRepository {
 	/**
 	 * The Persistent entity.
 	 */
-	PersistentEntity<?, ?> persistentEntity;
+	private PersistentEntity persistentEntity;
 
 	/**
 	 * Instantiates a new Data rest repository.
@@ -215,7 +215,7 @@ public void setPropertyType(Class<?> propertyType) {
 	 *
 	 * @return the persistent entity
 	 */
-	public PersistentEntity<?, ?> getPersistentEntity() {
+	public PersistentEntity getPersistentEntity() {
 		return persistentEntity;
 	}
 
@@ -224,7 +224,7 @@ public void setPropertyType(Class<?> propertyType) {
 	 *
 	 * @param persistentEntity the persistent entity
 	 */
-	public void setPersistentEntity(PersistentEntity<?, ?> persistentEntity) {
+	public void setPersistentEntity(PersistentEntity persistentEntity) {
 		this.persistentEntity = persistentEntity;
 	}
 

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

@@ -175,7 +175,7 @@ else if (methodParameter.getParameterAnnotation(BackendId.class) != null) {
 				}
 				parameter = requestBuilder.buildParams(parameterInfo, openAPI.getComponents(), requestMethod, null);
 
-				addParameters(openAPI, requestMethod, methodAttributes, operation, methodParameter, parameterInfo, parameter, resourceMetadata, dataRestRepository);
+				addParameters(openAPI, requestMethod, methodAttributes, operation, methodParameter, parameterInfo, parameter);
 			}
 		}
 	}
@@ -214,11 +214,9 @@ private boolean isParamToIgnore(MethodParameter methodParameter) {
 	 * @param methodParameter the method parameter
 	 * @param parameterInfo the parameter info
 	 * @param parameter the parameter
-	 * @param resourceMetadata the resource metadata
-	 * @param dataRestRepository the data rest repository
 	 */
-	private void addParameters(OpenAPI openAPI, RequestMethod requestMethod, MethodAttributes methodAttributes, Operation operation, MethodParameter methodParameter,
-			ParameterInfo parameterInfo, Parameter parameter,  ResourceMetadata resourceMetadata, DataRestRepository dataRestRepository) {
+	private void addParameters(OpenAPI openAPI, RequestMethod requestMethod, MethodAttributes methodAttributes, Operation operation,
+			MethodParameter methodParameter, ParameterInfo parameterInfo, Parameter parameter) {
 		List<Annotation> parameterAnnotations = Arrays.asList(methodParameter.getParameterAnnotations());
 		if (requestBuilder.isValidParameter(parameter)) {
 			requestBuilder.applyBeanValidatorAnnotations(parameter, parameterAnnotations);

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

@@ -59,8 +59,6 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.method.HandlerMethod;
 
-;
-
 /**
  * The type Data rest response builder.
  * @author bnasslahsen

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

@@ -320,8 +320,7 @@ else if (ControllerType.PROPERTY.equals(controllerType))
 	 * @param requestMethod the request method
 	 * @return the boolean
 	 */
-	private boolean isSearchControllerPresent(RequestMappingInfo
-			requestMappingInfo, HandlerMethod handlerMethod, RequestMethod requestMethod) {
+	private boolean isSearchControllerPresent(RequestMappingInfo requestMappingInfo, HandlerMethod handlerMethod, RequestMethod requestMethod) {
 		if (!UNDOCUMENTED_REQUEST_METHODS.contains(requestMethod)) {
 			Set<String> patterns = getActivePatterns(requestMappingInfo);
 			if (!CollectionUtils.isEmpty(patterns)) {

springdoc-openapi-data-rest/src/main/java/org/springdoc/data/rest/utils/SpringDocDataRestUtils.java

@@ -192,7 +192,8 @@ private void updateRequestBodySchema(String className, Schema schema, Components
 									referencedSchema.addProperties(propId, new StringSchema());
 							}
 						}
-					} if (referencedSchema instanceof ComposedSchema)
+					}
+					if (referencedSchema instanceof ComposedSchema)
 						updateComposedSchema((ComposedSchema) referencedSchema, REQUEST_BODY, components);
 				});
 			}
@@ -312,15 +313,13 @@ private void updateKey(List<Schema> allSchemas, String suffix, Components compon
 					if (!allKey.endsWith(REQUEST_BODY) && !allKey.endsWith(RESPONSE)) {
 						String newAllKey = allKey + suffix;
 						allSchema.set$ref(newAllKey);
-						if (components!=null && !components.getSchemas().containsKey(newAllKey)) {
-							if (entityInoMap.containsKey(allKey)) {
-								if (RESPONSE.equals(suffix))
-									createNewResponseSchema(allKey, components);
-							}
+						if (components != null && !components.getSchemas().containsKey(newAllKey) && entityInoMap.containsKey(allKey) && RESPONSE.equals(suffix)) {
+							createNewResponseSchema(allKey, components);
 						}
 					}
 				}
 			}
+
 	}
 
 	/**
@@ -354,12 +353,12 @@ private List<String> getIgnoredFields(ResourceMetadata
 		if (entity != null && entity.getIdProperty() != null) {
 			String idField = entity.getIdProperty().getName();
 			ignoredFields.add(idField);
+			entity.doWithAssociations((SimpleAssociationHandler) association -> {
+				PersistentProperty<?> property = association.getInverse();
+				String filedName = resourceMetadata.getMappingFor(property).getRel().value();
+				ignoredFields.add(filedName);
+			});
 		}
-		entity.doWithAssociations((SimpleAssociationHandler) association -> {
-			PersistentProperty<?> property = association.getInverse();
-			String filedName = resourceMetadata.getMappingFor(property).getRel().value();
-			ignoredFields.add(filedName);
-		});
 		return ignoredFields;
 	}
 
@@ -369,7 +368,7 @@ private List<String> getIgnoredFields(ResourceMetadata
 	 * @param content the content
 	 */
 	public void buildTextUriContent(Content content) {
-		if (content.get(RestMediaTypes.TEXT_URI_LIST_VALUE) != null)
+		if (content.containsKey(RestMediaTypes.TEXT_URI_LIST_VALUE))
 			content.put(RestMediaTypes.TEXT_URI_LIST_VALUE, new MediaType().schema(new StringSchema()));
 	}
 

springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app25/repo/ClinicRepo.java

@@ -2,7 +2,6 @@
 
 import java.util.UUID;
 
-
 import test.org.springdoc.api.app25.model.Clinic;
 
 import org.springframework.data.repository.CrudRepository;

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app150/HelloController.java

@@ -18,8 +18,6 @@
 
 package test.org.springdoc.api.app150;
 
-import static org.springframework.format.annotation.DateTimeFormat.ISO.DATE;
-
 import java.time.LocalDate;
 import java.util.List;
 
@@ -34,6 +32,8 @@
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
+import static org.springframework.format.annotation.DateTimeFormat.ISO.DATE;
+
 @RestController
 public class HelloController {