code review

springdoc · Mar 12, 2024 · 5c60119 · 5c60119
1 parent 0659912
commit 5c60119
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 16 deletions.
diff --git a/...ngdoc-openapi-starter-common/src/main/java/org/springdoc/api/AbstractOpenApiResource.java b/...ngdoc-openapi-starter-common/src/main/java/org/springdoc/api/AbstractOpenApiResource.java
@@ -689,7 +689,7 @@ protected void getRouterFunctionPaths(String beanName, AbstractRouterFunctionVis
 		boolean withRouterOperation = routerFunctionVisitor.getRouterFunctionDatas().stream()
 				.anyMatch(routerFunctionData -> routerFunctionData.getAttributes().containsKey(OPERATION_ATTRIBUTE));
 		if (withRouterOperation) {
-			List<RouterOperation> operationList = routerFunctionVisitor.getRouterFunctionDatas().stream().map(RouterOperation::new).collect(Collectors.toList());
+			List<RouterOperation> operationList = routerFunctionVisitor.getRouterFunctionDatas().stream().map(RouterOperation::new).toList();
 			calculatePath(operationList, locale, openAPI);
 		}
 		else {
@@ -704,9 +704,9 @@ protected void getRouterFunctionPaths(String beanName, AbstractRouterFunctionVis
 			else
 				routerOperationList.addAll(Arrays.asList(routerOperations.value()));
 			if (routerOperationList.size() == 1)
-				calculatePath(routerOperationList.stream().map(routerOperation -> new RouterOperation(routerOperation, routerFunctionVisitor.getRouterFunctionDatas().get(0))).collect(Collectors.toList()), locale, openAPI);
+				calculatePath(routerOperationList.stream().map(routerOperation -> new RouterOperation(routerOperation, routerFunctionVisitor.getRouterFunctionDatas().get(0))).toList(), locale, openAPI);
 			else {
-				List<RouterOperation> operationList = routerOperationList.stream().map(RouterOperation::new).collect(Collectors.toList());
+				List<RouterOperation> operationList = routerOperationList.stream().map(RouterOperation::new).toList();
 				mergeRouters(routerFunctionVisitor.getRouterFunctionDatas(), operationList);
 				calculatePath(operationList, locale, openAPI);
 			}

diff --git a/...main/java/org/springdoc/core/customizers/DataRestDelegatingMethodParameterCustomizer.java b/...main/java/org/springdoc/core/customizers/DataRestDelegatingMethodParameterCustomizer.java
@@ -1247,7 +1247,7 @@ List<String> getEffectiveProperties() {
 						}
 						return p + ',' + direction.name();
 					})
-					.collect(Collectors.toList());
+					.toList();
 		}
 	}
 }
diff --git a/...tarter-common/src/main/java/org/springdoc/core/customizers/JavadocPropertyCustomizer.java b/...tarter-common/src/main/java/org/springdoc/core/customizers/JavadocPropertyCustomizer.java
@@ -66,15 +66,6 @@ public record JavadocPropertyCustomizer(JavadocProvider javadocProvider,
 
 	private static final Logger LOGGER = LoggerFactory.getLogger(DelegatingMethodParameter.class);
 
-	/**
-	 * Instantiates a new Javadoc property customizer.
-	 *
-	 * @param javadocProvider      the javadoc provider
-	 * @param objectMapperProvider the object mapper provider
-	 */
-	public JavadocPropertyCustomizer {
-	}
-
 	/**
 	 * Resolve schema.
 	 *
@@ -197,7 +188,7 @@ private boolean findFields(Entry<String, Schema> stringSchemaEntry, Field field)
 					return true;
 				}
 			}
-			else if (field.getName().equalsIgnoreCase(stringSchemaEntry.getKey().replaceAll("_", ""))) {
+			else if (field.getName().equalsIgnoreCase(stringSchemaEntry.getKey().replace("_", ""))) {
 				return true;
 			}
 			return false;

diff --git a/...starter-common/src/main/java/org/springdoc/core/customizers/SpecPropertiesCustomizer.java b/...starter-common/src/main/java/org/springdoc/core/customizers/SpecPropertiesCustomizer.java
@@ -84,6 +84,11 @@
  */
 public class SpecPropertiesCustomizer implements GlobalOpenApiCustomizer {
 
+	/**
+	 * The constant DESCRIPTION.
+	 */
+	private static final String DESCRIPTION = ".description";
+
 	/**
 	 * The Property resolver.
 	 */
@@ -153,7 +158,7 @@ private void setPathsProperties(OpenAPI openApi) {
             for (Operation operation : operations) {
                 String operationId = operation.getOperationId();
                 String operationNode = MessageFormat.format("paths.{0}", operationId);
-                resolveString(operation::setDescription, operationNode + ".description");
+                resolveString(operation::setDescription, operationNode + DESCRIPTION);
 
                 resolveString(operation::setSummary, operationNode + ".summary");
             }

diff --git a/...mmon/src/main/java/org/springdoc/core/providers/SpringRepositoryRestResourceProvider.java b/...mmon/src/main/java/org/springdoc/core/providers/SpringRepositoryRestResourceProvider.java
@@ -223,7 +223,7 @@ public List<RouterOperation> getRouterOperations(OpenAPI openAPI, Locale locale)
 			final JacksonMetadata jackson = new JacksonMetadata(mapper, domainType);
 			boolean hiddenRepository = (AnnotationUtils.findAnnotation(repository, Hidden.class) != null);
 			if (!hiddenRepository) {
-				if (resourceMetadata.isExported()) {
+				if (resourceMetadata!=null && resourceMetadata.isExported()) {
 					for (HandlerMapping handlerMapping : handlerMappingList) {
 						if (handlerMapping instanceof RepositoryRestHandlerMapping) {
 							RepositoryRestHandlerMapping repositoryRestHandlerMapping = (RepositoryRestHandlerMapping) handlerMapping;