refactor: rename common to openapi

Author: jerrevanveluw

…/kotlinx/openapi/bindings/CommonModel.kt …kotlinx/openapi/bindings/OpenAPIModel.ktsrc/commonMain/kotlin/community/flock/kotlinx/openapi/bindings/CommonModel.kt renamed to src/commonMain/kotlin/community/flock/kotlinx/openapi/bindings/OpenAPIModel.kt src/commonMain/kotlin/community/flock/kotlinx/openapi/bindings/CommonModel.kt renamed to src/commonMain/kotlin/community/flock/kotlinx/openapi/bindings/OpenAPIModel.kt

@@ -20,23 +20,7 @@ sealed interface ExampleOrReference
 sealed interface RequestBodyOrReference
 sealed interface SecuritySchemeOrReference
 
-@JvmInline
-@Serializable
-value class Ref(val value: String)
-
-@JvmInline
-@Serializable
-value class MediaType(val value: String)
-
-@JvmInline
-@Serializable
-value class StatusCode(val value: String)
-
-@JvmInline
-@Serializable
-value class Path(val value: String)
-
-sealed interface CommonModel {
+sealed interface OpenAPIModel {
     val info: InfoObject
     val paths: Map<Path, PathItem>
     val security: List<Map<String, List<String>>>?
@@ -45,17 +29,6 @@ sealed interface CommonModel {
     val xProperties: Map<String, JsonElement>?
 }
 
-@Serializable
-data class InfoObject(
-    val title: String,
-    val description: String? = null,
-    val termsOfService: String? = null,
-    val contact: ContactObject? = null,
-    val license: LicenseObject? = null,
-    val version: String,
-    val xProperties: Map<String, JsonElement>? = null,
-)
-
 sealed interface PathItem {
     val parameters: List<ParameterOrReference>?
     val ref: String?
@@ -73,20 +46,6 @@ sealed interface PathItem {
     val xProperties: Map<String, JsonElement>?
 }
 
-@Serializable
-data class Server(
-    val url: String,
-    val description: String? = null,
-    val variables: Map<String, ServerVariableObject>? = null,
-)
-
-@Serializable
-data class ServerVariableObject(
-    val enum: List<JsonPrimitive>? = null,
-    val default: JsonElement? = null,
-    val description: String? = null,
-)
-
 sealed interface Operation {
     val parameters: List<ParameterOrReference>?
     val requestBody: RequestBodyOrReference?
@@ -197,6 +156,47 @@ sealed interface Reference {
     val ref: Ref
 }
 
+@Serializable
+data class InfoObject(
+    val title: String,
+    val description: String? = null,
+    val termsOfService: String? = null,
+    val contact: ContactObject? = null,
+    val license: LicenseObject? = null,
+    val version: String,
+    val xProperties: Map<String, JsonElement>? = null,
+)
+
+@JvmInline
+@Serializable
+value class Ref(val value: String)
+
+@JvmInline
+@Serializable
+value class MediaType(val value: String)
+
+@JvmInline
+@Serializable
+value class StatusCode(val value: String)
+
+@JvmInline
+@Serializable
+value class Path(val value: String)
+
+@Serializable
+data class Server(
+    val url: String,
+    val description: String? = null,
+    val variables: Map<String, ServerVariableObject>? = null,
+)
+
+@Serializable
+data class ServerVariableObject(
+    val enum: List<JsonPrimitive>? = null,
+    val default: JsonElement? = null,
+    val description: String? = null,
+)
+
 @Serializable
 data class TagObject(
     val name: String,

…/openapi/bindings/CommonSpecification.kt …openapi/bindings/OpenAPISpecification.ktsrc/commonMain/kotlin/community/flock/kotlinx/openapi/bindings/CommonSpecification.kt renamed to src/commonMain/kotlin/community/flock/kotlinx/openapi/bindings/OpenAPISpecification.kt src/commonMain/kotlin/community/flock/kotlinx/openapi/bindings/CommonSpecification.kt renamed to src/commonMain/kotlin/community/flock/kotlinx/openapi/bindings/OpenAPISpecification.kt

@@ -23,7 +23,7 @@ private val regex = """
    \|paths\|[^\|]*\|[^\|]*\|x-[^\|]*\|$
 """.trimIndent().split("\n").map { it.toRegex() }
 
-sealed interface CommonSpecification {
+sealed interface OpenAPISpecification {
 
     fun JsonObject.decode(version: Version): JsonElement = validate(version)
         .traverse { path, obj -> obj.encodeExtensions(path) }

src/commonMain/kotlin/community/flock/kotlinx/openapi/bindings/OpenAPIV2.kt

@@ -10,7 +10,7 @@ import kotlinx.serialization.json.encodeToJsonElement
 
 open class OpenAPIV2(
     val json: Json = Json { prettyPrint = true },
-) : CommonSpecification {
+) : OpenAPISpecification {
     fun decodeFromString(string: String): OpenAPIV2Model = json
         .decodeFromString<JsonObject>(string)
         .decode(V2)

src/commonMain/kotlin/community/flock/kotlinx/openapi/bindings/OpenAPIV2Model.kt

@@ -122,7 +122,7 @@ data class OpenAPIV2Model(
     override val tags: List<TagObject>? = null,
     override val externalDocs: ExternalDocumentation? = null,
     override val xProperties: Map<String, JsonElement>? = null,
-) : CommonModel
+) : OpenAPIModel
 
 @Serializable
 data class OpenAPIV2PathItem(

src/commonMain/kotlin/community/flock/kotlinx/openapi/bindings/OpenAPIV3.kt

@@ -10,7 +10,7 @@ import kotlinx.serialization.json.encodeToJsonElement
 
 open class OpenAPIV3(
     val json: Json = Json { prettyPrint = true },
-) : CommonSpecification {
+) : OpenAPISpecification {
 
     fun decodeFromJsonString(string: String): OpenAPIV3Model = json
         .decodeFromString<JsonObject>(string)

src/commonMain/kotlin/community/flock/kotlinx/openapi/bindings/OpenAPIV3Model.kt

@@ -125,7 +125,7 @@ data class OpenAPIV3Model(
     override val tags: List<TagObject>? = null,
     override val externalDocs: ExternalDocumentation? = null,
     override val xProperties: Map<String, JsonElement>? = null,
-) : CommonModel
+) : OpenAPIModel
 
 @Serializable
 data class OpenAPIV3PathItem(