Merge branch 'fix-bugs-auto-protected-detection-schema-kenerator' into release

Author: SMILEY4

examples/src/main/kotlin/io/github/smiley4/ktoropenapi/examples/KotlinxSerialization.kt

@@ -1,3 +1,5 @@
+@file:OptIn(ExperimentalSerializationApi::class)
+
 package io.github.smiley4.ktoropenapi.examples
 
 import io.github.smiley4.ktoropenapi.OpenApi
@@ -15,8 +17,10 @@ import io.ktor.server.netty.Netty
 import io.ktor.server.response.respondText
 import io.ktor.server.routing.route
 import io.ktor.server.routing.routing
+import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonNamingStrategy
 
 fun main() {
     embeddedServer(Netty, port = 8080, host = "localhost", module = Application::myModule).start(wait = true)
@@ -28,6 +32,7 @@ private fun Application.myModule() {
         prettyPrint = true
         encodeDefaults = true
         explicitNulls = false
+        namingStrategy = JsonNamingStrategy.SnakeCase
     }
 
     install(OpenApi) {

gradle.properties

@@ -2,7 +2,7 @@ kotlin.code.style=official
 
 # project id
 projectGroupId=io.github.smiley4
-projectVersion=5.0.0
+projectVersion=5.0.1
 
 # common publishing information
 projectBaseScmUrl=https://github.com/SMILEY4/
@@ -16,7 +16,7 @@ projectDeveloperUrl=https://github.com/SMILEY4
 versionKtor=3.1.1
 versionSwaggerUI=5.17.14
 versionSwaggerParser=2.1.24
-versionSchemaKenerator=2.1.0
+versionSchemaKenerator=2.1.1
 versionKotlinLogging=7.0.0
 versionKotest=5.8.0
 versionKotlinTest=2.0.21

ktor-openapi/src/main/kotlin/io/github/smiley4/ktoropenapi/builder/route/RouteCollector.kt

@@ -116,7 +116,6 @@ internal class RouteCollector {
     private fun isProtected(route: RoutingNode): Boolean {
         return when (route.selector) {
             is AuthenticationRouteSelector -> true
-            is TrailingSlashRouteSelector -> false
             is RootRouteSelector -> false
             is DocumentedRouteSelector -> route.parent?.let { isProtected(it) } ?: false
             is HttpMethodRouteSelector -> route.parent?.let { isProtected(it) } ?: false

ktor-openapi/src/main/kotlin/io/github/smiley4/ktoropenapi/config/SchemaGenerator.kt

@@ -16,6 +16,7 @@ import io.github.smiley4.schemakenerator.reflection.analyzer.TypeCategoryAnalyze
 import io.github.smiley4.schemakenerator.reflection.data.EnumConstType
 import io.github.smiley4.schemakenerator.serialization.SerializationSteps.addJsonClassDiscriminatorProperty
 import io.github.smiley4.schemakenerator.serialization.SerializationSteps.analyzeTypeUsingKotlinxSerialization
+import io.github.smiley4.schemakenerator.serialization.SerializationSteps.renameMembers
 import io.github.smiley4.schemakenerator.serialization.analyzer.KotlinxSerializationCustomProvider
 import io.github.smiley4.schemakenerator.serialization.analyzer.KotlinxSerializationTypeMatcher
 import io.github.smiley4.schemakenerator.serialization.analyzer.SerializationTypeAnalyzerModule
@@ -33,8 +34,10 @@ import io.github.smiley4.schemakenerator.swagger.data.RefType
 import io.github.smiley4.schemakenerator.swagger.data.TitleType
 import io.github.smiley4.schemakenerator.swagger.generator.SwaggerSchemaGenerationModule
 import io.swagger.v3.oas.models.media.Schema
+import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonNamingStrategy
 import kotlinx.serialization.modules.SerializersModule
 import kotlin.reflect.KClass
 import kotlin.reflect.KType
@@ -249,6 +252,7 @@ object SchemaGenerator {
     /**
      * A pre-built [GenericSchemaGenerator] using reflection to analyze types and generate the schemas
      */
+    @OptIn(ExperimentalSerializationApi::class)
     fun kotlinx(json: Json? = null, config: KotlinxSerializationConfig.() -> Unit = {}): GenericSchemaGenerator {
         val configInstance = KotlinxSerializationConfig()
             .apply { if (json != null) useKotlinxConfig(json) }
@@ -262,6 +266,10 @@ object SchemaGenerator {
                 }
                 .addJsonClassDiscriminatorProperty()
                 .handleNameAnnotation()
+                .let {
+                    if(configInstance.namingStrategy != null) it.renameMembers(configInstance.namingStrategy!!)
+                    else it
+                }
                 .generateSwaggerSchema {
                     optionals = configInstance.optionals
                     nullables = configInstance.nullables
@@ -285,6 +293,7 @@ object SchemaGenerator {
     /**
      * The configuration for a pre-built schema generator using kotlinx-serialization for type analysis.
      */
+    @OptIn(ExperimentalSerializationApi::class)
     class KotlinxSerializationConfig internal constructor() {
 
         /**
@@ -347,6 +356,11 @@ object SchemaGenerator {
         var explicitNullTypes: Boolean = true
 
 
+        /**
+         * The naming strategy used to rename members/properties. Set `null` to not do any additional renaming.
+         */
+        var namingStrategy: JsonNamingStrategy? = null
+
         /**
          * The format of the titles. Set `null` to not include titles in the schemas.
          */
@@ -447,6 +461,7 @@ object SchemaGenerator {
             serializersModule = json.serializersModule
             optionals = if (json.configuration.encodeDefaults) RequiredHandling.REQUIRED else RequiredHandling.NON_REQUIRED
             nullables = if (json.configuration.explicitNulls) RequiredHandling.REQUIRED else RequiredHandling.NON_REQUIRED
+            namingStrategy = json.configuration.namingStrategy
         }
 
     }