saving work

Author: bnasslahsen

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

@@ -66,13 +66,13 @@
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springdoc.core.AbstractRequestBuilder;
+import org.springdoc.core.AbstractRequestService;
 import org.springdoc.core.ActuatorProvider;
-import org.springdoc.core.GenericParameterBuilder;
-import org.springdoc.core.GenericResponseBuilder;
+import org.springdoc.core.GenericParameterService;
+import org.springdoc.core.GenericResponseService;
 import org.springdoc.core.MethodAttributes;
-import org.springdoc.core.OpenAPIBuilder;
-import org.springdoc.core.OperationBuilder;
+import org.springdoc.core.OpenAPIService;
+import org.springdoc.core.OperationService;
 import org.springdoc.core.SpringDocConfigProperties;
 import org.springdoc.core.SpringDocConfigProperties.GroupConfig;
 import org.springdoc.core.annotations.RouterOperations;
@@ -121,12 +121,12 @@ public abstract class AbstractOpenApiResource extends SpecFilter {
 	/**
 	 * The Open api builder.
 	 */
-	protected OpenAPIBuilder openAPIBuilder;
+	protected OpenAPIService openAPIService;
 
 	/**
 	 * The open api builder object factory.
 	 */
-	private final ObjectFactory<OpenAPIBuilder> openAPIBuilderObjectFactory;
+	private final ObjectFactory<OpenAPIService> openAPIBuilderObjectFactory;
 
 	/**
 	 * The Spring doc config properties.
@@ -141,17 +141,17 @@ public abstract class AbstractOpenApiResource extends SpecFilter {
 	/**
 	 * The Request builder.
 	 */
-	private final AbstractRequestBuilder requestBuilder;
+	private final AbstractRequestService requestBuilder;
 
 	/**
 	 * The Response builder.
 	 */
-	private final GenericResponseBuilder responseBuilder;
+	private final GenericResponseService responseBuilder;
 
 	/**
 	 * The Operation parser.
 	 */
-	private final OperationBuilder operationParser;
+	private final OperationService operationParser;
 
 	/**
 	 * The Open api customisers.
@@ -186,17 +186,17 @@ public abstract class AbstractOpenApiResource extends SpecFilter {
 	 * @param springDocConfigProperties the spring doc config properties
 	 * @param actuatorProvider the actuator provider
 	 */
-	protected AbstractOpenApiResource(String groupName, ObjectFactory<OpenAPIBuilder> openAPIBuilderObjectFactory,
-			AbstractRequestBuilder requestBuilder,
-			GenericResponseBuilder responseBuilder, OperationBuilder operationParser,
+	protected AbstractOpenApiResource(String groupName, ObjectFactory<OpenAPIService> openAPIBuilderObjectFactory,
+			AbstractRequestService requestBuilder,
+			GenericResponseService responseBuilder, OperationService operationParser,
 			Optional<List<OperationCustomizer>> operationCustomizers,
 			Optional<List<OpenApiCustomiser>> openApiCustomisers,
 			SpringDocConfigProperties springDocConfigProperties,
 			Optional<ActuatorProvider> actuatorProvider) {
 		super();
 		this.groupName = Objects.requireNonNull(groupName, "groupName");
 		this.openAPIBuilderObjectFactory = openAPIBuilderObjectFactory;
-		this.openAPIBuilder = openAPIBuilderObjectFactory.getObject();
+		this.openAPIService = openAPIBuilderObjectFactory.getObject();
 		this.requestBuilder = requestBuilder;
 		this.responseBuilder = responseBuilder;
 		this.operationParser = operationParser;
@@ -253,44 +253,44 @@ public static void addHiddenRestControllers(String... classes) {
 	 */
 	protected synchronized OpenAPI getOpenApi() {
 		OpenAPI openApi;
-		if (openAPIBuilder.getCachedOpenAPI() == null || springDocConfigProperties.isCacheDisabled()) {
+		if (openAPIService.getCachedOpenAPI() == null || springDocConfigProperties.isCacheDisabled()) {
 			Instant start = Instant.now();
-			openAPIBuilder.build();
-			Map<String, Object> mappingsMap = openAPIBuilder.getMappingsMap().entrySet().stream()
+			openAPIService.build();
+			Map<String, Object> mappingsMap = openAPIService.getMappingsMap().entrySet().stream()
 					.filter(controller -> (AnnotationUtils.findAnnotation(controller.getValue().getClass(),
 							Hidden.class) == null))
 					.filter(controller -> !AbstractOpenApiResource.isHiddenRestControllers(controller.getValue().getClass()))
 					.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (a1, a2) -> a1));
 
-			Map<String, Object> findControllerAdvice = openAPIBuilder.getControllerAdviceMap();
+			Map<String, Object> findControllerAdvice = openAPIService.getControllerAdviceMap();
 			// calculate generic responses
-			openApi = openAPIBuilder.getCalculatedOpenAPI();
+			openApi = openAPIService.getCalculatedOpenAPI();
 			if (springDocConfigProperties.isOverrideWithGenericResponse() && !CollectionUtils.isEmpty(findControllerAdvice)) {
 				if (!CollectionUtils.isEmpty(mappingsMap))
 					findControllerAdvice.putAll(mappingsMap);
 				responseBuilder.buildGenericResponse(openApi.getComponents(), findControllerAdvice);
 			}
 			getPaths(mappingsMap);
 			if (!CollectionUtils.isEmpty(openApi.getServers()))
-				openAPIBuilder.setServersPresent(true);
-			openAPIBuilder.updateServers(openApi);
+				openAPIService.setServersPresent(true);
+			openAPIService.updateServers(openApi);
 
 			if (springDocConfigProperties.isRemoveBrokenReferenceDefinitions())
 				this.removeBrokenReferenceDefinitions(openApi);
 
 			// run the optional customisers
 			openApiCustomisers.ifPresent(apiCustomisers -> apiCustomisers.forEach(openApiCustomiser -> openApiCustomiser.customise(openApi)));
 
-			openAPIBuilder.setCachedOpenAPI(openApi);
-			openAPIBuilder.resetCalculatedOpenAPI();
+			openAPIService.setCachedOpenAPI(openApi);
+			openAPIService.resetCalculatedOpenAPI();
 
 			LOGGER.info("Init duration for springdoc-openapi is: {} ms",
 					Duration.between(start, Instant.now()).toMillis());
 		}
 		else {
-			if (!CollectionUtils.isEmpty(openAPIBuilder.getCachedOpenAPI().getServers()))
-				openAPIBuilder.setServersPresent(true);
-			openApi = openAPIBuilder.updateServers(openAPIBuilder.getCachedOpenAPI());
+			if (!CollectionUtils.isEmpty(openAPIService.getCachedOpenAPI().getServers()))
+				openAPIService.setServersPresent(true);
+			openApi = openAPIService.updateServers(openAPIService.getCachedOpenAPI());
 		}
 		return openApi;
 	}
@@ -317,7 +317,7 @@ protected void calculatePath(HandlerMethod handlerMethod, RouterOperation router
 		String[] headers = routerOperation.getHeaders();
 		Map<String, String> queryParams = routerOperation.getQueryParams();
 
-		OpenAPI openAPI = openAPIBuilder.getCalculatedOpenAPI();
+		OpenAPI openAPI = openAPIService.getCalculatedOpenAPI();
 		Components components = openAPI.getComponents();
 		Paths paths = openAPI.getPaths();
 
@@ -363,7 +363,7 @@ protected void calculatePath(HandlerMethod handlerMethod, RouterOperation router
 			fillParametersList(operation, queryParams, methodAttributes);
 
 			// compute tags
-			operation = openAPIBuilder.buildTags(handlerMethod, operation, openAPI);
+			operation = openAPIService.buildTags(handlerMethod, operation, openAPI);
 
 			io.swagger.v3.oas.annotations.parameters.RequestBody requestBodyDoc = AnnotatedElementUtils.findMergedAnnotation(method,
 					io.swagger.v3.oas.annotations.parameters.RequestBody.class);
@@ -413,7 +413,7 @@ private void buildCallbacks(OpenAPI openAPI, MethodAttributes methodAttributes,
 	 * @param routerOperationList the router operation list
 	 */
 	protected void calculatePath(List<RouterOperation> routerOperationList) {
-		ApplicationContext applicationContext = openAPIBuilder.getContext();
+		ApplicationContext applicationContext = openAPIService.getContext();
 		if (!CollectionUtils.isEmpty(routerOperationList)) {
 			Collections.sort(routerOperationList);
 			for (RouterOperation routerOperation : routerOperationList) {
@@ -466,7 +466,7 @@ protected void calculatePath(RouterOperation routerOperation) {
 		String[] headers = routerOperation.getHeaders();
 		Map<String, String> queryParams = routerOperation.getQueryParams();
 
-		OpenAPI openAPI = openAPIBuilder.getCalculatedOpenAPI();
+		OpenAPI openAPI = openAPIService.getCalculatedOpenAPI();
 		Paths paths = openAPI.getPaths();
 		Map<HttpMethod, Operation> operationMap = null;
 		if (paths.containsKey(operationPath)) {
@@ -525,7 +525,7 @@ protected void getRouterFunctionPaths(String beanName, AbstractRouterFunctionVis
 		}
 		else {
 			List<org.springdoc.core.annotations.RouterOperation> routerOperationList = new ArrayList<>();
-			ApplicationContext applicationContext = openAPIBuilder.getContext();
+			ApplicationContext applicationContext = openAPIService.getContext();
 			RouterOperations routerOperations = applicationContext.findAnnotationOnBean(beanName, RouterOperations.class);
 			if (routerOperations == null) {
 				org.springdoc.core.annotations.RouterOperation routerOperation = applicationContext.findAnnotationOnBean(beanName, org.springdoc.core.annotations.RouterOperation.class);
@@ -542,7 +542,6 @@ protected void getRouterFunctionPaths(String beanName, AbstractRouterFunctionVis
 				calculatePath(operationList);
 			}
 		}
-
 	}
 
 	/**
@@ -850,7 +849,7 @@ private void fillParametersList(Operation operation, Map<String, String> queryPa
 		List<Parameter> parametersList = operation.getParameters();
 		if (parametersList == null)
 			parametersList = new ArrayList<>();
-		Collection<Parameter> headersMap = AbstractRequestBuilder.getHeaders(methodAttributes, new LinkedHashMap<>());
+		Collection<Parameter> headersMap = AbstractRequestService.getHeaders(methodAttributes, new LinkedHashMap<>());
 		parametersList.addAll(headersMap);
 		if (!CollectionUtils.isEmpty(queryParams)) {
 			for (Map.Entry<String, String> entry : queryParams.entrySet()) {
@@ -859,7 +858,7 @@ private void fillParametersList(Operation operation, Map<String, String> queryPa
 				parameter.setSchema(new StringSchema()._default(entry.getValue()));
 				parameter.setRequired(true);
 				parameter.setIn(ParameterIn.QUERY.toString());
-				GenericParameterBuilder.mergeParameter(parametersList, parameter);
+				GenericParameterService.mergeParameter(parametersList, parameter);
 			}
 			operation.setParameters(parametersList);
 		}
@@ -1003,8 +1002,8 @@ else if (existingOperation != null) {
 	 * Init open api builder.
 	 */
 	protected void initOpenAPIBuilder() {
-		if (openAPIBuilder.getCachedOpenAPI() != null && springDocConfigProperties.isCacheDisabled()) {
-			openAPIBuilder = openAPIBuilderObjectFactory.getObject();
+		if (openAPIService.getCachedOpenAPI() != null && springDocConfigProperties.isCacheDisabled()) {
+			openAPIService = openAPIBuilderObjectFactory.getObject();
 		}
 	}
 

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

@@ -85,7 +85,7 @@
  * The type Abstract request builder.
  * @author bnasslahsen
  */
-public abstract class AbstractRequestBuilder {
+public abstract class AbstractRequestService {
 
 	/**
 	 * The constant PARAM_TYPES_TO_IGNORE.
@@ -133,17 +133,17 @@ public abstract class AbstractRequestBuilder {
 	/**
 	 * The Parameter builder.
 	 */
-	private final GenericParameterBuilder parameterBuilder;
+	private final GenericParameterService parameterBuilder;
 
 	/**
 	 * The Request body builder.
 	 */
-	private final RequestBodyBuilder requestBodyBuilder;
+	private final RequestBodyService requestBodyService;
 
 	/**
 	 * The Operation builder.
 	 */
-	private final OperationBuilder operationBuilder;
+	private final OperationService operationService;
 
 	/**
 	 * The Local spring doc parameter name discoverer.
@@ -159,18 +159,18 @@ public abstract class AbstractRequestBuilder {
 	 * Instantiates a new Abstract request builder.
 	 *
 	 * @param parameterBuilder the parameter builder
-	 * @param requestBodyBuilder the request body builder
-	 * @param operationBuilder the operation builder
+	 * @param requestBodyService the request body builder
+	 * @param operationService the operation builder
 	 * @param parameterCustomizers the parameter customizers
 	 * @param localSpringDocParameterNameDiscoverer the local spring doc parameter name discoverer
 	 */
-	protected AbstractRequestBuilder(GenericParameterBuilder parameterBuilder, RequestBodyBuilder requestBodyBuilder,
-			OperationBuilder operationBuilder, Optional<List<ParameterCustomizer>> parameterCustomizers,
+	protected AbstractRequestService(GenericParameterService parameterBuilder, RequestBodyService requestBodyService,
+			OperationService operationService, Optional<List<ParameterCustomizer>> parameterCustomizers,
 			LocalVariableTableParameterNameDiscoverer localSpringDocParameterNameDiscoverer) {
 		super();
 		this.parameterBuilder = parameterBuilder;
-		this.requestBodyBuilder = requestBodyBuilder;
-		this.operationBuilder = operationBuilder;
+		this.requestBodyService = requestBodyService;
+		this.operationService = operationService;
 		if (parameterCustomizers.isPresent())
 			parameterCustomizers.get().removeIf(Objects::isNull);
 		this.parameterCustomizers = parameterCustomizers;
@@ -220,7 +220,7 @@ public static boolean isRequestTypeToIgnore(Class<?> rawClass) {
 	public Operation build(HandlerMethod handlerMethod, RequestMethod requestMethod,
 			Operation operation, MethodAttributes methodAttributes, OpenAPI openAPI) {
 		// Documentation
-		String operationId = operationBuilder.getOperationId(handlerMethod.getMethod().getName(),
+		String operationId = operationService.getOperationId(handlerMethod.getMethod().getName(),
 				operation.getOperationId(), openAPI);
 		operation.setOperationId(operationId);
 		// requests
@@ -258,14 +258,14 @@ public Operation build(HandlerMethod handlerMethod, RequestMethod requestMethod,
 			if (!isParamToIgnore(methodParameter)) {
 				parameter = buildParams(parameterInfo, components, requestMethod, methodAttributes.getJsonViewAnnotation());
 				// Merge with the operation parameters
-				parameter = GenericParameterBuilder.mergeParameter(operationParameters, parameter);
+				parameter = GenericParameterService.mergeParameter(operationParameters, parameter);
 				List<Annotation> parameterAnnotations = Arrays.asList(methodParameter.getParameterAnnotations());
 				if (isValidParameter(parameter))
 					applyBeanValidatorAnnotations(parameter, parameterAnnotations);
 				else if (!RequestMethod.GET.equals(requestMethod)) {
 					if (operation.getRequestBody() != null)
 						requestBodyInfo.setRequestBody(operation.getRequestBody());
-					requestBodyBuilder.calculateRequestBodyInfo(components, methodAttributes,
+					requestBodyService.calculateRequestBodyInfo(components, methodAttributes,
 							parameterInfo, requestBodyInfo);
 					applyBeanValidatorAnnotations(requestBodyInfo.getRequestBody(), parameterAnnotations, methodParameter.isOptional());
 				}
@@ -538,8 +538,8 @@ else if (OPENAPI_STRING_TYPE.equals(schema.getType())) {
 	 *
 	 * @return the request body builder
 	 */
-	public RequestBodyBuilder getRequestBodyBuilder() {
-		return requestBodyBuilder;
+	public RequestBodyService getRequestBodyBuilder() {
+		return requestBodyService;
 	}
 
 	/**

springdoc-openapi-common/src/main/java/org/springdoc/core/GenericParameterBuilder.java renamed to springdoc-openapi-common/src/main/java/org/springdoc/core/GenericParameterService.java

@@ -59,7 +59,7 @@
  * @author bnasslahsen
  */
 @SuppressWarnings("rawtypes")
-public class GenericParameterBuilder {
+public class GenericParameterService {
 
 	/**
 	 * The constant FILE_TYPES.
@@ -74,7 +74,7 @@ public class GenericParameterBuilder {
 	/**
 	 * The constant LOGGER.
 	 */
-	private static final Logger LOGGER = LoggerFactory.getLogger(GenericParameterBuilder.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(GenericParameterService.class);
 
 	static {
 		FILE_TYPES.add(MultipartFile.class);
@@ -92,7 +92,7 @@ public class GenericParameterBuilder {
 	 * @param propertyResolverUtils the property resolver utils
 	 * @param optionalDelegatingMethodParameterCustomizer the optional delegating method parameter customizer
 	 */
-	public GenericParameterBuilder(PropertyResolverUtils propertyResolverUtils,   Optional<DelegatingMethodParameterCustomizer> optionalDelegatingMethodParameterCustomizer) {
+	public GenericParameterService(PropertyResolverUtils propertyResolverUtils,   Optional<DelegatingMethodParameterCustomizer> optionalDelegatingMethodParameterCustomizer) {
 		this.propertyResolverUtils = propertyResolverUtils;
 		this.optionalDelegatingMethodParameterCustomizer=optionalDelegatingMethodParameterCustomizer;
 	}

springdoc-openapi-common/src/main/java/org/springdoc/core/GenericResponseBuilder.java renamed to springdoc-openapi-common/src/main/java/org/springdoc/core/GenericResponseService.java

@@ -68,12 +68,12 @@
  * The type Generic response builder.
  * @author bnasslahsen
  */
-public class GenericResponseBuilder {
+public class GenericResponseService {
 
 	/**
 	 * The Operation builder.
 	 */
-	private final OperationBuilder operationBuilder;
+	private final OperationService operationService;
 
 	/**
 	 * The Return type parsers.
@@ -98,16 +98,16 @@ public class GenericResponseBuilder {
 	/**
 	 * Instantiates a new Generic response builder.
 	 *
-	 * @param operationBuilder the operation builder
+	 * @param operationService the operation builder
 	 * @param returnTypeParsers the return type parsers
 	 * @param springDocConfigProperties the spring doc config properties
 	 * @param propertyResolverUtils the property resolver utils
 	 */
-	public GenericResponseBuilder(OperationBuilder operationBuilder, List<ReturnTypeParser> returnTypeParsers,
+	public GenericResponseService(OperationService operationService, List<ReturnTypeParser> returnTypeParsers,
 			SpringDocConfigProperties springDocConfigProperties,
 			PropertyResolverUtils propertyResolverUtils) {
 		super();
-		this.operationBuilder = operationBuilder;
+		this.operationService = operationService;
 		this.returnTypeParsers = returnTypeParsers;
 		this.springDocConfigProperties = springDocConfigProperties;
 		this.propertyResolverUtils = propertyResolverUtils;
@@ -155,7 +155,7 @@ public void buildGenericResponse(Components components, Map<String, Object> find
 			Arrays.stream(objClz.getDeclaredMethods()).filter(m -> m.isAnnotationPresent(ExceptionHandler.class)).forEach(methods::add);
 			// for each one build ApiResponse and add it to existing responses
 			for (Method method : methods) {
-				if (!operationBuilder.isHidden(method)) {
+				if (!operationService.isHidden(method)) {
 					RequestMapping reqMappringMethod = AnnotatedElementUtils.findMergedAnnotation(method, RequestMapping.class);
 					String[] methodProduces = { springDocConfigProperties.getDefaultProducesMediaType() };
 					if (reqMappringMethod != null)