Skip to content

Commit 57c060b

Browse files
committed
simpler bundle $ref keys
1 parent aad65c4 commit 57c060b

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

openapi-parser/src/main/java/io/openapiparser/OpenApiBundler.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -347,9 +347,9 @@ private String createRefPointer (String type, String refName) {
347347
private String toComponentKey(String refName) {
348348
// /component/*/key pattern does not allow '/{}'
349349
return refName
350-
.replace("/", "--")
351-
.replace('{', '-')
352-
.replace('}', '-');
350+
.replace("/", "_")
351+
.replace('{', '_')
352+
.replace('}', '_');
353353
}
354354

355355
private void walkSchema (Scope currentScope, Object value, JsonPointer location) {

openapi-parser/src/test/kotlin/io/openapiparser/OpenApiBundlerSpec.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -299,9 +299,9 @@ class OpenApiBundlerSpec : FreeSpec({
299299

300300
val ref = getObject(bundled, "/paths/~1foo")
301301
ref.size shouldBe 1
302-
ref[$$"$ref"].shouldBe("#/components/pathItems/--bundle-ref-path-item--foo.api.yaml")
302+
ref[$$"$ref"].shouldBe("#/components/pathItems/_bundle-ref-path-item_foo.api.yaml")
303303

304-
val component = getObject(bundled, "/components/pathItems/--bundle-ref-path-item--foo.api.yaml")
304+
val component = getObject(bundled, "/components/pathItems/_bundle-ref-path-item_foo.api.yaml")
305305
component.shouldNotBeNull()
306306
}
307307

@@ -347,12 +347,12 @@ class OpenApiBundlerSpec : FreeSpec({
347347

348348
val ref = getObject(bundled, "/paths/~1foo")
349349
ref.size shouldBe 1
350-
ref[$$"$ref"].shouldBe("#/components/pathItems/--bundle-ref-nested--foo.api.yaml")
350+
ref[$$"$ref"].shouldBe("#/components/pathItems/_bundle-ref-nested_foo.api.yaml")
351351

352-
val component = getObject(bundled, "/components/pathItems/--bundle-ref-nested--foo.api.yaml")
352+
val component = getObject(bundled, "/components/pathItems/_bundle-ref-nested_foo.api.yaml")
353353
component.shouldNotBeNull()
354354

355-
val barRef = getObject(bundled, "/components/pathItems/--bundle-ref-nested--foo.api.yaml/get/responses/200/content/application~1json/schema")
355+
val barRef = getObject(bundled, "/components/pathItems/_bundle-ref-nested_foo.api.yaml/get/responses/200/content/application~1json/schema")
356356
barRef[$$"$ref"].shouldBe("#/components/schemas/Bar")
357357
val barComponent = bundled.getRawValue(from("/components/schemas/Bar"))
358358
barComponent.shouldNotBeNull()

0 commit comments

Comments
 (0)