clean up

Author: hauner

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/parser/openapi/v31/MediaType.kt

@@ -7,12 +7,12 @@ package io.openapiprocessor.core.parser.openapi.v31
 
 import io.openapiprocessor.core.openapi.Encoding
 import io.openapiparser.model.v31.MediaType as MediaType31
-import io.openapiprocessor.core.openapi.MediaType as ParserMediaType
+import io.openapiprocessor.core.openapi.MediaType as OpenApiMediaType
 
 /**
  * openapi-parser MediaType abstraction.
  */
-class MediaType(val mediaType: MediaType31): ParserMediaType {
+class MediaType(val mediaType: MediaType31): OpenApiMediaType {
     override fun getSchema() = Schema(mediaType.schema!!)
 
     override val encodings: Map<String, Encoding>

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/parser/openapi/v31/OpenApi.kt

@@ -5,22 +5,22 @@
 
 package io.openapiprocessor.core.parser.openapi.v31
 
+import io.openapiprocessor.core.openapi.Path
+import io.openapiprocessor.core.openapi.Schema
+import io.openapiprocessor.core.openapi.Server
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
 import io.openapiparser.model.v31.OpenApi as OpenApi31
 import io.openapiparser.model.v31.PathItem as PathItem31
 import io.openapiparser.model.v31.Schema as Schema31
-import io.openapiprocessor.core.openapi.Schema
-import io.openapiprocessor.core.openapi.Server
-import io.openapiprocessor.core.openapi.Path
-import io.openapiprocessor.core.openapi.OpenApi as ParserOpenApi
-import io.openapiprocessor.core.openapi.RefResolver as ParserRefResolver
+import io.openapiprocessor.core.openapi.OpenApi as OpenApiOpenApi
+import io.openapiprocessor.core.openapi.RefResolver as OpenApiRefResolver
 import io.openapiprocessor.core.parser.openapi.v31.Path as ParserPath31
 import io.openapiprocessor.core.parser.openapi.v31.Schema as ParserSchema31
-import org.slf4j.Logger
-import org.slf4j.LoggerFactory
 
 class OpenApi(
     private val api: OpenApi31
-) : ParserOpenApi {
+) : OpenApiOpenApi {
     private val log: Logger = LoggerFactory.getLogger(this.javaClass.name)
 
     override fun getServers(): List<Server> {
@@ -57,7 +57,7 @@ class OpenApi(
         return schemas
     }
 
-    override fun getRefResolver(): ParserRefResolver = RefResolver(api)
+    override fun getRefResolver(): OpenApiRefResolver = RefResolver(api)
 
     override fun printWarnings() {
         // unused

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/parser/openapi/v31/Operation.kt

@@ -11,10 +11,10 @@ import io.openapiparser.model.v31.Operation as Operation31
 import io.openapiparser.model.v31.Parameter as Parameter31
 import io.openapiparser.model.v31.PathItem as Path31
 import io.openapiparser.model.v31.Response as Response31
-import io.openapiprocessor.core.openapi.Operation as ParserOperation
-import io.openapiprocessor.core.openapi.Parameter as ParserParameter
-import io.openapiprocessor.core.openapi.RequestBody as ParserRequestBody
-import io.openapiprocessor.core.openapi.Response as ParserResponse
+import io.openapiprocessor.core.openapi.Operation as OpenApiOperation
+import io.openapiprocessor.core.openapi.Parameter as OpenApiParameter
+import io.openapiprocessor.core.openapi.RequestBody as OpenApiRequestBody
+import io.openapiprocessor.core.openapi.Response as OpenApiResponse
 
 /**
  * openapi-parser Operation abstraction.
@@ -23,16 +23,16 @@ class Operation(
     private val method: HttpMethod,
     private val operation: Operation31,
     private val path: Path31,
-): ParserOperation {
+): OpenApiOperation {
 
     override fun getMethod(): HttpMethod = method
 
     override fun getOperationId(): String? {
         return operation.operationId
     }
 
-    override fun getParameters(): List<ParserParameter> {
-        val parameters = mutableListOf<ParserParameter>()
+    override fun getParameters(): List<OpenApiParameter> {
+        val parameters = mutableListOf<OpenApiParameter>()
 
         path.parameters.map { p: Parameter31 ->
             var param = p
@@ -55,7 +55,7 @@ class Operation(
         return parameters
     }
 
-    override fun getRequestBody(): ParserRequestBody? {
+    override fun getRequestBody(): OpenApiRequestBody? {
         var requestBody = operation.requestBody
         if (requestBody == null) {
             return null
@@ -67,8 +67,8 @@ class Operation(
         return RequestBody(requestBody)
     }
 
-    override fun getResponses(): Map<String, ParserResponse> {
-        val content = linkedMapOf<String, ParserResponse>()
+    override fun getResponses(): Map<String, OpenApiResponse> {
+        val content = linkedMapOf<String, OpenApiResponse>()
 
         operation.responses?.responses?.forEach { (key: String, value: Response31) ->
             content[key] = Response(value)

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/parser/openapi/v31/Parameter.kt

@@ -6,19 +6,19 @@
 package io.openapiprocessor.core.parser.openapi.v31
 
 import io.openapiparser.model.v31.Parameter as Parameter31
-import io.openapiprocessor.core.openapi.Parameter as ParserParameter
-import io.openapiprocessor.core.openapi.Schema as ParserSchema
+import io.openapiprocessor.core.openapi.Parameter as OpenApiParameter
+import io.openapiprocessor.core.openapi.Schema as OpenApiSchema
 
 /**
  * openapi-parser Parameter abstraction.
  */
-class Parameter(private val parameter: Parameter31): ParserParameter {
+class Parameter(private val parameter: Parameter31): OpenApiParameter {
 
     override fun getIn(): String = parameter.`in`
 
     override fun getName(): String = parameter.name
 
-    override fun getSchema(): ParserSchema = Schema (parameter.schema!!)
+    override fun getSchema(): OpenApiSchema = Schema (parameter.schema!!)
 
     override fun isRequired(): Boolean = parameter.required
 

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/parser/openapi/v31/Path.kt

@@ -6,28 +6,28 @@
 package io.openapiprocessor.core.parser.openapi.v31
 
 import io.openapiparser.model.v31.PathItem
-import io.openapiprocessor.core.openapi.HttpMethod
-import io.openapiprocessor.core.openapi.Operation as ParserOperation
-import io.openapiprocessor.core.openapi.Path as ParserPath
+import io.openapiprocessor.core.openapi.HttpMethod as OpenApiHttpMethod
+import io.openapiprocessor.core.openapi.Operation as OpenApiOperation
+import io.openapiprocessor.core.openapi.Path as OpenApiPath
 
 /**
  * openapi.parser Path abstraction.
  */
 class Path(
     private val path: String,
     private val info: PathItem
-) : ParserPath {
+) : OpenApiPath {
 
     override fun getPath(): String = path
 
-    override fun getOperations(): List<ParserOperation> {
+    override fun getOperations(): List<OpenApiOperation> {
         var pathItem = info
         if (info.isRef) {
             pathItem = info.refObject
         }
 
         return pathItem
             .operations
-            .map { Operation(HttpMethod.valueOf(it.key.uppercase()), it.value, pathItem) }
+            .map { Operation(OpenApiHttpMethod.valueOf(it.key.uppercase()), it.value, pathItem) }
     }
 }

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/parser/openapi/v31/RefResolver.kt

@@ -7,17 +7,17 @@ package io.openapiprocessor.core.parser.openapi.v31
 
 import io.openapiprocessor.core.openapi.NamedSchema
 import io.openapiprocessor.core.openapi.getRefName
-import io.openapiprocessor.core.openapi.RefResolver as ParserRefResolver
-import io.openapiprocessor.core.openapi.Schema as ParserSchema
 import io.openapiparser.model.v31.OpenApi as OpenApi31
 import io.openapiparser.model.v31.Schema as Schema31
+import io.openapiprocessor.core.openapi.RefResolver as OpenApiRefResolver
+import io.openapiprocessor.core.openapi.Schema as OpenApiSchema
 
 /**
  * openapi-parser $ref resolver.
  */
-class RefResolver(private val api: OpenApi31): ParserRefResolver {
+class RefResolver(private val api: OpenApi31): OpenApiRefResolver {
 
-    override fun resolve(ref: ParserSchema): NamedSchema {
+    override fun resolve(ref: OpenApiSchema): NamedSchema {
         val schema: Schema31 = (ref as Schema).schema
         return NamedSchema(getRefName(ref.getRef()!!), Schema(schema.refObject))
     }

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/parser/openapi/v31/RequestBody.kt

@@ -7,20 +7,20 @@ package io.openapiprocessor.core.parser.openapi.v31
 
 import io.openapiparser.model.v31.MediaType as MediaType31
 import io.openapiparser.model.v31.RequestBody as RequestBody31
-import io.openapiprocessor.core.openapi.MediaType as ParserMediaType
-import io.openapiprocessor.core.openapi.RequestBody as ParserRequestBody
+import io.openapiprocessor.core.openapi.MediaType as OpenApiMediaType
+import io.openapiprocessor.core.openapi.RequestBody as OpenApiRequestBody
 
 /**
  * openapi-parser RequestBody abstraction.
  */
-class RequestBody(private val requestBody: RequestBody31): ParserRequestBody {
+class RequestBody(private val requestBody: RequestBody31): OpenApiRequestBody {
 
     override fun getRequired(): Boolean {
         return requestBody.required
     }
 
-    override fun getContent(): Map<String, ParserMediaType> {
-        val content = linkedMapOf<String, ParserMediaType>()
+    override fun getContent(): Map<String, OpenApiMediaType> {
+        val content = linkedMapOf<String, OpenApiMediaType>()
         requestBody.content.forEach { (key: String, entry: MediaType31) ->
             content[key] = MediaType(entry)
         }

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

@@ -7,22 +7,22 @@ package io.openapiprocessor.core.parser.openapi.v31
 
 import io.openapiparser.model.v31.MediaType as MediaType31
 import io.openapiparser.model.v31.Response as Response31
-import io.openapiprocessor.core.openapi.MediaType as ParserMediaType
-import io.openapiprocessor.core.openapi.Response as ParserResponse
+import io.openapiprocessor.core.openapi.MediaType as OpenApiMediaType
+import io.openapiprocessor.core.openapi.Response as OpenApiResponse
 
 /**
  * openapi-parser Response abstraction.
  */
-class Response(private val response: Response31): ParserResponse {
+class Response(private val response: Response31): OpenApiResponse {
 
-    override fun getContent(): Map<String, ParserMediaType> {
+    override fun getContent(): Map<String, OpenApiMediaType> {
         val responseContent = if(response.isRef) {
             response.refObject.content
         } else {
             response.content
         }
 
-        val content = linkedMapOf<String, ParserMediaType>()
+        val content = linkedMapOf<String, OpenApiMediaType>()
         responseContent.forEach { (key: String, entry: MediaType31) ->
             content[key] = MediaType(entry)
         }

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/parser/openapi/v31/Schema.kt

@@ -7,12 +7,12 @@ package io.openapiprocessor.core.parser.openapi.v31
 
 import java.net.URI
 import io.openapiparser.model.v31.Schema as Schema31
-import io.openapiprocessor.core.openapi.Schema as ParserSchema
+import io.openapiprocessor.core.openapi.Schema as OpenApiSchema
 
 /**
  * openapi-parser Schema abstraction.
  */
-class Schema(val schema: Schema31) : ParserSchema {
+class Schema(val schema: Schema31) : OpenApiSchema {
 
     override fun getType(): String? {
         if (itemsOf () != null) {  // check ??
@@ -61,10 +61,10 @@ class Schema(val schema: Schema31) : ParserSchema {
         return values!!.toList()
     }
 
-    override fun getItem(): ParserSchema = Schema(schema.items!!)
+    override fun getItem(): OpenApiSchema = Schema(schema.items!!)
 
-    override fun getProperties(): Map<String, ParserSchema> {
-        val props = LinkedHashMap<String, ParserSchema> ()
+    override fun getProperties(): Map<String, OpenApiSchema> {
+        val props = LinkedHashMap<String, OpenApiSchema> ()
 
         schema.properties.forEach { (key: String, entry: Schema31) ->
             props[key] = Schema (entry)
@@ -84,8 +84,8 @@ class Schema(val schema: Schema31) : ParserSchema {
         return null;
     }
 
-    override fun getItems(): List<ParserSchema> {
-        val result: MutableList<ParserSchema> = mutableListOf()
+    override fun getItems(): List<OpenApiSchema> {
+        val result: MutableList<OpenApiSchema> = mutableListOf()
 
         schema.allOf.forEach {
             result.add(Schema(it))

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/parser/openapi/v31/Server.kt

@@ -8,9 +8,9 @@ package io.openapiprocessor.core.parser.openapi.v31
 import io.github.stduritemplate.StdUriTemplate
 import java.net.URI
 import io.openapiparser.model.v31.Server as Server31
-import io.openapiprocessor.core.openapi.Server as ParserServer
+import io.openapiprocessor.core.openapi.Server as OpenApiServer
 
-class Server(private val server: Server31): ParserServer {
+class Server(private val server: Server31): OpenApiServer {
 
     override fun getUri(): URI {
         val variables = mutableMapOf<String, Any>()