springdoc-openapi-webflux-ui 2.0.0-M7 + spring actuator + spring cloud crashes at startup. Fixes #1904.

Author: bnasslahsen

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

@@ -103,7 +103,6 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
-import org.springframework.core.convert.support.GenericConversionService;
 import org.springframework.data.rest.core.config.RepositoryRestConfiguration;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -502,13 +501,12 @@ static class WebConversionServiceConfiguration {
 		/**
 		 * Web conversion service provider web conversion service provider.
 		 *
-		 * @param mvcConversionService the web conversion service optional
 		 * @return the web conversion service provider
 		 */
 		@Bean
 		@Lazy(false)
-		WebConversionServiceProvider webConversionServiceProvider(Optional<GenericConversionService> mvcConversionService) {
-			return new WebConversionServiceProvider(mvcConversionService);
+		WebConversionServiceProvider webConversionServiceProvider() {
+			return new WebConversionServiceProvider();
 		}
 	}
 

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

@@ -32,37 +32,63 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.core.convert.converter.GenericConverter.ConvertiblePair;
 import org.springframework.core.convert.support.GenericConversionService;
 import org.springframework.format.support.DefaultFormattingConversionService;
+import org.springframework.format.support.FormattingConversionService;
 import org.springframework.lang.Nullable;
+import org.springframework.util.ClassUtils;
+
 
 /**
  * The type Web conversion service provider.
  * @author bnasslashen
  */
-public class WebConversionServiceProvider {
+public class WebConversionServiceProvider implements InitializingBean, ApplicationContextAware {
 
+	/**
+	 * The constant CONVERTERS.
+	 */
 	private static final String CONVERTERS = "converters";
 
 	/**
 	 * The constant LOGGER.
 	 */
 	private static final Logger LOGGER = LoggerFactory.getLogger(WebConversionServiceProvider.class);
+
 	/**
 	 * The Formatting conversion service.
 	 */
-	private final GenericConversionService formattingConversionService;
+	private GenericConversionService formattingConversionService;
 
 	/**
-	 * Instantiates a new Web conversion service provider.
-	 *
-	 * @param webConversionServiceOptional the web conversion service optional
+	 * The Application context.
+	 */
+	private ApplicationContext applicationContext;
+
+	/**
+	 * The constant SERVLET_APPLICATION_CONTEXT_CLASS.
+	 */
+	private static final String SERVLET_APPLICATION_CONTEXT_CLASS = "org.springframework.web.context.WebApplicationContext";
+
+	/**
+	 * The constant REACTIVE_APPLICATION_CONTEXT_CLASS.
 	 */
-	public WebConversionServiceProvider(Optional<GenericConversionService> webConversionServiceOptional) {
-		if (webConversionServiceOptional.isPresent())
-			this.formattingConversionService = webConversionServiceOptional.get();
+	private static final String REACTIVE_APPLICATION_CONTEXT_CLASS = "org.springframework.boot.web.reactive.context.ReactiveWebApplicationContext";
+
+	@Override
+	public void afterPropertiesSet() {
+		if (isAssignable(SERVLET_APPLICATION_CONTEXT_CLASS, this.applicationContext.getClass())) {
+			this.formattingConversionService = applicationContext.getBean("mvcConversionService", FormattingConversionService.class);
+		}
+		else if (isAssignable(REACTIVE_APPLICATION_CONTEXT_CLASS, this.applicationContext.getClass())) {
+			this.formattingConversionService = applicationContext.getBean("webFluxConversionService", FormattingConversionService.class);
+		}
 		else
 			formattingConversionService = new DefaultFormattingConversionService();
 	}
@@ -106,4 +132,25 @@ public Class<?> getSpringConvertedType(Class<?> clazz) {
 		}
 		return result;
 	}
+
+	/**
+	 * Is assignable boolean.
+	 *
+	 * @param target the target
+	 * @param type the type
+	 * @return the boolean
+	 */
+	private boolean isAssignable(String target, Class<?> type) {
+		try {
+			return ClassUtils.resolveClassName(target, null).isAssignableFrom(type);
+		}
+		catch (Throwable ex) {
+			return false;
+		}
+	}
+	@Override
+	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+		this.applicationContext = applicationContext;
+	}
+
 }