Skip to content

Commit 5c60119

Browse files
committed
code review
1 parent 0659912 commit 5c60119

File tree

5 files changed

+12
-16
lines changed

5 files changed

+12
-16
lines changed

springdoc-openapi-starter-common/src/main/java/org/springdoc/api/AbstractOpenApiResource.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -689,7 +689,7 @@ protected void getRouterFunctionPaths(String beanName, AbstractRouterFunctionVis
689689
boolean withRouterOperation = routerFunctionVisitor.getRouterFunctionDatas().stream()
690690
.anyMatch(routerFunctionData -> routerFunctionData.getAttributes().containsKey(OPERATION_ATTRIBUTE));
691691
if (withRouterOperation) {
692-
List<RouterOperation> operationList = routerFunctionVisitor.getRouterFunctionDatas().stream().map(RouterOperation::new).collect(Collectors.toList());
692+
List<RouterOperation> operationList = routerFunctionVisitor.getRouterFunctionDatas().stream().map(RouterOperation::new).toList();
693693
calculatePath(operationList, locale, openAPI);
694694
}
695695
else {
@@ -704,9 +704,9 @@ protected void getRouterFunctionPaths(String beanName, AbstractRouterFunctionVis
704704
else
705705
routerOperationList.addAll(Arrays.asList(routerOperations.value()));
706706
if (routerOperationList.size() == 1)
707-
calculatePath(routerOperationList.stream().map(routerOperation -> new RouterOperation(routerOperation, routerFunctionVisitor.getRouterFunctionDatas().get(0))).collect(Collectors.toList()), locale, openAPI);
707+
calculatePath(routerOperationList.stream().map(routerOperation -> new RouterOperation(routerOperation, routerFunctionVisitor.getRouterFunctionDatas().get(0))).toList(), locale, openAPI);
708708
else {
709-
List<RouterOperation> operationList = routerOperationList.stream().map(RouterOperation::new).collect(Collectors.toList());
709+
List<RouterOperation> operationList = routerOperationList.stream().map(RouterOperation::new).toList();
710710
mergeRouters(routerFunctionVisitor.getRouterFunctionDatas(), operationList);
711711
calculatePath(operationList, locale, openAPI);
712712
}

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/DataRestDelegatingMethodParameterCustomizer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1247,7 +1247,7 @@ List<String> getEffectiveProperties() {
12471247
}
12481248
return p + ',' + direction.name();
12491249
})
1250-
.collect(Collectors.toList());
1250+
.toList();
12511251
}
12521252
}
12531253
}

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/JavadocPropertyCustomizer.java

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,6 @@ public record JavadocPropertyCustomizer(JavadocProvider javadocProvider,
6666

6767
private static final Logger LOGGER = LoggerFactory.getLogger(DelegatingMethodParameter.class);
6868

69-
/**
70-
* Instantiates a new Javadoc property customizer.
71-
*
72-
* @param javadocProvider the javadoc provider
73-
* @param objectMapperProvider the object mapper provider
74-
*/
75-
public JavadocPropertyCustomizer {
76-
}
77-
7869
/**
7970
* Resolve schema.
8071
*
@@ -197,7 +188,7 @@ private boolean findFields(Entry<String, Schema> stringSchemaEntry, Field field)
197188
return true;
198189
}
199190
}
200-
else if (field.getName().equalsIgnoreCase(stringSchemaEntry.getKey().replaceAll("_", ""))) {
191+
else if (field.getName().equalsIgnoreCase(stringSchemaEntry.getKey().replace("_", ""))) {
201192
return true;
202193
}
203194
return false;

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/SpecPropertiesCustomizer.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,11 @@
8484
*/
8585
public class SpecPropertiesCustomizer implements GlobalOpenApiCustomizer {
8686

87+
/**
88+
* The constant DESCRIPTION.
89+
*/
90+
private static final String DESCRIPTION = ".description";
91+
8792
/**
8893
* The Property resolver.
8994
*/
@@ -153,7 +158,7 @@ private void setPathsProperties(OpenAPI openApi) {
153158
for (Operation operation : operations) {
154159
String operationId = operation.getOperationId();
155160
String operationNode = MessageFormat.format("paths.{0}", operationId);
156-
resolveString(operation::setDescription, operationNode + ".description");
161+
resolveString(operation::setDescription, operationNode + DESCRIPTION);
157162

158163
resolveString(operation::setSummary, operationNode + ".summary");
159164
}

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/SpringRepositoryRestResourceProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ public List<RouterOperation> getRouterOperations(OpenAPI openAPI, Locale locale)
223223
final JacksonMetadata jackson = new JacksonMetadata(mapper, domainType);
224224
boolean hiddenRepository = (AnnotationUtils.findAnnotation(repository, Hidden.class) != null);
225225
if (!hiddenRepository) {
226-
if (resourceMetadata.isExported()) {
226+
if (resourceMetadata!=null && resourceMetadata.isExported()) {
227227
for (HandlerMapping handlerMapping : handlerMappingList) {
228228
if (handlerMapping instanceof RepositoryRestHandlerMapping) {
229229
RepositoryRestHandlerMapping repositoryRestHandlerMapping = (RepositoryRestHandlerMapping) handlerMapping;

0 commit comments

Comments
 (0)