Skip to content

Commit 6d003ae

Browse files
author
bnasslahsen
committed
Crash on startup with 1.3.3 for kotlin app not using reactor. Fixes #583
1 parent 4e1fb64 commit 6d003ae

File tree

3 files changed

+24
-4
lines changed

3 files changed

+24
-4
lines changed

springdoc-openapi-kotlin/src/main/java/org/springdoc/kotlin/SpringDocKotlinConfiguration.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import io.swagger.v3.core.util.Json;
2323
import kotlin.Deprecated;
2424
import kotlin.coroutines.Continuation;
25-
import kotlinx.coroutines.flow.Flow;
2625

2726
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
2827
import org.springframework.context.annotation.Bean;
@@ -38,8 +37,7 @@ public class SpringDocKotlinConfiguration {
3837

3938
static {
4039
getConfig().addRequestWrapperToIgnore(Continuation.class)
41-
.addDeprecatedType(Deprecated.class)
42-
.addFluxWrapperToIgnore(Flow.class);
40+
.addDeprecatedType(Deprecated.class);
4341
Json.mapper().registerModule(new KotlinModule());
4442
}
4543

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package org.springdoc.kotlin;
2+
3+
import kotlinx.coroutines.flow.Flow;
4+
5+
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
6+
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
7+
import org.springframework.context.annotation.Configuration;
8+
9+
import static org.springdoc.core.Constants.SPRINGDOC_ENABLED;
10+
import static org.springdoc.core.SpringDocUtils.getConfig;
11+
12+
@ConditionalOnClass(Flow.class)
13+
@Configuration
14+
@ConditionalOnProperty(name = SPRINGDOC_ENABLED, matchIfMissing = true)
15+
public class SpringDocKotlinxConfiguration {
16+
17+
static {
18+
getConfig().addFluxWrapperToIgnore(Flow.class);
19+
}
20+
21+
}
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
2-
org.springdoc.kotlin.SpringDocKotlinConfiguration
2+
org.springdoc.kotlin.SpringDocKotlinConfiguration,\
3+
org.springdoc.kotlin.SpringDocKotlinxConfiguration

0 commit comments

Comments
 (0)