Merge branch 'NaccOll-default-flat-object'

Author: bnasslahsen

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

@@ -166,6 +166,11 @@ public abstract class AbstractRequestService {
 	 */
 	private final Optional<List<ParameterCustomizer>> parameterCustomizers;
 
+	/**
+	 * The Default flat param object.
+	 */
+	private final boolean defaultFlatParamObject;
+
 	/**
 	 * Instantiates a new Abstract request builder.
 	 *
@@ -185,6 +190,7 @@ protected AbstractRequestService(GenericParameterService parameterBuilder, Reque
 		parameterCustomizers.ifPresent(customizers -> customizers.removeIf(Objects::isNull));
 		this.parameterCustomizers = parameterCustomizers;
 		this.localSpringDocParameterNameDiscoverer = localSpringDocParameterNameDiscoverer;
+		this.defaultFlatParamObject = parameterBuilder.getPropertyResolverUtils().getSpringDocConfigProperties().isDefaultFlatParamObject();
 	}
 
 	/**
@@ -239,7 +245,7 @@ public Operation build(HandlerMethod handlerMethod, RequestMethod requestMethod,
 		String[] reflectionParametersNames = Arrays.stream(handlerMethod.getMethod().getParameters()).map(java.lang.reflect.Parameter::getName).toArray(String[]::new);
 		if (pNames == null || Arrays.stream(pNames).anyMatch(Objects::isNull))
 			pNames = reflectionParametersNames;
-		parameters = DelegatingMethodParameter.customize(pNames, parameters, parameterBuilder.getDelegatingMethodParameterCustomizer());
+		parameters = DelegatingMethodParameter.customize(pNames, parameters, parameterBuilder.getDelegatingMethodParameterCustomizer(), this.defaultFlatParamObject);
 		RequestBodyInfo requestBodyInfo = new RequestBodyInfo();
 		List<Parameter> operationParameters = (operation.getParameters() != null) ? operation.getParameters() : new ArrayList<>();
 		Map<String, io.swagger.v3.oas.annotations.Parameter> parametersDocMap = getApiParameters(handlerMethod.getMethod());
@@ -740,4 +746,12 @@ private String getParamJavadoc(JavadocProvider javadocProvider, MethodParameter
 		return paramJavadocDescription;
 	}
 
+	/**
+	 * Is default flat param object boolean.
+	 *
+	 * @return the boolean
+	 */
+	public boolean isDefaultFlatParamObject() {
+		return defaultFlatParamObject;
+	}
 }

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

