From 5e7b87eec949a47405f03a62c41809f03f68eda9 Mon Sep 17 00:00:00 2001 From: dblock Date: Thu, 11 Jan 2024 16:37:53 -0500 Subject: [PATCH] Use {variable} syntax. Signed-off-by: dblock --- .../src/yamlRestTest/resources/rest-api-spec/test/20_api.yml | 4 ++-- server/src/main/java/org/opensearch/rest/RestController.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/api/src/yamlRestTest/resources/rest-api-spec/test/20_api.yml b/plugins/api/src/yamlRestTest/resources/rest-api-spec/test/20_api.yml index 72f31250b86bb..b63c79418395f 100644 --- a/plugins/api/src/yamlRestTest/resources/rest-api-spec/test/20_api.yml +++ b/plugins/api/src/yamlRestTest/resources/rest-api-spec/test/20_api.yml @@ -8,5 +8,5 @@ - match: { paths./_plugins/api.get: {} } - - match: { paths./:index/_upgrade.post: {} } - - match: { paths./:index/_upgrade.get: {} } + - match: { "paths./{index}/_upgrade.post": {} } + - match: { "paths./{index}/_upgrade.get": {} } diff --git a/server/src/main/java/org/opensearch/rest/RestController.java b/server/src/main/java/org/opensearch/rest/RestController.java index 1ddf2417baafd..22c765da1a56f 100644 --- a/server/src/main/java/org/opensearch/rest/RestController.java +++ b/server/src/main/java/org/opensearch/rest/RestController.java @@ -581,7 +581,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws while (all.hasNext()) { MethodHandlers handlers = all.next(); - builder.startObject(handlers.getPath().replace("{", ":").replace("}", "")); + builder.startObject(handlers.getPath()); for (RestRequest.Method method : handlers.getValidMethods()) { builder.startObject(method.name().toLowerCase(Locale.ROOT)) // .field("summary", "")