Ignore annotatation - handle nested object

Author: michal

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

@@ -352,7 +352,7 @@ protected Parameter customiseParameter(Parameter parameter, ParameterInfo parame
 	 * @param parameter the parameter
 	 * @return the boolean
 	 */
-	public boolean isParamToIgnore(MethodParameter parameter) {
+	public boolean isParamToIgnore(DelegatingMethodParameter parameter) {
 		if (SpringDocAnnotationsUtils.isAnnotationToIgnore(parameter))
 			return true;
 		if (isRequiredAnnotation(parameter))

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

@@ -68,6 +68,12 @@ public class DelegatingMethodParameter extends MethodParameter {
 	 */
 	private boolean isParameterObject;
 
+	/**
+	 * For simple parameters, it is null
+	 * For nested parameter is a controller method parameter
+	 */
+	private MethodParameter controllerMethodParameter;
+
 	/**
 	 * Instantiates a new Delegating method parameter.
 	 *
@@ -98,9 +104,10 @@ public static DelegatingMethodParameter[] customize(String[] pNames, MethodParam
 			MethodParameter p = parameters[i];
 			Class<?> paramClass = AdditionalModelsConverter.getReplacement(p.getParameterType());
 			if (p.hasParameterAnnotation(ParameterObject.class) || AnnotatedElementUtils.isAnnotated(paramClass, ParameterObject.class)) {
-				MethodParameterPojoExtractor.extractFrom(paramClass).forEach(methodParameter -> {
-					optionalDelegatingMethodParameterCustomizer.ifPresent(customizer -> customizer.customize(p, methodParameter));
-					explodedParameters.add(methodParameter);
+				MethodParameterPojoExtractor.extractFrom(paramClass).forEach(delegatingMethodParameter -> {
+					optionalDelegatingMethodParameterCustomizer.ifPresent(customizer -> customizer.customize(p, delegatingMethodParameter));
+					delegatingMethodParameter.setControllerMethodParameter(p);
+					explodedParameters.add(delegatingMethodParameter);
 				});
 			}
 			else {
@@ -213,4 +220,14 @@ public int hashCode() {
 	public boolean isParameterObject() {
 		return isParameterObject;
 	}
+
+	public void setControllerMethodParameter(MethodParameter controllerMethodParameter) {
+		this.controllerMethodParameter = controllerMethodParameter;
+	}
+
+	public MethodParameter getControllerMethodParameter() {
+		return controllerMethodParameter == null ? delegate : controllerMethodParameter;
+	}
+
+
 }

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

@@ -231,9 +231,9 @@ public static void mergeSchema(Content existingContent, Schema<?> schemaN, Strin
 	 * @return the boolean
 	 */
 	@SuppressWarnings("unchecked")
-	public static boolean isAnnotationToIgnore(MethodParameter parameter) {
+	public static boolean isAnnotationToIgnore(DelegatingMethodParameter parameter) {
 		return ANNOTATIONS_TO_IGNORE.stream().anyMatch(
-				annotation -> AnnotationUtils.findAnnotation(parameter.getParameter(), annotation) != null
+				annotation -> AnnotationUtils.findAnnotation(parameter.getControllerMethodParameter().getParameter(), annotation) != null
 						|| AnnotationUtils.findAnnotation(parameter.getParameterType(), annotation) != null);
 	}
 

springdoc-openapi-data-rest/src/main/java/org/springdoc/data/rest/core/DataRestRequestBuilder.java

@@ -137,7 +137,7 @@ public void buildParameters(Class<?> domainType, OpenAPI openAPI, HandlerMethod
 	 */
 	public void buildCommonParameters(Class<?> domainType, OpenAPI openAPI, RequestMethod requestMethod, MethodAttributes methodAttributes, Operation operation, String[] pNames, MethodParameter[] methodParameters) {
 		DelegatingMethodParameter[] parameters = DelegatingMethodParameter.customize(pNames, methodParameters, parameterBuilder.getDelegatingMethodParameterCustomizer());
-		for (MethodParameter methodParameter : parameters) {
+		for (DelegatingMethodParameter methodParameter : parameters) {
 			final String pName = methodParameter.getParameterName();
 			ParameterInfo parameterInfo = new ParameterInfo(pName, methodParameter);
 			if (isParamToIgnore(methodParameter)) {
@@ -171,7 +171,7 @@ else if (methodParameter.getParameterAnnotation(BackendId.class) != null) {
 	 * @param methodParameter the method parameter
 	 * @return the boolean
 	 */
-	private boolean isParamToIgnore(MethodParameter methodParameter) {
+	private boolean isParamToIgnore(DelegatingMethodParameter methodParameter) {
 		return !requestBuilder.isParamToIgnore(methodParameter)
 				&& !isHeaderToIgnore(methodParameter)
 				&& !"property".equals(methodParameter.getParameterName());