Merge branch 'remove-ktor-webjars-plugin' into develop

SMILEY4 · Oct 24, 2024 · 24dd129 · 24dd129
2 parents 176877e + 411a820
commit 24dd129
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/ktor-swagger-ui/build.gradle.kts b/ktor-swagger-ui/build.gradle.kts
@@ -31,7 +31,6 @@ dependencies {
     val versionMockk: String by project
 
     implementation("io.ktor:ktor-server-core-jvm:$versionKtor")
-    implementation("io.ktor:ktor-server-webjars:$versionKtor")
     implementation("io.ktor:ktor-server-auth:$versionKtor")
     implementation("io.ktor:ktor-server-resources:$versionKtor")
 

diff --git a/ktor-swagger-ui/src/main/kotlin/io/github/smiley4/ktorswaggerui/SwaggerPlugin.kt b/ktor-swagger-ui/src/main/kotlin/io/github/smiley4/ktorswaggerui/SwaggerPlugin.kt
@@ -1,5 +1,6 @@
 package io.github.smiley4.ktorswaggerui
 
+import io.github.oshai.kotlinlogging.KotlinLogging
 import io.github.smiley4.ktorswaggerui.builder.example.ExampleContext
 import io.github.smiley4.ktorswaggerui.builder.example.ExampleContextImpl
 import io.github.smiley4.ktorswaggerui.builder.openapi.ComponentsBuilder
@@ -29,21 +30,17 @@ import io.github.smiley4.ktorswaggerui.builder.route.RouteDocumentationMerger
 import io.github.smiley4.ktorswaggerui.builder.route.RouteMeta
 import io.github.smiley4.ktorswaggerui.builder.schema.SchemaContext
 import io.github.smiley4.ktorswaggerui.builder.schema.SchemaContextImpl
+import io.github.smiley4.ktorswaggerui.data.OutputFormat
 import io.github.smiley4.ktorswaggerui.data.PluginConfigData
 import io.github.smiley4.ktorswaggerui.dsl.config.PluginConfigDsl
 import io.github.smiley4.ktorswaggerui.routing.ApiSpec
 import io.ktor.server.application.Application
 import io.ktor.server.application.ApplicationStarted
 import io.ktor.server.application.createApplicationPlugin
 import io.ktor.server.application.hooks.MonitoringEvent
-import io.ktor.server.application.install
 import io.ktor.server.application.plugin
-import io.ktor.server.application.pluginOrNull
 import io.ktor.server.routing.RoutingRoot
-import io.ktor.server.webjars.Webjars
 import io.swagger.v3.core.util.Json31
-import io.github.oshai.kotlinlogging.KotlinLogging
-import io.github.smiley4.ktorswaggerui.data.OutputFormat
 import io.swagger.v3.core.util.Yaml31
 
 /**
@@ -59,10 +56,6 @@ val SwaggerUI = createApplicationPlugin(name = "SwaggerUI", createConfiguration
 
     on(MonitoringEvent(ApplicationStarted)) { application ->
 
-        if (application.pluginOrNull(Webjars) == null) {
-            application.install(Webjars)
-        }
-
         try {
             val routes = routes(application, config)
             ApiSpec.setAll(buildOpenApiSpecs(config, routes))
@@ -102,7 +95,7 @@ private fun buildOpenApiSpec(specName: String, pluginConfig: PluginConfigData, r
         }
         val openApi = builder(pluginConfig, schemaContext, exampleContext).build(routes)
         pluginConfig.postBuild?.let { it(openApi, specName) }
-        when(pluginConfig.outputFormat) {
+        when (pluginConfig.outputFormat) {
             OutputFormat.JSON -> Json31.pretty(openApi) to pluginConfig.outputFormat
             OutputFormat.YAML -> Yaml31.pretty(openApi) to pluginConfig.outputFormat
         }
@@ -119,6 +112,7 @@ private fun routes(application: Application, config: PluginConfigData): List<Rou
         .toList()
 }
 
+
 /**
  * fix [#97](https://github.com/SMILEY4/ktor-swagger-ui/pull/97)
  *