Skip to content

Commit 15b5d7a

Browse files
committed
code review
1 parent a43955e commit 15b5d7a

File tree

1 file changed

+13
-10
lines changed

1 file changed

+13
-10
lines changed

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

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ protected void calculatePath(HandlerMethod handlerMethod, RouterOperation router
498498
buildCallbacks(openAPI, methodAttributes, operation, apiCallbacks);
499499

500500
// allow for customisation
501-
operation = customiseOperation(operation, handlerMethod);
501+
operation = customizeOperation(operation, handlerMethod);
502502

503503
PathItem pathItemObject = buildPathItem(requestMethod, operation, operationPath, paths);
504504
paths.addPathItem(operationPath, pathItemObject);
@@ -626,8 +626,9 @@ protected void calculatePath(RouterOperation routerOperation, Locale locale, Ope
626626
* @return the router operation
627627
*/
628628
private RouterOperation customizeDataRestRouterOperation(RouterOperation routerOperation) {
629-
if (springDocCustomizers.getDataRestRouterOperationCustomizers().isPresent()) {
630-
List<DataRestRouterOperationCustomizer> dataRestRouterOperationCustomizerList = springDocCustomizers.getDataRestRouterOperationCustomizers().get();
629+
Optional<List<DataRestRouterOperationCustomizer>> optionalDataRestRouterOperationCustomizers = springDocCustomizers.getDataRestRouterOperationCustomizers();
630+
if (optionalDataRestRouterOperationCustomizers.isPresent()) {
631+
List<DataRestRouterOperationCustomizer> dataRestRouterOperationCustomizerList = optionalDataRestRouterOperationCustomizers.get();
631632
for (DataRestRouterOperationCustomizer dataRestRouterOperationCustomizer : dataRestRouterOperationCustomizerList) {
632633
routerOperation = dataRestRouterOperationCustomizer.customize(routerOperation);
633634
}
@@ -850,9 +851,10 @@ protected Set<RequestMethod> getDefaultAllowedHttpMethods() {
850851
* @param handlerMethod the handler method
851852
* @return the operation
852853
*/
853-
protected Operation customiseOperation(Operation operation, HandlerMethod handlerMethod) {
854-
if (springDocCustomizers.getOperationCustomizers().isPresent()) {
855-
List<OperationCustomizer> operationCustomizerList = springDocCustomizers.getOperationCustomizers().get();
854+
protected Operation customizeOperation(Operation operation, HandlerMethod handlerMethod) {
855+
Optional<List<OperationCustomizer>> optionalOperationCustomizers = springDocCustomizers.getOperationCustomizers();
856+
if (optionalOperationCustomizers.isPresent()) {
857+
List<OperationCustomizer> operationCustomizerList = optionalOperationCustomizers.get();
856858
for (OperationCustomizer operationCustomizer : operationCustomizerList)
857859
operation = operationCustomizer.customize(operation, handlerMethod);
858860
}
@@ -862,13 +864,14 @@ protected Operation customiseOperation(Operation operation, HandlerMethod handle
862864
/**
863865
* Customise router operation
864866
*
865-
* @param routerOperation
866-
* @param handlerMethod
867+
* @param routerOperation the router operation
868+
* @param handlerMethod the handler method
867869
* @return the router operation
868870
*/
869871
protected RouterOperation customizeRouterOperation(RouterOperation routerOperation, HandlerMethod handlerMethod) {
870-
if (springDocCustomizers.getRouterOperationCustomizers().isPresent()) {
871-
List<RouterOperationCustomizer> routerOperationCustomizerList = springDocCustomizers.getRouterOperationCustomizers().get();
872+
Optional<List<RouterOperationCustomizer>> optionalRouterOperationCustomizers = springDocCustomizers.getRouterOperationCustomizers();
873+
if (optionalRouterOperationCustomizers.isPresent()) {
874+
List<RouterOperationCustomizer> routerOperationCustomizerList = optionalRouterOperationCustomizers.get();
872875
for (RouterOperationCustomizer routerOperationCustomizer : routerOperationCustomizerList) {
873876
routerOperation = routerOperationCustomizer.customize(routerOperation, handlerMethod);
874877
}

0 commit comments

Comments
 (0)