code review

Author: bnasslahsen

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

@@ -123,7 +123,7 @@ protected synchronized OpenAPI getOpenApi() {
 
 			Map<String, Object> findControllerAdvice = openAPIBuilder.getControllerAdviceMap();
 			// calculate generic responses
-			responseBuilder.buildGenericResponse(openAPIBuilder.getComponents(), findControllerAdvice);
+			responseBuilder.buildGenericResponse(openAPIBuilder.getCalculatedOpenAPI().getComponents(), findControllerAdvice);
 
 			getPaths(mappingsMap);
 			openApi = openAPIBuilder.getCalculatedOpenAPI();
@@ -151,8 +151,8 @@ protected synchronized OpenAPI getOpenApi() {
 	protected void calculatePath(HandlerMethod handlerMethod, String operationPath,
 			Set<RequestMethod> requestMethods) {
 		OpenAPI openAPI = openAPIBuilder.getCalculatedOpenAPI();
-		Components components = openAPIBuilder.getComponents();
-		Paths paths = openAPIBuilder.getPaths();
+		Components components = openAPI.getComponents();
+		Paths paths = openAPI.getPaths();
 
 		Map<HttpMethod, Operation> operationMap = null;
 		if (paths.containsKey(operationPath)) {
@@ -195,7 +195,7 @@ protected void calculatePath(HandlerMethod handlerMethod, String operationPath,
 			calculateJsonView(apiOperation, methodAttributes, method);
 
 			if (apiOperation != null) {
-				openAPI = operationParser.parse(components, apiOperation, operation, openAPI, methodAttributes);
+				openAPI = operationParser.parse(apiOperation, operation, openAPI, methodAttributes);
 			}
 
 			// compute tags
@@ -211,7 +211,7 @@ protected void calculatePath(HandlerMethod handlerMethod, String operationPath,
 							methodAttributes.getJsonViewAnnotationForRequestBody())
 					.ifPresent(operation::setRequestBody);
 			// requests
-			operation = requestBuilder.build(components, handlerMethod, requestMethod, operation, methodAttributes, openAPI);
+			operation = requestBuilder.build(handlerMethod, requestMethod, operation, methodAttributes, openAPI);
 
 			// responses
 			ApiResponses apiResponses = responseBuilder.build(components, handlerMethod, operation, methodAttributes);
@@ -221,7 +221,7 @@ protected void calculatePath(HandlerMethod handlerMethod, String operationPath,
 
 			// callbacks
 			if (!CollectionUtils.isEmpty(apiCallbacks)) {
-				operationParser.buildCallbacks(apiCallbacks, components, openAPI, methodAttributes)
+				operationParser.buildCallbacks(apiCallbacks, openAPI, methodAttributes)
 						.ifPresent(operation::setCallbacks);
 			}
 

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

@@ -134,7 +134,7 @@ protected AbstractRequestBuilder(GenericParameterBuilder parameterBuilder, Reque
 	}
 
 
-	public Operation build(Components components, HandlerMethod handlerMethod, RequestMethod requestMethod,
+	public Operation build(HandlerMethod handlerMethod, RequestMethod requestMethod,
 			Operation operation, MethodAttributes methodAttributes, OpenAPI openAPI) {
 		// Documentation
 		String operationId = operationBuilder.getOperationId(handlerMethod.getMethod().getName(),
@@ -152,6 +152,7 @@ public Operation build(Components components, HandlerMethod handlerMethod, Reque
 		List<Parameter> operationParameters = (operation.getParameters() != null) ? operation.getParameters()
 				: new ArrayList<>();
 		Map<String, io.swagger.v3.oas.annotations.Parameter> parametersDocMap = getApiParameters(handlerMethod.getMethod());
+        Components components = openAPI.getComponents();
 
 		for (int i = 0; i < pNames.length; i++) {
 			// check if query param

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

@@ -128,14 +128,6 @@ public static String splitCamelCase(String str) {
 				.toLowerCase(Locale.ROOT);
 	}
 
-	public Components getComponents() {
-		return calculatedOpenAPI.getComponents();
-	}
-
-	public Paths getPaths() {
-		return calculatedOpenAPI.getPaths();
-	}
-
 	public void build() {
 		Optional<OpenAPIDefinition> apiDef = getOpenAPIDefinition();
 

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

@@ -76,8 +76,9 @@ public OperationBuilder(GenericParameterBuilder parameterBuilder, RequestBodyBui
 		this.propertyResolverUtils = propertyResolverUtils;
 	}
 
-	public OpenAPI parse(Components components, io.swagger.v3.oas.annotations.Operation apiOperation,
+	public OpenAPI parse(io.swagger.v3.oas.annotations.Operation apiOperation,
 			Operation operation, OpenAPI openAPI, MethodAttributes methodAttributes) {
+		Components components = openAPI.getComponents();
 		if (StringUtils.isNotBlank(apiOperation.summary())) {
 			operation.setSummary(propertyResolverUtils.resolve(apiOperation.summary()));
 		}
@@ -132,7 +133,7 @@ public boolean isHidden(Method method) {
 	}
 
 	public Optional<Map<String, Callback>> buildCallbacks(
-			Set<io.swagger.v3.oas.annotations.callbacks.Callback> apiCallbacks, Components components, OpenAPI openAPI,
+			Set<io.swagger.v3.oas.annotations.callbacks.Callback> apiCallbacks, OpenAPI openAPI,
 			MethodAttributes methodAttributes) {
 		Map<String, Callback> callbacks = new LinkedHashMap<>();
 
@@ -157,7 +158,7 @@ public Optional<Map<String, Callback>> buildCallbacks(
 			PathItem pathItemObject = new PathItem();
 			for (io.swagger.v3.oas.annotations.Operation callbackOperation : methodCallback.operation()) {
 				Operation callbackNewOperation = new Operation();
-				parse(components, callbackOperation, callbackNewOperation, openAPI, methodAttributes);
+				parse(callbackOperation, callbackNewOperation, openAPI, methodAttributes);
 				setPathItemOperation(pathItemObject, callbackOperation.method(), callbackNewOperation);
 			}
 			callbackObject.addPathItem(methodCallback.callbackUrlExpression(), pathItemObject);