Skip to content

Commit 4fb5a3c

Browse files
committed
Samples updates
1 parent b70b7b7 commit 4fb5a3c

File tree

2 files changed

+50
-3
lines changed

2 files changed

+50
-3
lines changed

springdoc-openapi-starter-common/pom.xml

+43
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,49 @@
110110
</archive>
111111
</configuration>
112112
</plugin>
113+
<plugin>
114+
<artifactId>kotlin-maven-plugin</artifactId>
115+
<groupId>org.jetbrains.kotlin</groupId>
116+
<executions>
117+
<execution>
118+
<id>compile</id>
119+
<phase>process-sources</phase>
120+
<goals>
121+
<goal>compile</goal>
122+
</goals>
123+
<configuration>
124+
<sourceDirs>
125+
<sourceDir>${project.basedir}/src/main/java</sourceDir>
126+
<sourceDir>${project.basedir}/src/main/kotlin</sourceDir>
127+
</sourceDirs>
128+
</configuration>
129+
</execution>
130+
<execution>
131+
<id>test-compile</id>
132+
<goals>
133+
<goal>test-compile</goal>
134+
</goals>
135+
<configuration>
136+
<sourceDirs>
137+
<sourceDir>${project.basedir}/src/test/kotlin</sourceDir>
138+
<sourceDir>${project.basedir}/src/test/java</sourceDir>
139+
</sourceDirs>
140+
</configuration>
141+
</execution>
142+
</executions>
143+
<configuration>
144+
<compilerPlugins>
145+
<plugin>spring</plugin>
146+
</compilerPlugins>
147+
</configuration>
148+
<dependencies>
149+
<dependency>
150+
<groupId>org.jetbrains.kotlin</groupId>
151+
<artifactId>kotlin-maven-allopen</artifactId>
152+
<version>${kotlin.version}</version>
153+
</dependency>
154+
</dependencies>
155+
</plugin>
113156
</plugins>
114157
</build>
115158

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

+7-3
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,11 @@ import org.springdoc.core.providers.ObjectMapperProvider
99
import org.springdoc.core.utils.Constants
1010
import org.springdoc.core.utils.SpringDocUtils
1111
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean
12+
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass
13+
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression
1214
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
1315
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
16+
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication
1417
import org.springframework.context.annotation.Bean
1518
import org.springframework.context.annotation.Configuration
1619
import org.springframework.context.annotation.Lazy
@@ -27,9 +30,10 @@ import kotlin.reflect.jvm.kotlinFunction
2730
@Lazy(false)
2831
@Configuration(proxyBeanMethods = false)
2932
@ConditionalOnProperty(name = [Constants.SPRINGDOC_ENABLED], matchIfMissing = true)
30-
@ConditionalOnBean(
31-
SpringDocConfiguration::class
32-
)
33+
@ConditionalOnExpression("\${springdoc.api-docs.enabled:true} and \${springdoc.enable-kotlin:true}")
34+
@ConditionalOnClass(Continuation::class)
35+
@ConditionalOnWebApplication
36+
@ConditionalOnBean(SpringDocConfiguration::class)
3337
open class SpringDocKotlinConfiguration(objectMapperProvider: ObjectMapperProvider) {
3438
/**
3539
* Instantiates a new Spring doc kotlin configuration.

0 commit comments

Comments
 (0)