improve endpoint creation

Author: hauner

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

@@ -133,22 +133,21 @@ class  ApiConverter(
 
             val parameters = collectParameters(operation, ctx)
             val requestBodies = collectRequestBodies(operation, ctx)
+            val responses = collectResponses (operation, ctx)
 
             val ep = Endpoint(
                 path,
                 operation.getMethod(),
                 parameters + requestBodies.parameters,
                 requestBodies.bodies,
+                responses,
                 operation.getOperationId(),
                 operation.isDeprecated(),
                 Documentation(
                     summary = operation.summary,
                     description = operation.description
-                )
-            )
+                ))
 
-            collectResponses (operation.getResponses(), ep, dataTypes, resolver)
-            ep.initEndpointResponses ()
             checkSuccessResponse(ep)
             ep
         } catch (e: UnknownDataTypeException) {
@@ -216,17 +215,20 @@ class  ApiConverter(
         return RequestBodies(bodies, params)
     }
 
-    private fun collectResponses(responses: Map<String, Response>, ep: Endpoint, dataTypes: DataTypes, resolver: RefResolver) {
-        responses.forEach { (httpStatus, httpResponse) ->
+    private fun collectResponses(operation: Operation, ctx: ConverterContext): Map<String, List<ModelResponse>> {
+        val responses: MutableMap<String, List<ModelResponse>>  = mutableMapOf()
+
+        operation.getResponses().forEach { (httpStatus, httpResponse) ->
             val results = createResponses(
-                ep,
+                operation,
                 httpStatus,
                 httpResponse,
-                dataTypes,
-                resolver)
+                ctx)
 
-            ep.addResponses (httpStatus, results)
+            responses[httpStatus] = results
         }
+
+        return responses
     }
 
     private fun createParameter(op: Operation, parameter: Parameter, ctx: ConverterContext): ModelParameter {
@@ -327,11 +329,14 @@ class  ApiConverter(
         return parameters
     }
 
-    private fun createResponses(ep: Endpoint, httpStatus: String, response: Response, dataTypes: DataTypes, resolver: RefResolver): List<ModelResponse> {
+    private fun createResponses(operation: Operation, httpStatus: String, response: Response, ctx: ConverterContext): List<ModelResponse> {
         if (response.getContent().isEmpty()) {
             val info = SchemaInfo (
-                SchemaInfo.Endpoint(ep.path, ep.method),
-                "", "", nullSchema, resolver)
+                SchemaInfo.Endpoint(ctx.path, operation.getMethod()),
+                "",
+                "",
+                nullSchema,
+                ctx.resolver)
 
             val dataType = NoneDataType()
             val singleDataType = singleDataTypeWrapper.wrap (dataType, info)
@@ -345,13 +350,13 @@ class  ApiConverter(
             val schema = mediaType.getSchema()
 
             val info = SchemaInfo (
-                SchemaInfo.Endpoint(ep.path, ep.method),
-                getInlineResponseName (ep.path, ep.method, httpStatus),
+                SchemaInfo.Endpoint(ctx.path, operation.getMethod()),
+                getInlineResponseName (ctx.path, operation.getMethod(), httpStatus),
                 contentType,
                 schema,
-                resolver)
+                ctx.resolver)
 
-            val dataType = convertDataType(info, dataTypes)
+            val dataType = convertDataType(info, ctx.dataTypes)
             val changedType = if (!info.isArray ()) { // todo fails if ref
                 singleDataTypeWrapper.wrap(dataType, info)
             } else {

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

@@ -18,27 +18,13 @@ class Endpoint(
     val method: HttpMethod,
     val parameters: List<Parameter>,
     val requestBodies: List<RequestBody>,
+    val responses: Map<String, List<Response>>,
     val operationId: String? = null,
     val deprecated: Boolean = false,
     private val documentation: Documentation? = null
 ) {
-    // todo
-    private /*val*/ var responses: MutableMap<String, List<Response>>  = mutableMapOf()
-
     // grouped responses
-    lateinit var endpointResponses: List<EndpointResponse>// = emptyList()
-
-    // todo move to constructor
-    fun addResponses(httpStatus: String, statusResponses: List<Response>) {
-        responses[httpStatus] = statusResponses
-    }
-
-    // todo move addResponse() to constructor then run this from constructor
-    // fluent
-    fun initEndpointResponses (): Endpoint {
-        endpointResponses = createEndpointResponses ()
-        return this
-    }
+    val endpointResponses: List<EndpointResponse> = createEndpointResponses()
 
     // hmmm
     fun getRequestBody(): RequestBody {
@@ -199,5 +185,4 @@ class Endpoint(
     private fun isSuccessCode(code: String) = code.startsWith("2")
 
     private fun hasContentType(response: Response) = response.contentType != "?"
-
 }

openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/builder/api/EndpointBuilder.kt

@@ -60,21 +60,15 @@ class EndpointBuilder(
     }
 
     fun build(): Endpoint {
-        val ep = Endpoint(
+        return Endpoint(
             path,
             method,
             parameters,
             bodies,
+            responses,
             operationId = operationId,
             deprecated = deprecated,
             documentation = Documentation(summary, description)
         )
-
-        responses.forEach  { (k, v) ->
-            ep.addResponses(k, v)
-        }
-
-        return ep.initEndpointResponses()
     }
-
 }