@@ -111,7 +111,8 @@ public class DelegatingMethodParameter extends MethodParameter {
 	 * @param optionalDelegatingMethodParameterCustomizer the optional delegating method parameter customizer
 	 * @return the method parameter [ ]
 	 */
-	public static MethodParameter[] customize(String[] pNames, MethodParameter[] parameters, Optional<DelegatingMethodParameterCustomizer> optionalDelegatingMethodParameterCustomizer) {
+	public static MethodParameter[] customize(String[] pNames, MethodParameter[] parameters,
+			Optional<DelegatingMethodParameterCustomizer> optionalDelegatingMethodParameterCustomizer, boolean defaultFlatParamObject) {
 		List<MethodParameter> explodedParameters = new ArrayList<>();
 		for (int i = 0; i < parameters.length; ++i) {
 			MethodParameter p = parameters[i];
@@ -123,6 +124,22 @@ public static MethodParameter[] customize(String[] pNames, MethodParameter[] par
 					explodedParameters.add(methodParameter);
 				});
 			}
+			else if (defaultFlatParamObject) {
+				boolean isSimpleType = MethodParameterPojoExtractor.isSimpleType(paramClass);
+				boolean hasAnnotation = p.hasParameterAnnotations();
+				boolean shouldFlat = !isSimpleType && !hasAnnotation;
+				if (shouldFlat && !AbstractRequestService.isRequestTypeToIgnore(paramClass)) {
+					MethodParameterPojoExtractor.extractFrom(paramClass).forEach(methodParameter -> {
+						optionalDelegatingMethodParameterCustomizer
+								.ifPresent(customizer -> customizer.customize(p, methodParameter));
+						explodedParameters.add(methodParameter);
+					});
+				}
+				else {
+					String name = pNames != null ? pNames[i] : p.getParameterName();
+					explodedParameters.add(new DelegatingMethodParameter(p, name, null, false, false));
+				}
+			}
 			else {
 				String name = pNames != null ? pNames[i] : p.getParameterName();
 				explodedParameters.add(new DelegatingMethodParameter(p, name, null, false, false));
@@ -274,4 +291,4 @@ public static MethodParameter changeContainingClass(MethodParameter methodParame
 		return result;
 	}
 
-}
+}

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

@@ -28,6 +28,7 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
+import java.nio.charset.Charset;
 import java.time.Duration;
 import java.time.LocalTime;
 import java.util.ArrayList;
@@ -83,6 +84,7 @@ private MethodParameterPojoExtractor() {
 		SIMPLE_TYPES.add(OptionalDouble.class);
 		SIMPLE_TYPES.add(AtomicLong.class);
 		SIMPLE_TYPES.add(AtomicInteger.class);
+		SIMPLE_TYPES.add(Charset.class);
 
 		SIMPLE_TYPES.add(Map.class);
 		SIMPLE_TYPES.add(Iterable.class);

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

@@ -207,4 +207,13 @@ private void resolveProperty(Supplier<String> getProperty, Consumer<String> setP
 	public ConfigurableBeanFactory getFactory() {
 		return factory;
 	}
+
+	/**
+	 * Gets spring doc config properties.
+	 *
+	 * @return the spring doc config properties
+	 */
+	public SpringDocConfigProperties getSpringDocConfigProperties() {
+		return springDocConfigProperties;
+	}
 }

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

@@ -176,6 +176,11 @@ public class SpringDocConfigProperties {
 	 */
 	private boolean showSpringCloudFunctions;
 
+	/**
+	 * The param default flatten
+	 */
+	private boolean defaultFlatParamObject;
+
 	/**
 	 * The model Converters
 	 */
@@ -222,6 +227,23 @@ public void setShowSpringCloudFunctions(boolean showSpringCloudFunctions) {
 		this.showSpringCloudFunctions = showSpringCloudFunctions;
 	}
 
+	/**
+	 * Is default flat param object
+	 * @return the boolean
+	 */
+	public boolean isDefaultFlatParamObject() {
+		return defaultFlatParamObject;
+	}
+
+	/**
+	 * Sets default flat param object.
+	 *
+	 * @param defaultFlatParamObject the default flat param object
+	 */
+	public void setDefaultFlatParamObject(boolean defaultFlatParamObject) {
+		this.defaultFlatParamObject = defaultFlatParamObject;
+	}
+
 	/**
 	 * Gets model converters.
 	 *

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

@@ -149,7 +149,7 @@ public void buildParameters(OpenAPI openAPI, HandlerMethod handlerMethod, Reques
 	 */
 	public void buildCommonParameters(OpenAPI openAPI, RequestMethod requestMethod, MethodAttributes methodAttributes, Operation operation, String[] pNames, MethodParameter[] parameters,
 			DataRestRepository dataRestRepository) {
-		parameters = DelegatingMethodParameter.customize(pNames, parameters, parameterBuilder.getDelegatingMethodParameterCustomizer());
+		parameters = DelegatingMethodParameter.customize(pNames, parameters, parameterBuilder.getDelegatingMethodParameterCustomizer(), requestBuilder.isDefaultFlatParamObject());
 		Class<?> domainType = dataRestRepository.getDomainType();
 		for (MethodParameter methodParameter : parameters) {
 			final String pName = methodParameter.getParameterName();