Merge branch 'zarebski-m-master'

Author: bnasslahsen

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

@@ -19,6 +19,8 @@
 package org.springdoc.api;
 
 import java.io.UnsupportedEncodingException;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Method;
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
@@ -33,6 +35,7 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import com.fasterxml.jackson.annotation.JsonView;
 import io.swagger.v3.core.filter.SpecFilter;
@@ -57,6 +60,7 @@
 import org.springdoc.core.customizers.OpenApiCustomiser;
 import org.springdoc.core.customizers.OperationCustomizer;
 
+import org.springframework.core.MethodParameter;
 import org.springframework.core.annotation.AnnotatedElementUtils;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.util.AntPathMatcher;
@@ -74,10 +78,10 @@ public abstract class AbstractOpenApiResource extends SpecFilter {
 
 	private static final List<Class<?>> HIDDEN_REST_CONTROLLERS = new ArrayList<>();
 
-	private static final List<Class> DEPRECATED_TYPES = new ArrayList<>();
+	public static final List<Class<? extends Annotation>> DEPRECATED_ANNOTATIONS = new ArrayList<>();
 
 	static {
-		DEPRECATED_TYPES.add(Deprecated.class);
+		DEPRECATED_ANNOTATIONS.add(Deprecated.class);
 	}
 
 	protected final OpenAPIBuilder openAPIBuilder;
@@ -125,8 +129,8 @@ public static void addHiddenRestControllers(Class<?>... classes) {
 		HIDDEN_REST_CONTROLLERS.addAll(Arrays.asList(classes));
 	}
 
-	public static void addDeprecatedType(Class<?> cls) {
-		DEPRECATED_TYPES.add(cls);
+	public static void addDeprecatedType(Class<? extends Annotation> cls) {
+		DEPRECATED_ANNOTATIONS.add(cls);
 	}
 
 	protected synchronized OpenAPI getOpenApi() {
@@ -196,7 +200,7 @@ protected void calculatePath(HandlerMethod handlerMethod, String operationPath,
 
 			Operation operation = (existingOperation != null) ? existingOperation : new Operation();
 
-			if (isDeprecatedType(method))
+			if (isDeprecated(method))
 				operation.setDeprecated(true);
 
 			// Add documentation from operation annotation
@@ -411,8 +415,7 @@ protected Operation customiseOperation(Operation operation, HandlerMethod handle
 		return operation;
 	}
 
-	private boolean isDeprecatedType(Method method) {
-		return DEPRECATED_TYPES.stream().anyMatch(clazz -> (AnnotatedElementUtils.findMergedAnnotation(method, clazz) != null));
+	private boolean isDeprecated(AnnotatedElement annotatedElement) {
+		return DEPRECATED_ANNOTATIONS.stream().anyMatch(annoClass -> AnnotatedElementUtils.findMergedAnnotation(annotatedElement, annoClass) != null);
 	}
-
 }

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

@@ -78,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 {
 
@@ -338,6 +339,9 @@ private Parameter buildParam(String in, Components components, ParameterInfo par
 		if (required != null && parameter.getRequired() == null)
 			parameter.setRequired(required);
 
+		if (containsDeprecatedAnnotation(parameterInfo.getMethodParameter().getParameterAnnotations()))
+			parameter.setDeprecated(true);
+
 		if (parameter.getSchema() == null) {
 			Schema<?> schema = parameterBuilder.calculateSchema(components, parameterInfo, null,
 					jsonView);

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

@@ -31,6 +31,7 @@
 import io.swagger.v3.oas.models.media.ObjectSchema;
 import io.swagger.v3.oas.models.media.Schema;
 import org.springdoc.core.converters.AdditionalModelsConverter;
+import org.springdoc.core.converters.SchemaPropertyDeprecatingConverter;
 import org.springdoc.core.converters.FileSupportConverter;
 import org.springdoc.core.converters.ModelConverterRegistrar;
 import org.springdoc.core.converters.PropertyCustomizingConverter;
@@ -105,6 +106,13 @@ ResponseSupportConverter responseSupportConverter() {
 		return new ResponseSupportConverter();
 	}
 
+	@Bean
+	@ConditionalOnMissingBean
+	@Lazy(false)
+	SchemaPropertyDeprecatingConverter schemaPropertyDeprecatingConverter() {
+		return new SchemaPropertyDeprecatingConverter();
+	}
+
 	@Bean
 	@ConditionalOnMissingBean
 	OpenAPIBuilder openAPIBuilder(Optional<OpenAPI> openAPI, ApplicationContext context,

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

@@ -18,6 +18,7 @@
 
 package org.springdoc.core;
 
+import java.lang.annotation.Annotation;
 import java.util.function.Predicate;
 
 import io.swagger.v3.oas.models.media.Schema;
@@ -36,7 +37,7 @@ public static SpringDocUtils getConfig() {
 		return springDocConfig;
 	}
 
-	public SpringDocUtils addDeprecatedType(Class<?> cls) {
+	public SpringDocUtils addDeprecatedType(Class<? extends Annotation> cls) {
 		AbstractOpenApiResource.addDeprecatedType(cls);
 		return this;
 	}

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

@@ -0,0 +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 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() && 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/test/java/test/org/springdoc/api/app1/ItemDTO.java

@@ -45,6 +45,9 @@ public class ItemDTO implements Serializable {
 	 */
 	private int price;
 
+	@Deprecated
+	private int deprecatedPrice;
+
 	/**
 	 *
 	 */
@@ -113,4 +116,11 @@ public void setPrice(final int price) {
 		this.price = price;
 	}
 
+	public int getDeprecatedPrice() {
+		return deprecatedPrice;
+	}
+
+	public void setDeprecatedPrice(int deprecatedPrice) {
+		this.deprecatedPrice = deprecatedPrice;
+	}
 }

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app1/ItemLightDTO.java

@@ -40,6 +40,9 @@ public class ItemLightDTO implements Serializable {
 	 */
 	private int price;
 
+	@Deprecated
+	private int deprecatedPrice;
+
 	/**
 	 *
 	 */
@@ -80,4 +83,11 @@ public void setPrice(final int price) {
 		this.price = price;
 	}
 
+	public int getDeprecatedPrice() {
+		return deprecatedPrice;
+	}
+
+	public void setDeprecatedPrice(int deprecatedPrice) {
+		this.deprecatedPrice = deprecatedPrice;
+	}
 }

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app102/RequestParams.java

@@ -13,6 +13,7 @@ public class RequestParams {
 	@Parameter(description = "string parameter")
 	private String stringParam;
 
+	@Deprecated
 	private String stringParam1;
 
 	@Parameter(description = "string parameter2", required = true)

springdoc-openapi-webmvc-core/src/test/resources/results/app1.json

@@ -561,30 +561,40 @@
           }
         }
       },
-      "ItemDTO": {
+      "ItemLightDTO": {
         "type": "object",
         "properties": {
-          "itemID": {
-            "type": "string"
-          },
           "description": {
             "type": "string"
           },
           "price": {
             "type": "integer",
             "format": "int32"
+          },
+          "deprecatedPrice": {
+            "type": "integer",
+            "format": "int32",
+            "deprecated": true
           }
         }
       },
-      "ItemLightDTO": {
+      "ItemDTO": {
         "type": "object",
         "properties": {
+          "itemID": {
+            "type": "string"
+          },
           "description": {
             "type": "string"
           },
           "price": {
             "type": "integer",
             "format": "int32"
+          },
+          "deprecatedPrice": {
+            "type": "integer",
+            "format": "int32",
+            "deprecated": true
           }
         }
       },
@@ -610,4 +620,4 @@
       }
     }
   }
-}
+}

springdoc-openapi-webmvc-core/src/test/resources/results/app102.json

@@ -48,6 +48,7 @@
             "name": "stringParam1",
             "in": "query",
             "required": false,
+            "deprecated": true,
             "schema": {
               "type": "string"
             }
@@ -138,4 +139,4 @@
       }
     }
   }
-}
+}