move to schema-kenerator 0.2.0

SMILEY4 · May 20, 2024 · 54c8c3a · 54c8c3a
1 parent 11b2934
commit 54c8c3a
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 11 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@ kotlin.code.style=official
 # project id
 projectGroupId=io.github.smiley4
 projectArtifactIdBase=ktor-swagger-ui
-projectVersion=3.0.0-beta1
+projectVersion=3.0.0-beta2
 
 # publishing information
 projectNameBase=Ktor Swagger UI
@@ -19,7 +19,7 @@ projectDeveloperUrl=https://github.com/SMILEY4
 versionKtor=2.3.11
 versionSwaggerUI=5.9.0
 versionSwaggerParser=2.1.19
-versionSchemaKenerator=0.1.1
+versionSchemaKenerator=0.2.0
 versionKotlinLogging=3.0.5
 versionKotest=5.8.0
 versionKotlinTest=1.8.21

diff --git a/...er-ui/src/main/kotlin/io/github/smiley4/ktorswaggerui/builder/schema/SchemaContextImpl.kt b/...er-ui/src/main/kotlin/io/github/smiley4/ktorswaggerui/builder/schema/SchemaContextImpl.kt
@@ -28,7 +28,7 @@ class SchemaContextImpl(private val schemaConfig: SchemaConfigData) : SchemaCont
             val schema = collapseRootRef(generateSchema(typeDescriptor))
             componentSchemas[schemaId] = schema.swagger
             schema.componentSchemas.forEach { (k, v) ->
-                componentSchemas[k.full()] = v
+                componentSchemas[k] = v
             }
         }
     }
@@ -37,7 +37,7 @@ class SchemaContextImpl(private val schemaConfig: SchemaConfigData) : SchemaCont
         if (schema.swagger.`$ref` == null) {
             return schema
         } else {
-            val referencedSchemaId = TypeId.parse(schema.swagger.`$ref`!!.replace("#/components/schemas/", ""))
+            val referencedSchemaId = schema.swagger.`$ref`!!.replace("#/components/schemas/", "")
             val referencedSchema = schema.componentSchemas[referencedSchemaId]!!
             return CompiledSwaggerSchema(
                 typeData = schema.typeData,
@@ -54,7 +54,7 @@ class SchemaContextImpl(private val schemaConfig: SchemaConfigData) : SchemaCont
             val schema = generateSchema(typeDescriptor)
             rootSchemas[typeDescriptor] = schema.swagger
             schema.componentSchemas.forEach { (k, v) ->
-                componentSchemas[k.full()] = v
+                componentSchemas[k] = v
             }
         }
     }

diff --git a/ktor-swagger-ui/src/main/kotlin/io/github/smiley4/ktorswaggerui/data/ExampleDescriptor.kt b/ktor-swagger-ui/src/main/kotlin/io/github/smiley4/ktorswaggerui/data/ExampleDescriptor.kt
@@ -16,5 +16,3 @@ class ValueExampleDescriptor(
 class RefExampleDescriptor(name: String, val refName: String) : ExampleDescriptor(name)
 
 class SwaggerExampleDescriptor(name: String, val example: Example) : ExampleDescriptor(name)
-
-
diff --git a/ktor-swagger-ui/src/main/kotlin/io/github/smiley4/ktorswaggerui/data/TypeDescriptor.kt b/ktor-swagger-ui/src/main/kotlin/io/github/smiley4/ktorswaggerui/data/TypeDescriptor.kt
@@ -27,7 +27,9 @@ fun anyOf(vararg types: TypeDescriptor) = AnyOfTypeDescriptor(types.toList())
 fun anyOf(types: Collection<TypeDescriptor>) = AnyOfTypeDescriptor(types.toList())
 
 fun anyOf(vararg types: Schema<*>) = AnyOfTypeDescriptor(types.map { SwaggerTypeDescriptor(it) })
+@JvmName("anyOfSwagger")
 fun anyOf(types: Collection<Schema<*>>) = AnyOfTypeDescriptor(types.map { SwaggerTypeDescriptor(it) })
 
 fun anyOf(vararg types: KType) = AnyOfTypeDescriptor(types.map { KTypeDescriptor(it) })
+@JvmName("anyOfKType")
 fun anyOf(types: Collection<KType>) = AnyOfTypeDescriptor(types.map { KTypeDescriptor(it) })
diff --git a/...i/src/main/kotlin/io/github/smiley4/ktorswaggerui/dsl/routes/ValueExampleDescriptorDsl.kt b/...i/src/main/kotlin/io/github/smiley4/ktorswaggerui/dsl/routes/ValueExampleDescriptorDsl.kt
@@ -19,4 +19,4 @@ class ValueExampleDescriptorDsl {
      */
     var description: String? = null
 
-}
+}
diff --git a/todo.txt b/todo.txt
@@ -1,9 +1,10 @@
 todo:
 
-- keep up to date with schema-kenerator
+- keep up to date with schema-kenerator features
 - simplify dsl for schemas (TypeDescriptors) ✅
     - utility methods for adding different TypeDescriptors ✅
     - dsl for array, anyof, ref, empty, ... ✅
 - simplify dsl for examples (ExampleDescriptors) ✅
-- add rootHostPath to operations (see 2.10.0)
-- post build hook (?)
+- add rootHostPath to operations (see 2.10.0) (is this required? -> see servers)
+- post build hook (check if already exists?)
+- wiki / documentation
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,5 +16,3 @@ class ValueExampleDescriptor(
		class RefExampleDescriptor(name: String, val refName: String) : ExampleDescriptor(name)

		class SwaggerExampleDescriptor(name: String, val example: Example) : ExampleDescriptor(name)
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,4 +19,4 @@ class ValueExampleDescriptorDsl { @@
          */
         var description: String? = null
-    }
+    }