improve compatibility with older spring/spring-boot versions

Author: bnasslahsen

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

@@ -50,9 +50,6 @@
 import org.slf4j.LoggerFactory;
 import org.springdoc.core.customizers.DelegatingMethodParameterCustomizer;
 
-import org.springframework.boot.autoconfigure.web.format.DateTimeFormatters;
-import org.springframework.boot.autoconfigure.web.format.WebConversionService;
-import org.springframework.boot.autoconfigure.web.reactive.WebFluxProperties.Format;
 import org.springframework.core.MethodParameter;
 import org.springframework.core.ResolvableType;
 import org.springframework.core.io.Resource;
@@ -78,7 +75,7 @@ public class GenericParameterService {
 	/**
 	 * The Web conversion service.
 	 */
-	private final WebConversionService webConversionService;
+	private final Optional<WebConversionServiceProvider> optionalWebConversionServiceProvider;
 
 	/**
 	 * The constant LOGGER.
@@ -99,18 +96,12 @@ public class GenericParameterService {
 	 * Instantiates a new Generic parameter builder.
 	 * @param propertyResolverUtils the property resolver utils
 	 * @param optionalDelegatingMethodParameterCustomizer the optional delegating method parameter customizer
-	 * @param webConversionServiceOptional the web conversion service optional
+	 * @param optionalWebConversionServiceProvider
 	 */
-	public GenericParameterService(PropertyResolverUtils propertyResolverUtils, Optional<DelegatingMethodParameterCustomizer> optionalDelegatingMethodParameterCustomizer, Optional<WebConversionService> webConversionServiceOptional) {
+	public GenericParameterService(PropertyResolverUtils propertyResolverUtils, Optional<DelegatingMethodParameterCustomizer> optionalDelegatingMethodParameterCustomizer, Optional<WebConversionServiceProvider> optionalWebConversionServiceProvider) {
 		this.propertyResolverUtils = propertyResolverUtils;
 		this.optionalDelegatingMethodParameterCustomizer = optionalDelegatingMethodParameterCustomizer;
-		if (webConversionServiceOptional.isPresent())
-			this.webConversionService = webConversionServiceOptional.get();
-		else {
-			final Format format = new Format();
-			this.webConversionService = new WebConversionService(new DateTimeFormatters()
-					.dateFormat(format.getDate()).timeFormat(format.getTime()).dateTimeFormat(format.getDateTime()));
-		}
+		this.optionalWebConversionServiceProvider = optionalWebConversionServiceProvider;
 	}
 
 	/**
@@ -491,13 +482,7 @@ public PropertyResolverUtils getPropertyResolverUtils() {
 		return propertyResolverUtils;
 	}
 
-
-	/**
-	 * Gets web conversion service.
-	 *
-	 * @return the web conversion service
-	 */
-	public WebConversionService getWebConversionService() {
-		return webConversionService;
+	public Optional<WebConversionServiceProvider> getOptionalWebConversionServiceProvider() {
+		return optionalWebConversionServiceProvider;
 	}
 }

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

@@ -25,7 +25,6 @@
 import io.swagger.v3.oas.annotations.enums.ParameterIn;
 import org.apache.commons.lang3.StringUtils;
 
-import org.springframework.boot.autoconfigure.web.format.WebConversionService;
 import org.springframework.core.MethodParameter;
 import org.springframework.web.bind.annotation.CookieValue;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -101,8 +100,8 @@ else if (cookieValue != null)
 			this.pName = propertyResolverUtils.resolve(this.pName);
 		if (this.defaultValue !=null && !ValueConstants.DEFAULT_NONE.equals(this.defaultValue.toString())){
 			this.defaultValue = propertyResolverUtils.resolve(this.defaultValue.toString());
-			WebConversionService conversionService = parameterBuilder.getWebConversionService();
-			this.defaultValue= conversionService.convert(this.defaultValue, methodParameter.getParameterType());
+			parameterBuilder.getOptionalWebConversionServiceProvider()
+					.ifPresent(conversionService ->this.defaultValue= conversionService.convert(this.defaultValue, methodParameter.getParameterType()));
 		}
 
 		this.required = this.required && !methodParameter.isOptional();

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

@@ -282,15 +282,16 @@ ReturnTypeParser genericReturnTypeParser() {
 	 *
 	 * @param propertyResolverUtils the property resolver utils
 	 * @param optionalDelegatingMethodParameterCustomizer the optional delegating method parameter customizer
-	 * @param webConversionServiceOptional the web conversion service
+	 * @param optionalWebConversionServiceProvider the optional web conversion service provider
 	 * @return the generic parameter builder
 	 */
 	@Bean
 	@ConditionalOnMissingBean
 	GenericParameterService parameterBuilder(PropertyResolverUtils propertyResolverUtils,
 			Optional<DelegatingMethodParameterCustomizer> optionalDelegatingMethodParameterCustomizer,
-			Optional<WebConversionService> webConversionServiceOptional) {
-		return new GenericParameterService(propertyResolverUtils,optionalDelegatingMethodParameterCustomizer, webConversionServiceOptional);
+			Optional<WebConversionServiceProvider> optionalWebConversionServiceProvider) {
+		return new GenericParameterService(propertyResolverUtils, optionalDelegatingMethodParameterCustomizer,
+				optionalWebConversionServiceProvider);
 	}
 
 	/**
@@ -340,6 +341,7 @@ static BeanFactoryPostProcessor springdocBeanFactoryPostProcessor2() {
 
 	/**
 	 * The type Open api resource advice.
+	 * @author bnasslashen
 	 */
 	@RestControllerAdvice
 	@Hidden
@@ -379,6 +381,7 @@ static class SpringDocActuatorConfiguration {
 		static BeanFactoryPostProcessor springdocBeanFactoryPostProcessor3(List<GroupedOpenApi> groupedOpenApis) {
 			return new SpringdocActuatorBeanFactoryConfigurer(groupedOpenApis);
 		}
+
 		/**
 		 * Actuator customizer operation customizer.
 		 *
@@ -393,6 +396,7 @@ OperationCustomizer actuatorCustomizer() {
 		/**
 		 * Actuator customizer OpenAPI customiser.
 		 *
+		 * @param webEndpointProperties the web endpoint properties
 		 * @return the OpenAPI customiser
 		 */
 		@Bean
@@ -402,4 +406,25 @@ OpenApiCustomiser actuatorOpenApiCustomiser(WebEndpointProperties webEndpointPro
 		}
 
 	}
+
+	/**
+	 * The type Web conversion service configuration.
+	 * @author bnasslashen
+	 */
+	@ConditionalOnClass(WebConversionService.class)
+	static class WebConversionServiceConfiguration {
+
+		/**
+		 * Web conversion service provider web conversion service provider.
+		 *
+		 * @param webConversionServiceOptional the web conversion service optional
+		 * @return the web conversion service provider
+		 */
+		@Bean
+		@Lazy(false)
+		WebConversionServiceProvider webConversionServiceProvider(Optional<WebConversionService> webConversionServiceOptional) {
+			return new WebConversionServiceProvider(webConversionServiceOptional);
+		}
+	}
+
 }

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

@@ -0,0 +1,48 @@
+package org.springdoc.core;
+
+import java.util.Optional;
+
+import org.springframework.boot.autoconfigure.web.format.DateTimeFormatters;
+import org.springframework.boot.autoconfigure.web.format.WebConversionService;
+import org.springframework.boot.autoconfigure.web.reactive.WebFluxProperties.Format;
+import org.springframework.lang.Nullable;
+
+/**
+ * The type Web conversion service provider.
+ * @author bnasslashen
+ */
+public class WebConversionServiceProvider {
+
+	/**
+	 * The Web conversion service.
+	 */
+	private final WebConversionService webConversionService;
+
+	/**
+	 * Instantiates a new Web conversion service provider.
+	 *
+	 * @param webConversionServiceOptional the web conversion service optional
+	 */
+	public WebConversionServiceProvider(Optional<WebConversionService> webConversionServiceOptional) {
+		if (webConversionServiceOptional.isPresent())
+			this.webConversionService = webConversionServiceOptional.get();
+		else {
+			final Format format = new Format();
+			this.webConversionService = new WebConversionService(new DateTimeFormatters()
+					.dateFormat(format.getDate()).timeFormat(format.getTime()).dateTimeFormat(format.getDateTime()));
+		}
+	}
+
+	/**
+	 * Convert t.
+	 *
+	 * @param <T>  the type parameter
+	 * @param source the source
+	 * @param targetType the target type
+	 * @return the t
+	 */
+	@Nullable
+	public <T> T convert(@Nullable Object source, Class<T> targetType) {
+		return webConversionService.convert(source, targetType);
+	}
+}