project review

Author: bnasslahsen

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

@@ -78,7 +78,7 @@ public abstract class AbstractOpenApiResource extends SpecFilter {
 
 	private static final List<Class<?>> HIDDEN_REST_CONTROLLERS = new ArrayList<>();
 
-	private static final List<Class<? extends Annotation>> DEPRECATED_ANNOTATIONS = new ArrayList<>();
+	public static final List<Class<? extends Annotation>> DEPRECATED_ANNOTATIONS = new ArrayList<>();
 
 	static {
 		DEPRECATED_ANNOTATIONS.add(Deprecated.class);
@@ -415,11 +415,7 @@ protected Operation customiseOperation(Operation operation, HandlerMethod handle
 		return operation;
 	}
 
-	private static boolean isDeprecated(AnnotatedElement annotatedElement) {
+	private boolean isDeprecated(AnnotatedElement annotatedElement) {
 		return DEPRECATED_ANNOTATIONS.stream().anyMatch(annoClass -> AnnotatedElementUtils.findMergedAnnotation(annotatedElement, annoClass) != null);
 	}
-
-	public static boolean containsDeprecatedAnnotation(Annotation[] annotations) {
-		return annotations != null && Stream.of(annotations).map(Annotation::annotationType).anyMatch(DEPRECATED_ANNOTATIONS::contains);
-	}
 }

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

@@ -53,7 +53,6 @@
 import io.swagger.v3.oas.models.parameters.Parameter;
 import io.swagger.v3.oas.models.parameters.RequestBody;
 import org.apache.commons.lang3.StringUtils;
-import org.springdoc.api.AbstractOpenApiResource;
 import org.springdoc.core.customizers.ParameterCustomizer;
 
 import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
@@ -79,6 +78,7 @@
 import static org.springdoc.core.Constants.OPENAPI_ARRAY_TYPE;
 import static org.springdoc.core.Constants.OPENAPI_STRING_TYPE;
 import static org.springdoc.core.Constants.QUERY_PARAM;
+import static org.springdoc.core.converters.SchemaPropertyDeprecatingConverter.containsDeprecatedAnnotation;
 
 public abstract class AbstractRequestBuilder {
 
@@ -339,9 +339,8 @@ private Parameter buildParam(String in, Components components, ParameterInfo par
 		if (required != null && parameter.getRequired() == null)
 			parameter.setRequired(required);
 
-		if (AbstractOpenApiResource.containsDeprecatedAnnotation(parameterInfo.getMethodParameter().getParameterAnnotations())) {
+		if (containsDeprecatedAnnotation(parameterInfo.getMethodParameter().getParameterAnnotations()))
 			parameter.setDeprecated(true);
-		}
 
 		if (parameter.getSchema() == null) {
 			Schema<?> schema = parameterBuilder.calculateSchema(components, parameterInfo, null,

springdoc-openapi-common/src/main/java/org/springdoc/core/converters/SchemaPropertyDeprecatingConverter.java

@@ -1,23 +1,30 @@
 package org.springdoc.core.converters;
 
+import java.lang.annotation.Annotation;
 import java.util.Iterator;
+import java.util.stream.Stream;
 
 import io.swagger.v3.core.converter.AnnotatedType;
 import io.swagger.v3.core.converter.ModelConverter;
 import io.swagger.v3.core.converter.ModelConverterContext;
 import io.swagger.v3.oas.models.media.Schema;
-import org.springdoc.api.AbstractOpenApiResource;
+
+import static org.springdoc.api.AbstractOpenApiResource.DEPRECATED_ANNOTATIONS;
 
 public class SchemaPropertyDeprecatingConverter implements ModelConverter {
+
 	@Override
 	public Schema resolve(AnnotatedType type, ModelConverterContext context, Iterator<ModelConverter> chain) {
 		if (chain.hasNext()) {
 			Schema<?> resolvedSchema = chain.next().resolve(type, context, chain);
-			if (type.isSchemaProperty() && AbstractOpenApiResource.containsDeprecatedAnnotation(type.getCtxAnnotations())) {
+			if (type.isSchemaProperty() && containsDeprecatedAnnotation(type.getCtxAnnotations()))
 				resolvedSchema.setDeprecated(true);
-			}
 			return resolvedSchema;
 		}
 		return null;
 	}
+
+	public static boolean containsDeprecatedAnnotation(Annotation[] annotations) {
+		return annotations != null && Stream.of(annotations).map(Annotation::annotationType).anyMatch(DEPRECATED_ANNOTATIONS::contains);
+	}
 }

springdoc-openapi-webmvc-core/src/main/java/org/springdoc/webmvc/core/SpringDocWebMvcConfiguration.java

@@ -38,6 +38,8 @@
 import org.springdoc.webmvc.api.ActuatorProvider;
 import org.springdoc.webmvc.api.OpenApiResource;
 
+import org.springframework.boot.actuate.autoconfigure.web.server.ConditionalOnManagementPort;
+import org.springframework.boot.actuate.autoconfigure.web.server.ManagementPortType;
 import org.springframework.boot.actuate.endpoint.web.servlet.WebMvcEndpointHandlerMapping;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -92,6 +94,7 @@ GenericResponseBuilder responseBuilder(OperationBuilder operationBuilder, List<R
 
 	@ConditionalOnProperty(SPRINGDOC_SHOW_ACTUATOR)
 	@ConditionalOnClass(WebMvcEndpointHandlerMapping.class)
+	@ConditionalOnManagementPort(ManagementPortType.SAME)
 	class SpringDocWebMvcActuatorConfiguration {
 
 		@Bean