improve types

Author: hauner

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/ApiConverter.kt

@@ -26,6 +26,8 @@ import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import io.openapiprocessor.core.model.RequestBody as ModelRequestBody
 import io.openapiprocessor.core.model.Response as ModelResponse
+import io.openapiprocessor.core.model.HttpStatus as ModelHttpStatus
+import io.openapiprocessor.core.model.ContentType as ModelContentType
 import io.openapiprocessor.core.model.parameters.Parameter as ModelParameter
 
 const val MULTIPART = "multipart/"
@@ -218,8 +220,8 @@ class  ApiConverter(
         return RequestBodies(bodies, params)
     }
 
-    private fun collectResponses(responses: Map<HttpStatus, Response>, ctx: ApiConverterContext): Map<String, List<ModelResponse>> {
-        val resultResponses: MutableMap<String, List<ModelResponse>>  = mutableMapOf()
+    private fun collectResponses(responses: Map<HttpStatus, Response>, ctx: ApiConverterContext): Map<ModelHttpStatus, List<ModelResponse>> {
+        val resultResponses: MutableMap<HttpStatus, List<ModelResponse>>  = mutableMapOf()
         val contentTypeInterfaces = collectContentTypeInterfaces(responses, ctx)
 
         responses.forEach { (httpStatus, httpResponse) ->
@@ -235,7 +237,7 @@ class  ApiConverter(
     }
 
     private fun collectContentTypeInterfaces(responses: Map<HttpStatus, Response>, ctx: ApiConverterContext)
-    : Map<ContentType, ContentTypeInterface> {
+    : Map<ModelContentType, ContentTypeInterface> {
         if (!options.responseInterface) {
             return emptyMap()
         }
@@ -249,7 +251,7 @@ class  ApiConverter(
         // Unfortunately we have to calculate the result data types to achieve this because it is currently not possible
         // to detect this from the parsed OpenAPI.
 
-        val checkResponses: MutableMap<String, List<ModelResponse>> = mutableMapOf()
+        val checkResponses: MutableMap<ModelHttpStatus, List<ModelResponse>> = mutableMapOf()
 
         val checkDataTypes = ctx.dataTypes.copy()
         responses.forEach { (httpStatus, httpResponse) ->

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/model/Endpoint.kt

@@ -18,7 +18,7 @@ class Endpoint(
     val method: HttpMethod,
     val parameters: List<Parameter>,
     val requestBodies: List<RequestBody>,
-    val responses: Map<String, List<Response>>,
+    val responses: Map<HttpStatus, List<Response>>,
     val operationId: String? = null,
     val deprecated: Boolean = false,
     private val documentation: Documentation? = null
@@ -145,8 +145,8 @@ class Endpoint(
         }
     }
 
-    private fun getSuccessResponses(): MutableMap<String, MutableList<Response>> {
-        val result = mutableMapOf<String, MutableList<Response>>()
+    private fun getSuccessResponses(): MutableMap<ContentType, MutableList<Response>> {
+        val result = mutableMapOf<ContentType, MutableList<Response>>()
 
         // prefer responses with content type.
         filterSuccessResponses()

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/model/Response.kt

@@ -11,7 +11,7 @@ import io.openapiprocessor.core.model.datatypes.DataType
  * Endpoint response properties.
  */
 open class Response(
-    val contentType: String,
+    val contentType: ContentType,
     val responseType: DataType,
     val description: String? = null
 ) {

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/model/Types.kt

@@ -0,0 +1,9 @@
+/*
+ * Copyright 2025 https://github.com/openapi-processor/openapi-processor-base
+ * PDX-License-Identifier: Apache-2.0
+ */
+
+package io.openapiprocessor.core.model
+
+typealias HttpStatus = String
+typealias ContentType = String