code second review

Author: bnasslahsen

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

@@ -199,7 +199,7 @@ public static Optional<Content> getContent(io.swagger.v3.oas.annotations.media.C
 	 */
 	public static void mergeSchema(Content existingContent, Schema<?> schemaN, String mediaTypeStr) {
 		if (existingContent.containsKey(mediaTypeStr)) {
-			io.swagger.v3.oas.models.media.MediaType mediaType = existingContent.get(mediaTypeStr);
+			MediaType mediaType = existingContent.get(mediaTypeStr);
 			if (!schemaN.equals(mediaType.getSchema())) {
 				// Merge the two schemas for the same mediaType
 				Schema firstSchema = mediaType.getSchema();
@@ -221,7 +221,7 @@ public static void mergeSchema(Content existingContent, Schema<?> schemaN, Strin
 		}
 		else
 			// Add the new schema for a different mediaType
-			existingContent.addMediaType(mediaTypeStr, new io.swagger.v3.oas.models.media.MediaType().schema(schemaN));
+			existingContent.addMediaType(mediaTypeStr, new MediaType().schema(schemaN));
 	}
 
 	/**
@@ -232,10 +232,15 @@ public static void mergeSchema(Content existingContent, Schema<?> schemaN, Strin
 	 */
 	@SuppressWarnings("unchecked")
 	public static boolean isAnnotationToIgnore(MethodParameter parameter) {
-		return parameter.getParameterIndex() != -1
-				&& ANNOTATIONS_TO_IGNORE.stream().anyMatch(
-						annotation -> AnnotationUtils.findAnnotation(parameter.getParameter(), annotation) != null
+		boolean annotationFirstCheck = ANNOTATIONS_TO_IGNORE.stream().anyMatch(annotation ->
+				(parameter.getParameterIndex() != -1 && AnnotationUtils.findAnnotation(parameter.getParameter(), annotation) != null)
 						|| AnnotationUtils.findAnnotation(parameter.getParameterType(), annotation) != null);
+
+		boolean annotationSecondCheck = Arrays.stream(parameter.getParameterAnnotations()).anyMatch(annotation ->
+				ANNOTATIONS_TO_IGNORE.contains(annotation.annotationType())
+						|| ANNOTATIONS_TO_IGNORE.stream().anyMatch(annotationToIgnore -> annotation.annotationType().getDeclaredAnnotation(annotationToIgnore) != null));
+
+		return annotationFirstCheck || annotationSecondCheck;
 	}
 
 	/**

springdoc-openapi-security/src/test/java/test/org/springdoc/api/app7/CurrentUser.java

@@ -1,14 +1,14 @@
 package test.org.springdoc.api.app7;
 
-import org.springframework.security.core.annotation.AuthenticationPrincipal;
-
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@Target({ElementType.PARAMETER, ElementType.TYPE})
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+
+@Target({ElementType.PARAMETER, ElementType.TYPE, ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 @AuthenticationPrincipal

springdoc-openapi-security/src/test/java/test/org/springdoc/api/app7/HelloController.java

@@ -18,6 +18,8 @@
 
 package test.org.springdoc.api.app7;
 
+import org.springdoc.api.annotations.ParameterObject;
+
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -27,8 +29,10 @@ public class HelloController {
 
 	@PostMapping(value = "/hello")
 	public String hello(
-		@AuthenticationPrincipal Person person1,
-		@CurrentUser Person person2) {
+			@AuthenticationPrincipal Person person1,
+			@CurrentUser Person person2,
+			@ParameterObject AnotherPerson person3,
+			@ParameterObject TheOtherPerson person4) {
 		return "OK";
 	}