Skip to content

Commit 07b1c96

Browse files
committed
remove duplication (#291)
1 parent 7191311 commit 07b1c96

4 files changed

Lines changed: 4 additions & 38 deletions

File tree

  • openapi-processor-core-parser-openapi4j/src/main/kotlin/io/openapiprocessor/core/parser/openapi4j
  • openapi-processor-core-parser-swagger/src/main/kotlin/io/openapiprocessor/core/parser/swagger
  • openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/parser/openapi

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package io.openapiprocessor.core.parser.openapi4j
77

88
import io.openapiprocessor.core.parser.NamedSchema
9+
import io.openapiprocessor.core.parser.getRefName
910
import io.openapiprocessor.core.parser.RefResolver as ParserRefResolver
1011
import io.openapiprocessor.core.parser.Schema as ParserSchema
1112
import org.openapi4j.parser.model.v3.OpenApi3 as O4jOpenApi
@@ -25,14 +26,4 @@ class RefResolver(private val api: O4jOpenApi): ParserRefResolver {
2526

2627
return NamedSchema (refName, Schema(resolved))
2728
}
28-
29-
private fun getRefName(ref: String): String? {
30-
val split = ref.split('#')
31-
if (split.size > 1) {
32-
val hash = split[1]
33-
return hash.substring(hash.lastIndexOf('/') + 1)
34-
}
35-
return null
36-
}
37-
3829
}

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

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

8+
import io.openapiprocessor.core.parser.getRefName
89
import io.openapiprocessor.core.parser.NamedSchema as ParserNamedSchema
910
import io.openapiprocessor.core.parser.RefResolver as ParserRefResolver
1011
import io.openapiprocessor.core.parser.Schema as ParserSchema
@@ -26,14 +27,4 @@ class RefResolver(private val openapi: OpenAPI): ParserRefResolver {
2627

2728
return ParserNamedSchema(refName, Schema(schema))
2829
}
29-
30-
private fun getRefName(ref: String): String? {
31-
val split = ref.split('#')
32-
if (split.size > 1) {
33-
val hash = split[1]
34-
return hash.substring(hash.lastIndexOf('/') + 1)
35-
}
36-
return null
37-
}
38-
3930
}

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package io.openapiprocessor.core.parser.openapi.v30
77

88
import io.openapiprocessor.core.parser.NamedSchema
9+
import io.openapiprocessor.core.parser.getRefName
910
import io.openapiprocessor.core.parser.RefResolver as ParserRefResolver
1011
import io.openapiprocessor.core.parser.Schema as ParserSchema
1112
import io.openapiparser.model.v30.OpenApi as OpenApi30
@@ -20,13 +21,4 @@ class RefResolver(private val api: OpenApi30): ParserRefResolver {
2021
val schema: Schema30 = (ref as Schema).schema
2122
return NamedSchema(getRefName(ref.getRef()!!), Schema(schema.refObject))
2223
}
23-
24-
private fun getRefName(ref: String): String? {
25-
val split = ref.split('#')
26-
if (split.size > 1) {
27-
val hash = split[1]
28-
return hash.substring(hash.lastIndexOf('/') + 1)
29-
}
30-
return null
31-
}
3224
}

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package io.openapiprocessor.core.parser.openapi.v31
77

88
import io.openapiprocessor.core.parser.NamedSchema
9+
import io.openapiprocessor.core.parser.getRefName
910
import io.openapiprocessor.core.parser.RefResolver as ParserRefResolver
1011
import io.openapiprocessor.core.parser.Schema as ParserSchema
1112
import io.openapiparser.model.v31.OpenApi as OpenApi31
@@ -20,13 +21,4 @@ class RefResolver(private val api: OpenApi31): ParserRefResolver {
2021
val schema: Schema31 = (ref as Schema).schema
2122
return NamedSchema(getRefName(ref.getRef()!!), Schema(schema.refObject))
2223
}
23-
24-
private fun getRefName(ref: String): String? {
25-
val split = ref.split('#')
26-
if (split.size > 1) {
27-
val hash = split[1]
28-
return hash.substring(hash.lastIndexOf('/') + 1)
29-
}
30-
return null
31-
}
3224
}

0 commit comments

Comments
 (0)