Revert "Automatically add required if a field is @NotNull or @notblank. Fixes springdoc#2817"

This reverts commit 39ef9f4.

Author: mc1arke

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/extractor/MethodParameterPojoExtractor.java

@@ -159,12 +159,11 @@ private static Stream<MethodParameter> fromGetterOfField(Class<?> paramClass, Fi
 				return Stream.empty();
 			}
 			String prefix = fieldNamePrefix + resolveName(parameter, schema).orElse(field.getName()) + DOT;
-			Set<String> annotationSimpleNames = Arrays.stream(field.getDeclaredAnnotations())
+			boolean notNullAnnotationsPresent = AbstractRequestService.hasNotNullAnnotation(Arrays.stream(field.getDeclaredAnnotations())
 					.map(Annotation::annotationType)
 					.map(Class::getSimpleName)
-					.collect(Collectors.toSet());
-			boolean notNullAnnotationsPresent = AbstractRequestService.hasNotNullAnnotation(annotationSimpleNames);
-			return extractFrom(type, prefix,  resolveRequired(schema, parameter, !notNullAnnotationsPresent));
+					.collect(Collectors.toSet()));
+			return extractFrom(type, prefix, parentRequired && resolveRequired(schema, parameter, !notNullAnnotationsPresent));
 		}
 	}
 
@@ -271,12 +270,10 @@ private static Stream<MethodParameter> fromSimpleClass(Class<?> paramClass, Fiel
 				return Stream.empty();
 			}
 
-			Set<String> annotationSimpleNames = Arrays.stream(field.getDeclaredAnnotations())
+			boolean isNotRequired = !(isParentRequired && resolveRequired(schema, parameter, !AbstractRequestService.hasNotNullAnnotation(Arrays.stream(fieldAnnotations)
 					.map(Annotation::annotationType)
 					.map(Class::getSimpleName)
-					.collect(Collectors.toSet());
-							
-			boolean isNotRequired = !resolveRequired(schema, parameter, !AbstractRequestService.hasNotNullAnnotation(annotationSimpleNames));
+					.collect(Collectors.toSet()))));
 			Annotation[] notNullFieldAnnotations = Arrays.stream(fieldAnnotations)
 					.filter(annotation -> AbstractRequestService.hasNotNullAnnotation(List.of(annotation.annotationType().getSimpleName())))
 					.toArray(Annotation[]::new);

springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app233/ParameterController.java

@@ -27,7 +27,6 @@
 
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import org.springdoc.core.annotations.ParameterObject;
 
@@ -73,24 +72,15 @@ public void nestedParameterObjectWithOptionalParentField(@ParameterObject Parame
 	}
 
 	public record ParameterObjectWithOptionalField(
-			NestedRequiredParameterObject schemaNotRequiredNestedParameterObject,
-			NestedNonNullParameterObject nestedNonNullParameterObject,
-			NestedNotBlankParameterObject nestedNotBlankParameterObject
+			@Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED) NestedRequiredParameterObject schemaNotRequiredNestedParameterObject,
+			@Parameter NestedRequiredParameterObject parameterNotRequiredNestedParameterObject,
+			@Parameter(required = true) NestedRequiredParameterObject requiredNestedParameterObject
 	) {
 
 	}
 
 	public record NestedRequiredParameterObject(
-			@Schema(requiredMode = Schema.RequiredMode.REQUIRED) String requiredParameterField) {
+			@Schema(requiredMode = Schema.RequiredMode.REQUIRED) @NotNull String requiredParameterField) {
 	}
 
-	public record NestedNonNullParameterObject(
-			@NotNull String requiredParameterField) {
-	}
-
-	public record NestedNotBlankParameterObject(
-			@NotBlank String requiredParameterField) {
-	}
-
-
 }

springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app233.json

@@ -60,21 +60,21 @@
           {
             "name": "schemaNotRequiredNestedParameterObject.requiredParameterField",
             "in": "query",
-            "required": true,
+            "required": false,
             "schema": {
               "type": "string"
             }
           },
           {
-            "name": "nestedNonNullParameterObject.requiredParameterField",
+            "name": "parameterNotRequiredNestedParameterObject.requiredParameterField",
             "in": "query",
-            "required": true,
+            "required": false,
             "schema": {
               "type": "string"
             }
           },
           {
-            "name": "nestedNotBlankParameterObject.requiredParameterField",
+            "name": "requiredNestedParameterObject.requiredParameterField",
             "in": "query",
             "required": true,
             "schema": {
@@ -114,4 +114,4 @@
     }
   },
   "components": {}
-}
+}