Skip to content

Commit a94ae7b

Browse files
bnasslahsenbnasslahsen
committed
code review
1 parent c7fbfdd commit a94ae7b

File tree

18 files changed

+31
-58
lines changed

18 files changed

+31
-58
lines changed

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,7 @@ protected void getRouterFunctionPaths(String beanName, AbstractRouterFunctionVis
644644
boolean withRouterOperation = routerFunctionVisitor.getRouterFunctionDatas().stream()
645645
.anyMatch(routerFunctionData -> routerFunctionData.getAttributes().containsKey(OPERATION_ATTRIBUTE));
646646
if (withRouterOperation) {
647-
List<RouterOperation> operationList = routerFunctionVisitor.getRouterFunctionDatas().stream().map(RouterOperation::new).collect(Collectors.toList());
647+
List<RouterOperation> operationList = routerFunctionVisitor.getRouterFunctionDatas().stream().map(RouterOperation::new).toList();
648648
calculatePath(operationList, locale, openAPI);
649649
}
650650
else {
@@ -659,9 +659,9 @@ protected void getRouterFunctionPaths(String beanName, AbstractRouterFunctionVis
659659
else
660660
routerOperationList.addAll(Arrays.asList(routerOperations.value()));
661661
if (routerOperationList.size() == 1)
662-
calculatePath(routerOperationList.stream().map(routerOperation -> new RouterOperation(routerOperation, routerFunctionVisitor.getRouterFunctionDatas().get(0))).collect(Collectors.toList()), locale, openAPI);
662+
calculatePath(routerOperationList.stream().map(routerOperation -> new RouterOperation(routerOperation, routerFunctionVisitor.getRouterFunctionDatas().get(0))).toList(), locale, openAPI);
663663
else {
664-
List<RouterOperation> operationList = routerOperationList.stream().map(RouterOperation::new).collect(Collectors.toList());
664+
List<RouterOperation> operationList = routerOperationList.stream().map(RouterOperation::new).toList();
665665
mergeRouters(routerFunctionVisitor.getRouterFunctionDatas(), operationList);
666666
calculatePath(operationList, locale, openAPI);
667667
}
@@ -891,15 +891,15 @@ protected void mergeRouters(List<RouterFunctionData> routerFunctionDatas, List<R
891891
// PATH
892892
List<RouterFunctionData> routerFunctionDataList = routerFunctionDatas.stream()
893893
.filter(routerFunctionData1 -> routerFunctionData1.getPath().equals(routerOperation.getPath()))
894-
.collect(Collectors.toList());
894+
.toList();
895895
if (routerFunctionDataList.size() == 1)
896896
fillRouterOperation(routerFunctionDataList.get(0), routerOperation);
897897
else if (routerFunctionDataList.size() > 1 && ArrayUtils.isNotEmpty(routerOperation.getMethods())) {
898898
// PATH + METHOD
899899
routerFunctionDataList = routerFunctionDatas.stream()
900900
.filter(routerFunctionData1 -> routerFunctionData1.getPath().equals(routerOperation.getPath())
901901
&& isEqualMethods(routerOperation.getMethods(), routerFunctionData1.getMethods()))
902-
.collect(Collectors.toList());
902+
.toList();
903903
if (routerFunctionDataList.size() == 1)
904904
fillRouterOperation(routerFunctionDataList.get(0), routerOperation);
905905
else if (routerFunctionDataList.size() > 1 && ArrayUtils.isNotEmpty(routerOperation.getProduces())) {
@@ -908,7 +908,7 @@ else if (routerFunctionDataList.size() > 1 && ArrayUtils.isNotEmpty(routerOperat
908908
.filter(routerFunctionData1 -> routerFunctionData1.getPath().equals(routerOperation.getPath())
909909
&& isEqualMethods(routerOperation.getMethods(), routerFunctionData1.getMethods())
910910
&& isEqualArrays(routerFunctionData1.getProduces(), routerOperation.getProduces()))
911-
.collect(Collectors.toList());
911+
.toList();
912912
if (routerFunctionDataList.size() == 1)
913913
fillRouterOperation(routerFunctionDataList.get(0), routerOperation);
914914
else if (routerFunctionDataList.size() > 1 && ArrayUtils.isNotEmpty(routerOperation.getConsumes())) {
@@ -918,7 +918,7 @@ else if (routerFunctionDataList.size() > 1 && ArrayUtils.isNotEmpty(routerOperat
918918
&& isEqualMethods(routerOperation.getMethods(), routerFunctionData1.getMethods())
919919
&& isEqualArrays(routerFunctionData1.getProduces(), routerOperation.getProduces())
920920
&& isEqualArrays(routerFunctionData1.getConsumes(), routerOperation.getConsumes()))
921-
.collect(Collectors.toList());
921+
.toList();
922922
if (routerFunctionDataList.size() == 1)
923923
fillRouterOperation(routerFunctionDataList.get(0), routerOperation);
924924
}
@@ -929,7 +929,7 @@ else if (routerFunctionDataList.size() > 1 && ArrayUtils.isNotEmpty(routerOperat
929929
.filter(routerFunctionData1 -> routerFunctionData1.getPath().equals(routerOperation.getPath())
930930
&& isEqualMethods(routerOperation.getMethods(), routerFunctionData1.getMethods())
931931
&& isEqualArrays(routerFunctionData1.getConsumes(), routerOperation.getConsumes()))
932-
.collect(Collectors.toList());
932+
.toList();
933933
if (routerFunctionDataList.size() == 1)
934934
fillRouterOperation(routerFunctionDataList.get(0), routerOperation);
935935
}
@@ -939,7 +939,7 @@ else if (routerFunctionDataList.size() > 1 && ArrayUtils.isNotEmpty(routerOperat
939939
routerFunctionDataList = routerFunctionDatas.stream()
940940
.filter(routerFunctionData1 -> routerFunctionData1.getPath().equals(routerOperation.getPath())
941941
&& isEqualArrays(routerFunctionData1.getProduces(), routerOperation.getProduces()))
942-
.collect(Collectors.toList());
942+
.toList();
943943
if (routerFunctionDataList.size() == 1)
944944
fillRouterOperation(routerFunctionDataList.get(0), routerOperation);
945945
else if (routerFunctionDataList.size() > 1 && ArrayUtils.isNotEmpty(routerOperation.getConsumes())) {
@@ -949,7 +949,7 @@ else if (routerFunctionDataList.size() > 1 && ArrayUtils.isNotEmpty(routerOperat
949949
&& isEqualMethods(routerOperation.getMethods(), routerFunctionData1.getMethods())
950950
&& isEqualArrays(routerFunctionData1.getConsumes(), routerOperation.getConsumes())
951951
&& isEqualArrays(routerFunctionData1.getProduces(), routerOperation.getProduces()))
952-
.collect(Collectors.toList());
952+
.toList();
953953
if (routerFunctionDataList.size() == 1)
954954
fillRouterOperation(routerFunctionDataList.get(0), routerOperation);
955955
}
@@ -959,7 +959,7 @@ else if (routerFunctionDataList.size() > 1 && ArrayUtils.isNotEmpty(routerOperat
959959
routerFunctionDataList = routerFunctionDatas.stream()
960960
.filter(routerFunctionData1 -> routerFunctionData1.getPath().equals(routerOperation.getPath())
961961
&& isEqualArrays(routerFunctionData1.getConsumes(), routerOperation.getConsumes()))
962-
.collect(Collectors.toList());
962+
.toList();
963963
if (routerFunctionDataList.size() == 1)
964964
fillRouterOperation(routerFunctionDataList.get(0), routerOperation);
965965
}

‎springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/hints/SpringDocUiHints.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,9 @@ public class SpringDocUiHints implements RuntimeHintsRegistrar {
4040
public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
4141
//Classgraph
4242
ClassLoaderHandlerRegistry.CLASS_LOADER_HANDLERS.forEach(classLoaderHandlerRegistryEntry ->
43-
{
4443
hints.reflection()
4544
.registerTypeIfPresent(classLoader, classLoaderHandlerRegistryEntry.classLoaderHandlerClass.getCanonicalName(),
46-
hint -> hint.withMembers(MemberCategory.INVOKE_DECLARED_METHODS));
47-
});
45+
hint -> hint.withMembers(MemberCategory.INVOKE_DECLARED_METHODS)));
4846
hints.reflection()
4947
.registerTypeIfPresent(classLoader, ClassLoaderHandlerRegistry.FALLBACK_HANDLER.classLoaderHandlerClass.getCanonicalName(),
5048
hint -> hint.withMembers(MemberCategory.INVOKE_DECLARED_METHODS));

‎springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configurer/SpringdocBeanFactoryConfigurer.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
package org.springdoc.core.configurer;
2626

2727
import java.util.List;
28-
import java.util.stream.Collectors;
2928

3029
import io.swagger.v3.oas.models.OpenAPI;
3130
import org.apache.commons.lang3.StringUtils;
@@ -89,7 +88,7 @@ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)
8988
builder.displayName(elt.getDisplayName());
9089
return builder.group(elt.getGroup()).build();
9190
})
92-
.collect(Collectors.toList());
91+
.toList();
9392
groupedOpenApis.forEach(elt -> beanFactory.registerSingleton(elt.getGroup(), elt));
9493
}
9594
initBeanFactoryPostProcessor(beanFactory);

‎springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/PolymorphicModelConverter.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import java.util.Collection;
2929
import java.util.Iterator;
3030
import java.util.List;
31-
import java.util.stream.Collectors;
3231

3332
import com.fasterxml.jackson.databind.JavaType;
3433
import io.swagger.v3.core.converter.AnnotatedType;
@@ -101,7 +100,7 @@ private Schema composePolymorphicSchema(AnnotatedType type, Schema schema, Colle
101100
.filter(s -> s.getAllOf() != null)
102101
.filter(s -> s.getAllOf().stream().anyMatch(s2 -> ref.equals(s2.get$ref())))
103102
.map(s -> new Schema().$ref(AnnotationsUtils.COMPONENTS_REF + s.getName()))
104-
.collect(Collectors.toList());
103+
.toList();
105104
if (composedSchemas.isEmpty()) return schema;
106105

107106
ComposedSchema result = new ComposedSchema();

‎springdoc-openapi-starter-common/src/main/java/org/springdoc/core/extractor/MethodParameterPojoExtractor.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import java.beans.PropertyDescriptor;
2929
import java.lang.annotation.Annotation;
3030
import java.lang.reflect.Field;
31+
import java.lang.reflect.RecordComponent;
3132
import java.lang.reflect.Type;
3233
import java.lang.reflect.TypeVariable;
3334
import java.nio.charset.Charset;
@@ -183,7 +184,7 @@ private static Stream<MethodParameter> fromSimpleClass(Class<?> paramClass, Fiel
183184
if (paramClass.isRecord()) {
184185
return Stream.of(paramClass.getRecordComponents())
185186
.filter(d -> d.getName().equals(field.getName()))
186-
.map(recordComponent -> recordComponent.getAccessor())
187+
.map(RecordComponent::getAccessor)
187188
.map(method -> new MethodParameter(method, -1))
188189
.map(methodParameter -> DelegatingMethodParameter.changeContainingClass(methodParameter, paramClass))
189190
.map(param -> new DelegatingMethodParameter(param, fieldNamePrefix + field.getName(), finalFieldAnnotations, true, isNotRequired));

‎springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/AbstractRouterFunctionVisitor.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import java.util.List;
3131
import java.util.Map;
3232
import java.util.Set;
33-
import java.util.stream.Collectors;
3433

3534
import org.apache.commons.lang3.StringUtils;
3635

@@ -119,7 +118,7 @@ public void method(Set<HttpMethod> methods) {
119118
public void path(String pattern) {
120119
if (currentRouterFunctionDatas != null) {
121120
if (!nestedPaths.isEmpty()) {
122-
List<String> nestedPathsList = this.nestedPaths.values().stream().flatMap(List::stream).collect(Collectors.toList());
121+
List<String> nestedPathsList = this.nestedPaths.values().stream().flatMap(List::stream).toList();
123122
if (!orPaths.isEmpty())
124123
orPaths.forEach(nestedOrPath -> createRouterFunctionData(String.join(StringUtils.EMPTY, nestedPathsList) + nestedOrPath + pattern));
125124
else

‎springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/GenericResponseService.java‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import java.lang.reflect.Type;
3232
import java.util.ArrayList;
3333
import java.util.Arrays;
34-
import java.util.HashMap;
3534
import java.util.HashSet;
3635
import java.util.LinkedHashMap;
3736
import java.util.List;
@@ -648,7 +647,7 @@ private synchronized Map<String, ApiResponse> getGenericMapResponse(Class<?> bea
648647
.filter(controllerAdviceInfo ->
649648
new ControllerAdviceBean(controllerAdviceInfo.getControllerAdvice()).isApplicableToBeanType(beanType))
650649
.filter(controllerAdviceInfo -> beanType.equals(controllerAdviceInfo.getControllerAdvice().getClass()))
651-
.collect(Collectors.toList());
650+
.toList();
652651

653652
Map<String, ApiResponse> genericApiResponseMap = controllerAdviceInfosInThisBean.stream()
654653
.map(ControllerAdviceInfo::getApiResponseMap)
@@ -658,7 +657,7 @@ private synchronized Map<String, ApiResponse> getGenericMapResponse(Class<?> bea
658657
.filter(controllerAdviceInfo ->
659658
new ControllerAdviceBean(controllerAdviceInfo.getControllerAdvice()).isApplicableToBeanType(beanType))
660659
.filter(controllerAdviceInfo -> !beanType.equals(controllerAdviceInfo.getControllerAdvice().getClass()))
661-
.collect(Collectors.toList());
660+
.toList();
662661

663662
for (ControllerAdviceInfo controllerAdviceInfo : controllerAdviceInfosNotInThisBean) {
664663
controllerAdviceInfo.getApiResponseMap().forEach((key, apiResponse) -> {
@@ -718,16 +717,5 @@ private boolean isHttpCodePresent(String httpCode, Set<io.swagger.v3.oas.annotat
718717
public static void setResponseEntityExceptionHandlerClass(Class<?> responseEntityExceptionHandlerClass) {
719718
GenericResponseService.responseEntityExceptionHandlerClass = responseEntityExceptionHandlerClass;
720719
}
721-
722-
723-
private ApiResponse cloneApiResponse(ApiResponse original) {
724-
ApiResponse clone = new ApiResponse();
725-
clone.set$ref(original.get$ref());
726-
clone.setDescription(original.getDescription());
727-
clone.setContent(original.getContent());
728-
clone.setHeaders(original.getHeaders() == null ? null : new HashMap<>(original.getHeaders()));
729-
clone.setExtensions(original.getExtensions() == null ? null : new HashMap<>(original.getExtensions()));
730-
clone.setLinks(original.getLinks() == null ? null : new HashMap<>(original.getLinks()));
731-
return clone;
732-
}
720+
733721
}

‎springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/OperationService.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import java.util.Map.Entry;
3636
import java.util.Optional;
3737
import java.util.Set;
38-
import java.util.stream.Collectors;
3938

4039
import io.swagger.v3.core.util.AnnotationsUtils;
4140
import io.swagger.v3.oas.annotations.Hidden;
@@ -299,7 +298,7 @@ private void buildTags(io.swagger.v3.oas.annotations.Operation apiOperation, Ope
299298
List<String> tags = mlist.get().stream()
300299
.filter(t -> operation.getTags() == null
301300
|| (operation.getTags() != null && !operation.getTags().contains(t)))
302-
.collect(Collectors.toList());
301+
.toList();
303302
tags.forEach(operation::addTagsItem);
304303
}
305304
}

‎springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/app69/UserRepositoryImpl.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import java.util.HashMap;
44
import java.util.Map;
5-
import java.util.stream.Collectors;
65

76
import jakarta.annotation.PostConstruct;
87
import reactor.core.publisher.Flux;
@@ -32,7 +31,7 @@ public Flux<User> getAllUsers() {
3231

3332
@Override
3433
public Flux<User> getAllUsers(String firstname) {
35-
return Flux.fromIterable(this.users.values().stream().filter(user -> user.getFirstname().equals(firstname)).collect(Collectors.toList()));
34+
return Flux.fromIterable(this.users.values().stream().filter(user -> user.getFirstname().equals(firstname)).toList());
3635
}
3736

3837
@Override

‎springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/app73/QuoteGenerator.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import java.util.ArrayList;
2929
import java.util.List;
3030
import java.util.Random;
31-
import java.util.stream.Collectors;
3231

3332
import reactor.core.publisher.Flux;
3433

@@ -84,7 +83,7 @@ private List<Quote> generateQuotes(long interval) {
8483
result.setInstant(instant);
8584
return result;
8685
})
87-
.collect(Collectors.toList());
86+
.toList();
8887
}
8988

9089
}

0 commit comments

Comments
 (0)