Merge branch 'develop' into release

SMILEY4 · Dec 9, 2022 · be30488 · be30488
2 parents b567e2e + d6d0a6c
commit be30488
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 19 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,20 +1,20 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "1.7.20"
+    kotlin("jvm") version "1.7.21"
     `maven-publish`
 }
 
 group = "io.github.smiley4"
-version = "0.8.0"
+version = "0.9.0"
 
 repositories {
     mavenCentral()
 }
 
 dependencies {
 
-    val ktorVersion = "2.1.3"
+    val ktorVersion = "2.2.1"
     implementation("io.ktor:ktor-server-core-jvm:$ktorVersion")
     implementation("io.ktor:ktor-server-webjars:$ktorVersion")
     implementation("io.ktor:ktor-server-auth:$ktorVersion")
@@ -48,7 +48,7 @@ dependencies {
     testImplementation("io.kotest:kotest-runner-junit5:$versionKotest")
     testImplementation("io.kotest:kotest-assertions-core:$versionKotest")
 
-    val versionKotlinTest = "1.7.20"
+    val versionKotlinTest = "1.7.21"
     testImplementation("org.jetbrains.kotlin:kotlin-test:$versionKotlinTest")
 
 }

diff --git a/src/main/kotlin/io/github/smiley4/ktorswaggerui/SwaggerUIPluginConfig.kt b/src/main/kotlin/io/github/smiley4/ktorswaggerui/SwaggerUIPluginConfig.kt
@@ -1,5 +1,10 @@
 package io.github.smiley4.ktorswaggerui
 
+import com.github.victools.jsonschema.generator.Option
+import com.github.victools.jsonschema.generator.OptionPreset
+import com.github.victools.jsonschema.generator.SchemaGeneratorConfigBuilder
+import com.github.victools.jsonschema.generator.SchemaVersion
+import com.github.victools.jsonschema.module.jackson.JacksonModule
 import io.github.smiley4.ktorswaggerui.dsl.CustomSchemas
 import io.github.smiley4.ktorswaggerui.dsl.OpenApiDslMarker
 import io.github.smiley4.ktorswaggerui.dsl.OpenApiInfo
@@ -142,4 +147,14 @@ class SwaggerUIPluginConfig {
 
     fun getCustomSchemas() = customSchemas
 
+    /**
+     * Customize or replace the configuration-builder for the json-schema-generator (see https://victools.github.io/jsonschema-generator/#generator-options for more information)
+     */
+    var schemaGeneratorConfigBuilder: SchemaGeneratorConfigBuilder = SchemaGeneratorConfigBuilder(SchemaVersion.DRAFT_2019_09, OptionPreset.PLAIN_JSON)
+        .with(JacksonModule())
+        .without(Option.DEFINITIONS_FOR_ALL_OBJECTS)
+        .with(Option.INLINE_ALL_SCHEMAS)
+        .with(Option.EXTRA_OPEN_API_FORMAT_VALUES)
+        .with(Option.ALLOF_CLEANUP_AT_THE_END)
+
 }
diff --git a/src/main/kotlin/io/github/smiley4/ktorswaggerui/specbuilder/OApiJsonSchemaBuilder.kt b/src/main/kotlin/io/github/smiley4/ktorswaggerui/specbuilder/OApiJsonSchemaBuilder.kt
@@ -2,12 +2,7 @@ package io.github.smiley4.ktorswaggerui.specbuilder
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.node.ObjectNode
-import com.github.victools.jsonschema.generator.Option
-import com.github.victools.jsonschema.generator.OptionPreset
 import com.github.victools.jsonschema.generator.SchemaGenerator
-import com.github.victools.jsonschema.generator.SchemaGeneratorConfigBuilder
-import com.github.victools.jsonschema.generator.SchemaVersion
-import com.github.victools.jsonschema.module.jackson.JacksonModule
 import io.github.smiley4.ktorswaggerui.SwaggerUIPluginConfig
 import io.swagger.v3.oas.models.media.Schema
 import java.lang.reflect.Type
@@ -69,18 +64,12 @@ class OApiJsonSchemaBuilder {
                 return ObjectMapper().readTree(jsonSchema) as ObjectNode
             }
         }
-        return generateJsonSchema(type)
+        return generateJsonSchema(type, config)
     }
 
-    private fun generateJsonSchema(type: Type): ObjectNode {
-        val config = SchemaGeneratorConfigBuilder(SchemaVersion.DRAFT_2019_09, OptionPreset.PLAIN_JSON)
-            .with(JacksonModule())
-            .without(Option.DEFINITIONS_FOR_ALL_OBJECTS)
-            .with(Option.INLINE_ALL_SCHEMAS)
-            .with(Option.EXTRA_OPEN_API_FORMAT_VALUES)
-            .with(Option.ALLOF_CLEANUP_AT_THE_END)
-            .build()
-        return SchemaGenerator(config).generateSchema(type)
+    private fun generateJsonSchema(type: Type, config: SwaggerUIPluginConfig): ObjectNode {
+        val generatorConfig = config.schemaGeneratorConfigBuilder.build()
+        return SchemaGenerator(generatorConfig).generateSchema(type)
     }
 
 }