saving work

Author: bnasslahsen

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

@@ -94,7 +94,6 @@
 import org.springframework.web.method.HandlerMethod;
 
 import static org.springdoc.core.Constants.OPERATION_ATTRIBUTE;
-import static org.springdoc.core.Constants.ROUTER_ATTRIBUTE;
 import static org.springdoc.core.converters.SchemaPropertyDeprecatingConverter.isDeprecated;
 
 /**
@@ -518,7 +517,7 @@ protected void calculatePath(HandlerMethod handlerMethod, String operationPath,
 	 */
 	protected void getRouterFunctionPaths(String beanName, AbstractRouterFunctionVisitor routerFunctionVisitor) {
 		boolean withRouterOperation = routerFunctionVisitor.getRouterFunctionDatas().stream()
-				.anyMatch(routerFunctionData -> routerFunctionData.getAttributes().containsKey(ROUTER_ATTRIBUTE) || routerFunctionData.getAttributes().containsKey(OPERATION_ATTRIBUTE));
+				.anyMatch(routerFunctionData -> routerFunctionData.getAttributes().containsKey(OPERATION_ATTRIBUTE));
 		if (withRouterOperation) {
 			List<RouterOperation> operationList = routerFunctionVisitor.getRouterFunctionDatas().stream().map(RouterOperation::new).collect(Collectors.toList());
 			calculatePath(operationList);

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

@@ -158,10 +158,10 @@ public abstract class AbstractRequestService {
 	/**
 	 * Instantiates a new Abstract request builder.
 	 *
-	 * @param parameterBuilder the parameter builder 
-	 * @param requestBodyService the request body builder 
-	 * @param operationService the operation builder 
-	 * @param parameterCustomizers the parameter customizers 
+	 * @param parameterBuilder the parameter 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 AbstractRequestService(GenericParameterService parameterBuilder, RequestBodyService requestBodyService,
@@ -200,7 +200,7 @@ public static void removeRequestWrapperToIgnore(Class<?>... classes) {
 	/**
 	 * Is request type to ignore boolean.
 	 *
-	 * @param rawClass the raw class 
+	 * @param rawClass the raw class
 	 * @return the boolean
 	 */
 	public static boolean isRequestTypeToIgnore(Class<?> rawClass) {
@@ -210,11 +210,11 @@ public static boolean isRequestTypeToIgnore(Class<?> rawClass) {
 	/**
 	 * Build operation.
 	 *
-	 * @param handlerMethod the handler method 
-	 * @param requestMethod the request method 
-	 * @param operation the operation 
-	 * @param methodAttributes the method attributes 
-	 * @param openAPI the open api 
+	 * @param handlerMethod the handler method
+	 * @param requestMethod the request method
+	 * @param operation the operation
+	 * @param methodAttributes the method attributes
+	 * @param openAPI the open api
 	 * @return the operation
 	 */
 	public Operation build(HandlerMethod handlerMethod, RequestMethod requestMethod,
@@ -281,10 +281,10 @@ else if (!RequestMethod.GET.equals(requestMethod)) {
 	/**
 	 * Gets parameter linked hash map.
 	 *
-	 * @param components the components 
-	 * @param methodAttributes the method attributes 
-	 * @param operationParameters the operation parameters 
-	 * @param parametersDocMap the parameters doc map 
+	 * @param components the components
+	 * @param methodAttributes the method attributes
+	 * @param operationParameters the operation parameters
+	 * @param parametersDocMap the parameters doc map
 	 * @return the parameter linked hash map
 	 */
 	private LinkedHashMap<String, Parameter> getParameterLinkedHashMap(Components components, MethodAttributes methodAttributes, List<Parameter> operationParameters, Map<String, io.swagger.v3.oas.annotations.Parameter> parametersDocMap) {
@@ -314,8 +314,8 @@ private LinkedHashMap<String, Parameter> getParameterLinkedHashMap(Components co
 	/**
 	 * Gets headers.
 	 *
-	 * @param methodAttributes the method attributes 
-	 * @param map the map 
+	 * @param methodAttributes the method attributes
+	 * @param map the map
 	 * @return the headers
 	 */
 	@SuppressWarnings("unchecked")
@@ -336,8 +336,8 @@ public static Collection<Parameter> getHeaders(MethodAttributes methodAttributes
 	/**
 	 * Customise parameter parameter.
 	 *
-	 * @param parameter the parameter 
-	 * @param parameterInfo the parameter info 
+	 * @param parameter the parameter
+	 * @param parameterInfo the parameter info
 	 * @return the parameter
 	 */
 	protected Parameter customiseParameter(Parameter parameter, ParameterInfo parameterInfo) {
@@ -348,7 +348,7 @@ protected Parameter customiseParameter(Parameter parameter, ParameterInfo parame
 	/**
 	 * Is param to ignore boolean.
 	 *
-	 * @param parameter the parameter 
+	 * @param parameter the parameter
 	 * @return the boolean
 	 */
 	public boolean isParamToIgnore(MethodParameter parameter) {
@@ -362,7 +362,7 @@ public boolean isParamToIgnore(MethodParameter parameter) {
 	/**
 	 * Is required annotation boolean.
 	 *
-	 * @param parameter the parameter 
+	 * @param parameter the parameter
 	 * @return the boolean
 	 */
 	private boolean isRequiredAnnotation(MethodParameter parameter) {
@@ -377,8 +377,8 @@ private boolean isRequiredAnnotation(MethodParameter parameter) {
 	/**
 	 * Sets params.
 	 *
-	 * @param operation the operation 
-	 * @param operationParameters the operation parameters 
+	 * @param operation the operation
+	 * @param operationParameters the operation parameters
 	 * @param requestBodyInfo the request body info
 	 */
 	private void setParams(Operation operation, List<Parameter> operationParameters, RequestBodyInfo requestBodyInfo) {
@@ -391,7 +391,7 @@ private void setParams(Operation operation, List<Parameter> operationParameters,
 	/**
 	 * Is valid parameter boolean.
 	 *
-	 * @param parameter the parameter 
+	 * @param parameter the parameter
 	 * @return the boolean
 	 */
 	public boolean isValidParameter(Parameter parameter) {
@@ -401,10 +401,10 @@ public boolean isValidParameter(Parameter parameter) {
 	/**
 	 * Build params parameter.
 	 *
-	 * @param parameterInfo the parameter info 
-	 * @param components the components 
-	 * @param requestMethod the request method 
-	 * @param jsonView the json view 
+	 * @param parameterInfo the parameter info
+	 * @param components the components
+	 * @param requestMethod the request method
+	 * @param jsonView the json view
 	 * @return the parameter
 	 */
 	public Parameter buildParams(ParameterInfo parameterInfo, Components components,
@@ -433,9 +433,9 @@ public Parameter buildParams(ParameterInfo parameterInfo, Components components,
 	/**
 	 * Build param parameter.
 	 *
-	 * @param parameterInfo the parameter info 
-	 * @param components the components 
-	 * @param jsonView the json view 
+	 * @param parameterInfo the parameter info
+	 * @param components the components
+	 * @param jsonView the json view
 	 * @return the parameter
 	 */
 	private Parameter buildParam(ParameterInfo parameterInfo, Components components, JsonView jsonView) {
@@ -472,7 +472,7 @@ private Parameter buildParam(ParameterInfo parameterInfo, Components components,
 	/**
 	 * Apply bean validator annotations.
 	 *
-	 * @param parameter the parameter 
+	 * @param parameter the parameter
 	 * @param annotations the annotations
 	 */
 	public void applyBeanValidatorAnnotations(final Parameter parameter, final List<Annotation> annotations) {
@@ -489,8 +489,8 @@ public void applyBeanValidatorAnnotations(final Parameter parameter, final List<
 	/**
 	 * Apply bean validator annotations.
 	 *
-	 * @param requestBody the request body 
-	 * @param annotations the annotations 
+	 * @param requestBody the request body
+	 * @param annotations the annotations
 	 * @param isOptional the is optional
 	 */
 	public void applyBeanValidatorAnnotations(final RequestBody requestBody, final List<Annotation> annotations, boolean isOptional) {
@@ -516,7 +516,7 @@ public void applyBeanValidatorAnnotations(final RequestBody requestBody, final L
 	/**
 	 * Calculate size.
 	 *
-	 * @param annos the annos 
+	 * @param annos the annos
 	 * @param schema the schema
 	 */
 	private void calculateSize(Map<String, Annotation> annos, Schema<?> schema) {
@@ -545,7 +545,7 @@ public RequestBodyService getRequestBodyBuilder() {
 	/**
 	 * Gets api parameters.
 	 *
-	 * @param method the method 
+	 * @param method the method
 	 * @return the api parameters
 	 */
 	private Map<String, io.swagger.v3.oas.annotations.Parameter> getApiParameters(Method method) {
@@ -584,7 +584,7 @@ private Map<String, io.swagger.v3.oas.annotations.Parameter> getApiParameters(Me
 	/**
 	 * Apply validations to schema.
 	 *
-	 * @param annos the annos 
+	 * @param annos the annos
 	 * @param schema the schema
 	 */
 	private void applyValidationsToSchema(Map<String, Annotation> annos, Schema<?> schema) {

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

@@ -62,8 +62,8 @@ default Tag getTag() {
 	/**
 	 * Is rest controller boolean.
 	 *
-	 * @param operationPath the operation path 
-	 * @param controllerClass the controller class 
+	 * @param operationPath the operation path
+	 * @param controllerClass the controller class
 	 * @return the boolean
 	 */
 	default boolean isRestController(String operationPath, Class<?>  controllerClass) {

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

@@ -270,10 +270,11 @@ public final class Constants {
 	 */
 	public static final String CSRF_DEFAULT_HEADER_NAME= "X-XSRF-TOKEN";
 
+	/**
+	 * The constant OPERATION_ATTRIBUTE.
+	 */
 	public static final String OPERATION_ATTRIBUTE = Constants.class.getName() + ".operation";
 
-	public static final String ROUTER_ATTRIBUTE = Constants.class.getName() + ".router";
-
 	/**
 	 * Instantiates a new Constants.
 	 */

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

@@ -71,9 +71,9 @@ public class DelegatingMethodParameter extends MethodParameter {
 	/**
 	 * Instantiates a new Delegating method parameter.
 	 *
-	 * @param delegate the delegate 
-	 * @param parameterName the parameter name 
-	 * @param additionalParameterAnnotations the additional parameter annotations 
+	 * @param delegate the delegate
+	 * @param parameterName the parameter name
+	 * @param additionalParameterAnnotations the additional parameter annotations
 	 * @param isParameterObject the is parameter object
 	 */
 	DelegatingMethodParameter(MethodParameter delegate, String parameterName, Annotation[] additionalParameterAnnotations, boolean isParameterObject) {
@@ -87,9 +87,9 @@ public class DelegatingMethodParameter extends MethodParameter {
 	/**
 	 * Customize method parameter [ ].
 	 *
-	 * @param pNames the p names 
-	 * @param parameters the parameters 
-	 * @param optionalDelegatingMethodParameterCustomizer the optional delegating method parameter customizer 
+	 * @param pNames the p names
+	 * @param parameters the parameters
+	 * @param optionalDelegatingMethodParameterCustomizer the optional delegating method parameter customizer
 	 * @return the method parameter [ ]
 	 */
 	public static MethodParameter[] customize(String[] pNames, MethodParameter[] parameters, Optional<DelegatingMethodParameterCustomizer> optionalDelegatingMethodParameterCustomizer) {