Skip to content

Commit eeac69b

Browse files
haunerhauner
committed
clean up
1 parent 55604df commit eeac69b

11 files changed

Lines changed: 74 additions & 74 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
package io.openapiprocessor.core.parser.swagger
77

88
import io.openapiprocessor.core.openapi.Encoding
9-
import io.openapiprocessor.core.openapi.MediaType as ParserMediaType
9+
import io.openapiprocessor.core.openapi.MediaType as OpenApiMediaType
1010
import io.swagger.v3.oas.models.media.MediaType as SwaggerMediaType
1111

1212
/**
1313
* Swagger MediaType abstraction.
1414
*/
15-
class MediaType(val mediaType: SwaggerMediaType): ParserMediaType {
15+
class MediaType(val mediaType: SwaggerMediaType): OpenApiMediaType {
1616
override fun getSchema() = Schema(mediaType.schema)
1717

1818
override val encodings: Map<String, Encoding>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ package io.openapiprocessor.core.parser.swagger
77

88
import io.openapiprocessor.core.openapi.Schema
99
import io.openapiprocessor.core.openapi.Server
10-
import io.openapiprocessor.core.openapi.OpenApi as ParserOpenApi
11-
import io.openapiprocessor.core.openapi.Path as ParserPath
12-
import io.openapiprocessor.core.openapi.RefResolver as ParserRefResolver
10+
import io.openapiprocessor.core.openapi.OpenApi as OpenApiOpenApi
11+
import io.openapiprocessor.core.openapi.Path as OpenApiPath
12+
import io.openapiprocessor.core.openapi.RefResolver as OpenApiRefResolver
1313
import io.swagger.v3.oas.models.PathItem as SwaggerPath
1414
import io.swagger.v3.oas.models.media.Schema as SwaggerSchema
1515
import io.swagger.v3.parser.core.models.SwaggerParseResult
@@ -19,7 +19,7 @@ import org.slf4j.LoggerFactory
1919
/**
2020
* Swagger parser result.
2121
*/
22-
class OpenApi(private val result: SwaggerParseResult): ParserOpenApi {
22+
class OpenApi(private val result: SwaggerParseResult): OpenApiOpenApi {
2323
private val log: Logger = LoggerFactory.getLogger(this.javaClass.name)
2424

2525
override fun getServers(): List<Server> {
@@ -32,8 +32,8 @@ class OpenApi(private val result: SwaggerParseResult): ParserOpenApi {
3232
return servers
3333
}
3434

35-
override fun getPaths(): Map<String, ParserPath> {
36-
val paths = linkedMapOf<String, ParserPath>()
35+
override fun getPaths(): Map<String, OpenApiPath> {
36+
val paths = linkedMapOf<String, OpenApiPath>()
3737

3838
result.openAPI.paths.forEach { (name: String, value: SwaggerPath) ->
3939
paths[name] = Path(name, value, RefResolverNative(result.openAPI))
@@ -52,7 +52,7 @@ class OpenApi(private val result: SwaggerParseResult): ParserOpenApi {
5252
return schemas
5353
}
5454

55-
override fun getRefResolver(): ParserRefResolver = RefResolver (result.openAPI)
55+
override fun getRefResolver(): OpenApiRefResolver = RefResolver (result.openAPI)
5656

5757
override fun printWarnings() {
5858
result.messages?.forEach {

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,35 +5,35 @@
55

66
package io.openapiprocessor.core.parser.swagger
77

8-
import io.openapiprocessor.core.openapi.HttpMethod
9-
import io.openapiprocessor.core.openapi.Operation as ParserOperation
10-
import io.openapiprocessor.core.openapi.Parameter as ParserParameter
11-
import io.openapiprocessor.core.openapi.RequestBody as ParserRequestBody
12-
import io.openapiprocessor.core.openapi.Response as ParserResponse
8+
import java.net.URI
9+
import io.openapiprocessor.core.openapi.HttpMethod as OpenApiHttpMethod
10+
import io.openapiprocessor.core.openapi.Operation as OpenApiOperation
11+
import io.openapiprocessor.core.openapi.Parameter as OpenApiParameter
12+
import io.openapiprocessor.core.openapi.RequestBody as OpenApiRequestBody
13+
import io.openapiprocessor.core.openapi.Response as OpenApiResponse
1314
import io.swagger.v3.oas.models.Operation as SwaggerOperation
1415
import io.swagger.v3.oas.models.PathItem as SwaggerPath
1516
import io.swagger.v3.oas.models.parameters.Parameter as SwaggerParameter
1617
import io.swagger.v3.oas.models.responses.ApiResponse as SwaggerResponse
17-
import java.net.URI
1818

1919
/**
2020
* Swagger Operation abstraction.
2121
*/
2222
class Operation(
23-
private val method: HttpMethod,
23+
private val method: OpenApiHttpMethod,
2424
private val operation: SwaggerOperation,
2525
private val path: SwaggerPath,
2626
private val refResolver: RefResolverNative
27-
): ParserOperation {
27+
): OpenApiOperation {
2828

29-
override fun getMethod(): HttpMethod = method
29+
override fun getMethod(): OpenApiHttpMethod = method
3030

3131
override fun getOperationId(): String? {
3232
return operation.operationId
3333
}
3434

35-
override fun getParameters(): List<ParserParameter> {
36-
val parameters = mutableListOf<ParserParameter>()
35+
override fun getParameters(): List<OpenApiParameter> {
36+
val parameters = mutableListOf<OpenApiParameter>()
3737

3838
// the swagger parser moves the endpoint parameters to the operation level, sometimes.
3939
// Sometimes it does not. Check both lists.
@@ -48,7 +48,7 @@ class Operation(
4848
return parameters
4949
}
5050

51-
override fun getRequestBody(): ParserRequestBody? {
51+
override fun getRequestBody(): OpenApiRequestBody? {
5252
var requestBody = operation.requestBody
5353
if (requestBody == null) {
5454
return null
@@ -60,8 +60,8 @@ class Operation(
6060
return RequestBody (requestBody)
6161
}
6262

63-
override fun getResponses(): Map<String, ParserResponse> {
64-
val content = linkedMapOf<String, ParserResponse>()
63+
override fun getResponses(): Map<String, OpenApiResponse> {
64+
val content = linkedMapOf<String, OpenApiResponse>()
6565

6666
operation.responses.forEach { (key: String, value: SwaggerResponse) ->
6767
content[key] = Response(value)

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@
55

66
package io.openapiprocessor.core.parser.swagger
77

8-
import io.openapiprocessor.core.openapi.Parameter as ParserParameter
9-
import io.openapiprocessor.core.openapi.Schema as ParserSchema
8+
import io.openapiprocessor.core.openapi.Parameter as OpenApiParameter
9+
import io.openapiprocessor.core.openapi.Schema as OpenApiSchema
1010
import io.swagger.v3.oas.models.parameters.Parameter as SwaggerParameter
1111

1212
/**
1313
* Swagger Parameter abstraction.
1414
*/
15-
class Parameter(private val parameter: SwaggerParameter): ParserParameter {
15+
class Parameter(private val parameter: SwaggerParameter): OpenApiParameter {
1616

1717
override fun getIn(): String = parameter.`in`
1818

1919
override fun getName(): String = parameter.name
2020

21-
override fun getSchema(): ParserSchema = Schema (parameter.schema)
21+
override fun getSchema(): OpenApiSchema = Schema (parameter.schema)
2222

2323
override fun isRequired(): Boolean = if(parameter.required != null) {
2424
parameter.required

‎openapi-processor-core-parser-swagger/src/main/kotlin/io/openapiprocessor/core/parser/swagger/Parser.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
package io.openapiprocessor.core.parser.swagger
77

88
import io.openapiprocessor.core.parser.ParserException
9-
import io.openapiprocessor.core.parser.Parser as ApiParser
109
import io.swagger.v3.parser.OpenAPIV3Parser
1110
import io.swagger.v3.parser.core.models.ParseOptions
1211
import org.slf4j.Logger
1312
import org.slf4j.LoggerFactory
14-
import io.openapiprocessor.core.openapi.OpenApi as ParserOpenApi
13+
import io.openapiprocessor.core.openapi.OpenApi as OpenApiOpenApi
14+
import io.openapiprocessor.core.parser.Parser as ApiParser
1515

1616
const val SCHEME_RESOURCE = "resource:"
1717

@@ -23,7 +23,7 @@ open class Parser: ApiParser {
2323

2424
private enum class Source {URL, STRING}
2525

26-
override fun parse(apiPath: String): ParserOpenApi {
26+
override fun parse(apiPath: String): OpenApiOpenApi {
2727
try {
2828
return run(apiPath, Source.URL)
2929
} catch (ex: Exception) {
@@ -33,15 +33,15 @@ open class Parser: ApiParser {
3333
}
3434

3535
/** test only */
36-
fun parseString(api: String): ParserOpenApi {
36+
fun parseString(api: String): OpenApiOpenApi {
3737
try {
3838
return run(api, Source.STRING)
3939
} catch (ex: Exception) {
4040
throw ParserException(ex)
4141
}
4242
}
4343

44-
private fun run(api: String, source: Source): ParserOpenApi {
44+
private fun run(api: String, source: Source): OpenApiOpenApi {
4545
val opts = ParseOptions()
4646
// loads $refs to other files into #/components/schema and replaces the $refs to the
4747
// external files with $refs to #/components/schema.

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55

66
package io.openapiprocessor.core.parser.swagger
77

8-
import io.openapiprocessor.core.openapi.Path as ParserPath
9-
import io.openapiprocessor.core.openapi.HttpMethod
10-
import io.openapiprocessor.core.openapi.Operation as ParserOperation
11-
import io.swagger.v3.oas.models.PathItem as SwaggerPath
8+
import io.openapiprocessor.core.openapi.HttpMethod as OpenApiHttpMethod
9+
import io.openapiprocessor.core.openapi.Operation as OpenApiOperation
10+
import io.openapiprocessor.core.openapi.Path as OpenApiPath
1211
import io.swagger.v3.oas.models.Operation as SwaggerOperation
12+
import io.swagger.v3.oas.models.PathItem as SwaggerPath
1313

1414
/**
1515
* Swagger Path abstraction.
@@ -18,14 +18,14 @@ class Path(
1818
private val path: String,
1919
private val info: SwaggerPath,
2020
private val refResolver: RefResolverNative
21-
): ParserPath {
21+
): OpenApiPath {
2222

2323
override fun getPath(): String = path
2424

25-
override fun getOperations(): List<ParserOperation> {
26-
val ops: MutableList<ParserOperation> = mutableListOf()
25+
override fun getOperations(): List<OpenApiOperation> {
26+
val ops: MutableList<OpenApiOperation> = mutableListOf()
2727

28-
HttpMethod.values.forEach {
28+
OpenApiHttpMethod.values.forEach {
2929
val op = info.getOperation(it.method)
3030
if (op != null) {
3131
ops.add (Operation(it, op, info, refResolver))
@@ -39,14 +39,14 @@ class Path(
3939

4040
fun SwaggerPath.getOperation(method: String): SwaggerOperation? {
4141
return when(method) {
42-
HttpMethod.DELETE.method -> this.delete
43-
HttpMethod.GET.method -> this.get
44-
HttpMethod.HEAD.method -> this.head
45-
HttpMethod.OPTIONS.method -> this.options
46-
HttpMethod.PATCH.method -> this.patch
47-
HttpMethod.POST.method -> this.post
48-
HttpMethod.PUT.method -> this.put
49-
HttpMethod.TRACE.method -> this.trace
42+
OpenApiHttpMethod.DELETE.method -> this.delete
43+
OpenApiHttpMethod.GET.method -> this.get
44+
OpenApiHttpMethod.HEAD.method -> this.head
45+
OpenApiHttpMethod.OPTIONS.method -> this.options
46+
OpenApiHttpMethod.PATCH.method -> this.patch
47+
OpenApiHttpMethod.POST.method -> this.post
48+
OpenApiHttpMethod.PUT.method -> this.put
49+
OpenApiHttpMethod.TRACE.method -> this.trace
5050
else -> null
5151
}
5252
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,25 @@
66
package io.openapiprocessor.core.parser.swagger
77

88
import io.openapiprocessor.core.openapi.getRefName
9-
import io.openapiprocessor.core.openapi.NamedSchema as ParserNamedSchema
10-
import io.openapiprocessor.core.openapi.RefResolver as ParserRefResolver
11-
import io.openapiprocessor.core.openapi.Schema as ParserSchema
9+
import io.openapiprocessor.core.openapi.NamedSchema as OpenApiNamedSchema
10+
import io.openapiprocessor.core.openapi.RefResolver as OpenApiRefResolver
11+
import io.openapiprocessor.core.openapi.Schema as OpenApiSchema
1212
import io.swagger.v3.oas.models.media.Schema as SwaggerSchema
1313
import io.swagger.v3.oas.models.OpenAPI
1414

1515
/**
1616
* Swagger $ref resolver.
1717
*/
18-
class RefResolver(private val openapi: OpenAPI): ParserRefResolver {
18+
class RefResolver(private val openapi: OpenAPI): OpenApiRefResolver {
1919

20-
override fun resolve(ref: ParserSchema): ParserNamedSchema {
20+
override fun resolve(ref: OpenApiSchema): OpenApiNamedSchema {
2121
val refName = getRefName(ref.getRef()!!)
2222

2323
val schema: SwaggerSchema<*>? = openapi.components?.schemas?.get(refName)
2424
if (schema == null) {
2525
throw Exception("failed to resolve ${ref.getRef()}")
2626
}
2727

28-
return ParserNamedSchema(refName, Schema(schema))
28+
return OpenApiNamedSchema(refName, Schema(schema))
2929
}
3030
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
package io.openapiprocessor.core.parser.swagger
1818

19-
import io.openapiprocessor.core.openapi.MediaType as ParserMediaType
20-
import io.openapiprocessor.core.openapi.RequestBody as ParserRequestBody
19+
import io.openapiprocessor.core.openapi.MediaType as OpenApiMediaType
20+
import io.openapiprocessor.core.openapi.RequestBody as OpenApiRequestBody
2121
import io.swagger.v3.oas.models.media.MediaType as SwaggerMediaType
2222
import io.swagger.v3.oas.models.parameters.RequestBody as SwaggerRequestBody
2323

@@ -27,14 +27,14 @@ import io.swagger.v3.oas.models.parameters.RequestBody as SwaggerRequestBody
2727
* @author Martin Hauner
2828
*/
2929

30-
class RequestBody(private val requestBody: SwaggerRequestBody): ParserRequestBody {
30+
class RequestBody(private val requestBody: SwaggerRequestBody): OpenApiRequestBody {
3131

3232
override fun getRequired(): Boolean {
3333
return requestBody.required ?: false
3434
}
3535

36-
override fun getContent(): Map<String, ParserMediaType> {
37-
val content = linkedMapOf<String, ParserMediaType>()
36+
override fun getContent(): Map<String, OpenApiMediaType> {
37+
val content = linkedMapOf<String, OpenApiMediaType>()
3838
requestBody.content.forEach { (key: String, value: SwaggerMediaType) ->
3939
content[key] = MediaType(value)
4040
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55

66
package io.openapiprocessor.core.parser.swagger
77

8-
import io.openapiprocessor.core.openapi.MediaType as ParserMediaType
9-
import io.openapiprocessor.core.openapi.Response as ParserResponse
8+
import io.openapiprocessor.core.openapi.MediaType as OpenApiMediaType
9+
import io.openapiprocessor.core.openapi.Response as OpenApiResponse
1010
import io.swagger.v3.oas.models.media.MediaType as SwaggerMediaType
1111
import io.swagger.v3.oas.models.responses.ApiResponse as SwaggerResponse
1212

1313
/**
1414
* Swagger Response abstraction.
1515
*/
16-
class Response(private val response: SwaggerResponse): ParserResponse {
16+
class Response(private val response: SwaggerResponse): OpenApiResponse {
1717

18-
override fun getContent(): Map<String, ParserMediaType> {
19-
val content = linkedMapOf<String, ParserMediaType>()
18+
override fun getContent(): Map<String, OpenApiMediaType> {
19+
val content = linkedMapOf<String, OpenApiMediaType>()
2020
response.content?.forEach { (key: String, value: SwaggerMediaType) ->
2121
content[key] = MediaType(value)
2222
}

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ package io.openapiprocessor.core.parser.swagger
77

88
import io.swagger.v3.oas.models.SpecVersion
99
import java.net.URI
10-
import io.openapiprocessor.core.openapi.Schema as ParserSchema
10+
import io.openapiprocessor.core.openapi.Schema as OpenApiSchema
1111
import io.swagger.v3.oas.models.media.ComposedSchema as SwaggerComposedSchema
1212
import io.swagger.v3.oas.models.media.Schema as SwaggerSchema
1313

1414
/**
1515
* Swagger Schema abstraction.
1616
*/
17-
class Schema(private val schema: SwaggerSchema<*>): ParserSchema {
17+
class Schema(private val schema: SwaggerSchema<*>): OpenApiSchema {
1818

1919
override fun getType(): String? {
2020
if (itemsOf () != null) {
@@ -42,12 +42,12 @@ class Schema(private val schema: SwaggerSchema<*>): ParserSchema {
4242
return schema.enum
4343
}
4444

45-
override fun getItem(): ParserSchema {
45+
override fun getItem(): OpenApiSchema {
4646
return Schema(schema.items)
4747
}
4848

49-
override fun getProperties(): Map<String, ParserSchema> {
50-
val props = LinkedHashMap<String, ParserSchema> ()
49+
override fun getProperties(): Map<String, OpenApiSchema> {
50+
val props = LinkedHashMap<String, OpenApiSchema> ()
5151

5252
schema.properties?.forEach { (key: String, value: SwaggerSchema<Any>) ->
5353
props[key] = Schema (value)
@@ -56,7 +56,7 @@ class Schema(private val schema: SwaggerSchema<*>): ParserSchema {
5656
return props
5757
}
5858

59-
override fun getAdditionalProperties(): ParserSchema? {
59+
override fun getAdditionalProperties(): OpenApiSchema? {
6060
val additional = schema.additionalProperties
6161

6262
// null, boolean, schema
@@ -67,8 +67,8 @@ class Schema(private val schema: SwaggerSchema<*>): ParserSchema {
6767
return null
6868
}
6969

70-
override fun getItems(): List<ParserSchema> {
71-
val result: MutableList<ParserSchema> = mutableListOf()
70+
override fun getItems(): List<OpenApiSchema> {
71+
val result: MutableList<OpenApiSchema> = mutableListOf()
7272

7373
if(schema !is SwaggerComposedSchema) {
7474
return result

0 commit comments

Comments
 (0)