Merge branch 'viktor-berglund-mw-main'

Author: bnasslahsen

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

@@ -1,15 +1,17 @@
 package org.springdoc.core.configuration;
 
 import com.fasterxml.jackson.module.kotlin.KotlinModule;
-import com.fasterxml.jackson.module.kotlin.KotlinModule.Builder;
+import org.springdoc.core.properties.SpringDocConfigProperties;
 import org.springdoc.core.providers.ObjectMapperProvider;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
+import org.springframework.context.annotation.Primary;
 
 /**
  * The type Spring doc kotlin module configuration.
@@ -25,12 +27,16 @@
 class SpringDocJacksonKotlinModuleConfiguration {
 
 	/**
-	 * Instantiates a new Spring doc kotlin module configuration.
+	 * Instantiates a new objectMapperProvider with a kotlin module.
 	 *
-	 * @param objectMapperProvider the object mapper provider
+	 * @param springDocConfigProperties the spring doc config properties
 	 */
-	public SpringDocJacksonKotlinModuleConfiguration(ObjectMapperProvider objectMapperProvider) {
-		objectMapperProvider.jsonMapper()
-				.registerModule(new Builder().build());
+
+	@Bean
+	@Primary
+	ObjectMapperProvider objectMapperProvider(SpringDocConfigProperties springDocConfigProperties) {
+		ObjectMapperProvider mapperProvider =  new ObjectMapperProvider(springDocConfigProperties);
+		mapperProvider.jsonMapper().registerModule(new KotlinModule.Builder().build());
+		return mapperProvider;
 	}
 }

springdoc-openapi-tests/pom.xml

@@ -17,7 +17,8 @@
 		<module>springdoc-openapi-function-webflux-tests</module>
 		<module>springdoc-openapi-actuator-webflux-tests</module>
 		<module>springdoc-openapi-actuator-webmvc-tests</module>
-		<module>springdoc-openapi-kotlin-tests</module>
+		<module>springdoc-openapi-kotlin-webflux-tests</module>
+		<module>springdoc-openapi-kotlin-webmvc-tests</module>
 		<module>springdoc-openapi-hateoas-tests</module>
 		<module>springdoc-openapi-data-rest-tests</module>
 	</modules>

springdoc-openapi-tests/springdoc-openapi-kotlin-tests/.gitignore renamed to springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/.gitignore

@@ -5,7 +5,7 @@
 		<version>2.3.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>springdoc-openapi-kotlin-tests</artifactId>
+	<artifactId>springdoc-openapi-kotlin-webflux-tests</artifactId>
 
 	<dependencies>
 		<dependency>