Skip to content

Commit 24dd129

Browse files
committed
Merge branch 'remove-ktor-webjars-plugin' into develop
2 parents 176877e + 411a820 commit 24dd129

2 files changed

Lines changed: 4 additions & 11 deletions

File tree

ktor-swagger-ui/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ dependencies {
3131
val versionMockk: String by project
3232

3333
implementation("io.ktor:ktor-server-core-jvm:$versionKtor")
34-
implementation("io.ktor:ktor-server-webjars:$versionKtor")
3534
implementation("io.ktor:ktor-server-auth:$versionKtor")
3635
implementation("io.ktor:ktor-server-resources:$versionKtor")
3736

ktor-swagger-ui/src/main/kotlin/io/github/smiley4/ktorswaggerui/SwaggerPlugin.kt

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package io.github.smiley4.ktorswaggerui
22

3+
import io.github.oshai.kotlinlogging.KotlinLogging
34
import io.github.smiley4.ktorswaggerui.builder.example.ExampleContext
45
import io.github.smiley4.ktorswaggerui.builder.example.ExampleContextImpl
56
import io.github.smiley4.ktorswaggerui.builder.openapi.ComponentsBuilder
@@ -29,21 +30,17 @@ import io.github.smiley4.ktorswaggerui.builder.route.RouteDocumentationMerger
2930
import io.github.smiley4.ktorswaggerui.builder.route.RouteMeta
3031
import io.github.smiley4.ktorswaggerui.builder.schema.SchemaContext
3132
import io.github.smiley4.ktorswaggerui.builder.schema.SchemaContextImpl
33+
import io.github.smiley4.ktorswaggerui.data.OutputFormat
3234
import io.github.smiley4.ktorswaggerui.data.PluginConfigData
3335
import io.github.smiley4.ktorswaggerui.dsl.config.PluginConfigDsl
3436
import io.github.smiley4.ktorswaggerui.routing.ApiSpec
3537
import io.ktor.server.application.Application
3638
import io.ktor.server.application.ApplicationStarted
3739
import io.ktor.server.application.createApplicationPlugin
3840
import io.ktor.server.application.hooks.MonitoringEvent
39-
import io.ktor.server.application.install
4041
import io.ktor.server.application.plugin
41-
import io.ktor.server.application.pluginOrNull
4242
import io.ktor.server.routing.RoutingRoot
43-
import io.ktor.server.webjars.Webjars
4443
import io.swagger.v3.core.util.Json31
45-
import io.github.oshai.kotlinlogging.KotlinLogging
46-
import io.github.smiley4.ktorswaggerui.data.OutputFormat
4744
import io.swagger.v3.core.util.Yaml31
4845

4946
/**
@@ -59,10 +56,6 @@ val SwaggerUI = createApplicationPlugin(name = "SwaggerUI", createConfiguration
5956

6057
on(MonitoringEvent(ApplicationStarted)) { application ->
6158

62-
if (application.pluginOrNull(Webjars) == null) {
63-
application.install(Webjars)
64-
}
65-
6659
try {
6760
val routes = routes(application, config)
6861
ApiSpec.setAll(buildOpenApiSpecs(config, routes))
@@ -102,7 +95,7 @@ private fun buildOpenApiSpec(specName: String, pluginConfig: PluginConfigData, r
10295
}
10396
val openApi = builder(pluginConfig, schemaContext, exampleContext).build(routes)
10497
pluginConfig.postBuild?.let { it(openApi, specName) }
105-
when(pluginConfig.outputFormat) {
98+
when (pluginConfig.outputFormat) {
10699
OutputFormat.JSON -> Json31.pretty(openApi) to pluginConfig.outputFormat
107100
OutputFormat.YAML -> Yaml31.pretty(openApi) to pluginConfig.outputFormat
108101
}
@@ -119,6 +112,7 @@ private fun routes(application: Application, config: PluginConfigData): List<Rou
119112
.toList()
120113
}
121114

115+
122116
/**
123117
* fix [#97](https://github.com/SMILEY4/ktor-swagger-ui/pull/97)
124118
*

0 commit comments

Comments
 (0)