fix

SMILEY4 · Oct 20, 2023 · 3fcde4a · 3fcde4a
1 parent 34eaf12
commit 3fcde4a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/src/test/kotlin/io/github/smiley4/ktorswaggerui/tests/openapi/OperationBuilderTest.kt b/src/test/kotlin/io/github/smiley4/ktorswaggerui/tests/openapi/OperationBuilderTest.kt
@@ -935,11 +935,12 @@ class OperationBuilderTest : StringSpec({
             routes: List<RouteMeta>,
             pluginConfig: PluginConfigDsl = defaultPluginConfig
         ): SchemaContext {
+            val pluginConfigData = pluginConfig.build(PluginConfigData.DEFAULT)
             return SchemaContextBuilder(
-                config = pluginConfig.build(PluginConfigData.DEFAULT),
+                config = pluginConfigData,
                 schemaBuilder = SchemaBuilder(
-                    definitionsField = pluginConfig.encodingConfig.schemaDefinitionsField,
-                    schemaEncoder = pluginConfig.encodingConfig.getSchemaEncoder(),
+                    definitionsField = pluginConfigData.encoding.schemaDefsField,
+                    schemaEncoder = pluginConfigData.encoding.schemaEncoder,
                     ObjectMapper(),
                     TypeOverwrites.get()
                 )

diff --git a/src/test/kotlin/io/github/smiley4/ktorswaggerui/tests/openapi/PathsBuilderTest.kt b/src/test/kotlin/io/github/smiley4/ktorswaggerui/tests/openapi/PathsBuilderTest.kt
@@ -92,11 +92,12 @@ class PathsBuilderTest : StringSpec({
         private val defaultPluginConfig = PluginConfigDsl()
 
         private fun schemaContext(routes: List<RouteMeta>, pluginConfig: PluginConfigDsl = defaultPluginConfig): SchemaContext {
+            val pluginConfigData = pluginConfig.build(PluginConfigData.DEFAULT)
             return SchemaContextBuilder(
-                config = pluginConfig.build(PluginConfigData.DEFAULT),
+                config = pluginConfigData,
                 schemaBuilder = SchemaBuilder(
-                    definitionsField = pluginConfig.encodingConfig.schemaDefinitionsField,
-                    schemaEncoder = pluginConfig.encodingConfig.getSchemaEncoder(),
+                    definitionsField = pluginConfigData.encoding.schemaDefsField,
+                    schemaEncoder = pluginConfigData.encoding.schemaEncoder,
                     ObjectMapper(),
                     TypeOverwrites.get()
                 )

diff --git a/src/test/kotlin/io/github/smiley4/ktorswaggerui/tests/schema/SchemaContextTest.kt b/src/test/kotlin/io/github/smiley4/ktorswaggerui/tests/schema/SchemaContextTest.kt
@@ -500,11 +500,12 @@ class SchemaContextTest : StringSpec({
             routes: Collection<RouteMeta>,
             pluginConfig: PluginConfigDsl = defaultPluginConfig
         ): SchemaContext {
+            val pluginConfigData = pluginConfig.build(PluginConfigData.DEFAULT)
             return SchemaContextBuilder(
-                config = pluginConfig.build(PluginConfigData.DEFAULT),
+                config = pluginConfigData,
                 schemaBuilder = SchemaBuilder(
-                    definitionsField = pluginConfig.encodingConfig.schemaDefinitionsField,
-                    schemaEncoder = pluginConfig.encodingConfig.getSchemaEncoder(),
+                    definitionsField = pluginConfigData.encoding.schemaDefsField,
+                    schemaEncoder = pluginConfigData.encoding.schemaEncoder,
                     ObjectMapper(),
                     TypeOverwrites.get()
                 )