project review

Author: springdoc

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

@@ -64,9 +64,7 @@ protected OpenAPI getOpenApi() {
             openApi = openAPIBuilder.getOpenAPI();
 
             // run the optional customisers
-            if (openApiCustomisers.isPresent()) {
-                openApiCustomisers.get().forEach(openApiCustomiser -> openApiCustomiser.customise(openApi));
-            }
+            openApiCustomisers.ifPresent(apiCustomisers -> apiCustomisers.forEach(openApiCustomiser -> openApiCustomiser.customise(openApi)));
             LOGGER.info("Init duration for springdoc-openapi is: {} ms",
                     Duration.between(start, Instant.now()).toMillis());
             computeDone = true;

springdoc-openapi-common/src/main/java/org/springdoc/core/AbstractParameterBuilder.java

@@ -147,11 +147,11 @@ Schema calculateSchema(Components components, java.lang.reflect.Parameter parame
                            RequestBodyInfo requestBodyInfo, JsonView jsonView) {
         Schema schemaN;
         Class<?> schemaImplementation = null;
-        Type paramType = null;
+        Type returnType = null;
         JavaType ct = null;
 
         if (parameter != null) {
-            paramType = parameter.getParameterizedType();
+            returnType = parameter.getParameterizedType();
             ct = constructType(parameter.getType());
             schemaImplementation = parameter.getType();
         }
@@ -162,12 +162,12 @@ Schema calculateSchema(Components components, java.lang.reflect.Parameter parame
             return schemaN;
         }
 
-        if (paramType instanceof ParameterizedType) {
-            ParameterizedType parameterizedType = (ParameterizedType) paramType;
+        if (returnType instanceof ParameterizedType) {
+            ParameterizedType parameterizedType = (ParameterizedType) returnType;
             if (isFile(parameterizedType)) {
                 return extractFileSchema(paramName, requestBodyInfo);
             }
-            schemaN = calculateSchemaFromParameterizedType( components,  paramType,  jsonView);
+            schemaN = calculateSchemaFromParameterizedType( components,  returnType,  jsonView);
         } else {
             schemaN = SpringDocAnnotationsUtils.resolveSchemaFromType(schemaImplementation, components, jsonView);
         }
@@ -240,7 +240,7 @@ private void setExamples(io.swagger.v3.oas.annotations.Parameter parameterDoc, P
     private void setExtensions(io.swagger.v3.oas.annotations.Parameter parameterDoc, Parameter parameter) {
         if (parameterDoc.extensions().length > 0) {
             Map<String, Object> extensionMap = AnnotationsUtils.getExtensions(parameterDoc.extensions());
-            extensionMap.entrySet().forEach(entry -> parameter.addExtension(entry.getKey(), entry.getValue()));
+            extensionMap.forEach(parameter::addExtension);
         }
     }
 

springdoc-openapi-common/src/main/java/org/springdoc/core/AbstractResponseBuilder.java

@@ -47,7 +47,7 @@ public ApiResponses build(Components components, HandlerMethod handlerMethod, Op
                               MethodAttributes methodAttributes) {
         final ApiResponses apiResponses = getApiResponses(operation);
         // for each one build ApiResponse and add it to existing responses
-        genericMapResponse.entrySet().forEach(entry -> apiResponses.addApiResponse(entry.getKey(), entry.getValue()));
+        genericMapResponse.forEach(apiResponses::addApiResponse);
         // Fill api Responses
         computeResponse(components, handlerMethod.getMethod(), apiResponses, methodAttributes, false);
         return apiResponses;
@@ -73,7 +73,7 @@ public void buildGenericResponse(Components components, Map<String, Object> find
                 }
                 Map<String, ApiResponse> apiResponses = computeResponse(components, method, new ApiResponses(),
                         new MethodAttributes(methodProduces), true);
-                apiResponses.entrySet().forEach(entry -> genericMapResponse.put(entry.getKey(), entry.getValue()));
+                apiResponses.forEach(genericMapResponse::put);
             }
         }
     }

springdoc-openapi-common/src/main/java/org/springdoc/core/OperationBuilder.java

@@ -171,7 +171,7 @@ private void setPathItemOperation(PathItem pathItemObject, String method, Operat
     private void buildExtensions(io.swagger.v3.oas.annotations.Operation apiOperation, Operation operation) {
         if (apiOperation.extensions().length > 0) {
             Map<String, Object> extensions = AnnotationsUtils.getExtensions(apiOperation.extensions());
-            extensions.entrySet().forEach(entry -> operation.addExtension(entry.getKey(), entry.getValue()));
+            extensions.forEach(operation::addExtension);
         }
     }
 
@@ -325,7 +325,7 @@ private void setExtensions(io.swagger.v3.oas.annotations.responses.ApiResponse r
                                ApiResponse apiResponseObject) {
         if (response.extensions().length > 0) {
             Map<String, Object> extensions = AnnotationsUtils.getExtensions(response.extensions());
-            extensions.entrySet().forEach(entry -> apiResponseObject.addExtension(entry.getKey(), entry.getValue()));
+            extensions.forEach(apiResponseObject::addExtension);
         }
     }
 

springdoc-openapi-common/src/main/java/org/springdoc/core/RequestBodyBuilder.java

@@ -53,7 +53,7 @@ public Optional<RequestBody> buildRequestBodyFromDoc(
         }
         if (requestBody.extensions().length > 0) {
             Map<String, Object> extensions = AnnotationsUtils.getExtensions(requestBody.extensions());
-            extensions.entrySet().forEach(entry -> requestBodyObject.addExtension(entry.getKey(), entry.getValue()));
+            extensions.forEach(requestBodyObject::addExtension);
             isEmpty = false;
         }
 

springdoc-openapi-common/src/main/java/org/springdoc/core/SecurityParser.java

@@ -154,7 +154,7 @@ public Optional<SecuritySchemePair> getSecurityScheme(
 
         if (securityScheme.extensions().length > 0) {
             Map<String, Object> extensions = AnnotationsUtils.getExtensions(securityScheme.extensions());
-            extensions.entrySet().forEach(entry -> securitySchemeObject.addExtension(entry.getKey(), entry.getValue()));
+            extensions.forEach(securitySchemeObject::addExtension);
         }
 
         getOAuthFlows(securityScheme.flows()).ifPresent(securitySchemeObject::setFlows);
@@ -178,7 +178,7 @@ private Optional<OAuthFlows> getOAuthFlows(io.swagger.v3.oas.annotations.securit
         OAuthFlows oAuthFlowsObject = new OAuthFlows();
         if (oAuthFlows.extensions().length > 0) {
             Map<String, Object> extensions = AnnotationsUtils.getExtensions(oAuthFlows.extensions());
-            extensions.entrySet().forEach(entry -> oAuthFlowsObject.addExtension(entry.getKey(), entry.getValue()));
+            extensions.forEach(oAuthFlowsObject::addExtension);
         }
         getOAuthFlow(oAuthFlows.authorizationCode()).ifPresent(oAuthFlowsObject::setAuthorizationCode);
         getOAuthFlow(oAuthFlows.clientCredentials()).ifPresent(oAuthFlowsObject::setClientCredentials);
@@ -203,7 +203,7 @@ private Optional<OAuthFlow> getOAuthFlow(io.swagger.v3.oas.annotations.security.
         }
         if (oAuthFlow.extensions().length > 0) {
             Map<String, Object> extensions = AnnotationsUtils.getExtensions(oAuthFlow.extensions());
-            extensions.entrySet().forEach(entry -> oAuthFlowObject.addExtension(entry.getKey(), entry.getValue()));
+            extensions.forEach(oAuthFlowObject::addExtension);
         }
         getScopes(oAuthFlow.scopes()).ifPresent(oAuthFlowObject::setScopes);
         return Optional.of(oAuthFlowObject);

springdoc-openapi-common/src/main/java/org/springdoc/core/SecuritySchemePair.java

@@ -17,16 +17,8 @@ public String getKey() {
         return key;
     }
 
-    public void setKey(String key) {
-        this.key = key;
-    }
-
     public SecurityScheme getSecurityScheme() {
         return securityScheme;
     }
 
-    public void setSecurityScheme(SecurityScheme securityScheme) {
-        this.securityScheme = securityScheme;
-    }
-
 }

springdoc-openapi-common/src/main/java/org/springdoc/core/SpringDocAnnotationsUtils.java

@@ -115,7 +115,7 @@ private static void addExtension(io.swagger.v3.oas.annotations.media.Content ann
         annotationContent.extensions();
         if (annotationContent.extensions().length > 0) {
             Map<String, Object> extensions = AnnotationsUtils.getExtensions(annotationContent.extensions());
-            extensions.entrySet().forEach(entry -> mediaType.addExtension(entry.getKey(), entry.getValue()));
+            extensions.forEach(mediaType::addExtension);
         }
     }
 

springdoc-openapi-webflux-core/src/main/java/org/springdoc/core/ParameterBuilder.java

@@ -24,7 +24,7 @@ public ParameterBuilder(LocalVariableTableParameterNameDiscoverer localSpringDoc
 
     @Override
     protected Schema calculateSchemaFromParameterizedType(Components components, Type paramType, JsonView jsonView) {
-        Schema schemaN = null;
+        Schema schemaN;
         ParameterizedType parameterizedType = (ParameterizedType) paramType;
         if (Mono.class.getName().contentEquals(parameterizedType.getRawType().getTypeName())
                 || Flux.class.getName().contentEquals(parameterizedType.getRawType().getTypeName()))