Skip to content

Commit 62a7d5a

Browse files
committed
SpringDocJacksonModuleConfiguration is loaded even though there is no ObjectMapperProvider when springdoc.api-docs.enabled = false. Fixes #2142
1 parent 065f7b0 commit 62a7d5a

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@
44
import com.fasterxml.jackson.module.kotlin.KotlinModule.Builder;
55
import org.springdoc.core.providers.ObjectMapperProvider;
66

7+
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
78
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
9+
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
10+
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
811
import org.springframework.context.annotation.Configuration;
912
import org.springframework.context.annotation.Lazy;
1013

@@ -16,6 +19,9 @@
1619
@Lazy(false)
1720
@Configuration(proxyBeanMethods = false)
1821
@ConditionalOnClass(KotlinModule.class)
22+
@ConditionalOnExpression("${springdoc.api-docs.enabled:true} and ${springdoc.enable-kotlin:true}")
23+
@ConditionalOnWebApplication
24+
@ConditionalOnBean(SpringDocConfiguration.class)
1925
class SpringDocJacksonKotlinModuleConfiguration {
2026

2127
/**

0 commit comments

Comments
 (0)