From 1999871337e4177953938b924798e5ad82f73949 Mon Sep 17 00:00:00 2001 From: Benjamin Confino Date: Tue, 4 Jun 2024 13:41:32 +0100 Subject: [PATCH] remove id from zepplin --- .../openapi/apps/airlines/resources/ZepplinResource.java | 3 --- .../microprofile/openapi/reader/MyOASModelReaderImpl.java | 6 +++--- .../eclipse/microprofile/openapi/tck/AirlinesAppTest.java | 6 +++--- .../microprofile/openapi/tck/ModelReaderAppTest.java | 8 ++++---- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/tck/src/main/java/org/eclipse/microprofile/openapi/apps/airlines/resources/ZepplinResource.java b/tck/src/main/java/org/eclipse/microprofile/openapi/apps/airlines/resources/ZepplinResource.java index f22bd54f..8c1afc72 100644 --- a/tck/src/main/java/org/eclipse/microprofile/openapi/apps/airlines/resources/ZepplinResource.java +++ b/tck/src/main/java/org/eclipse/microprofile/openapi/apps/airlines/resources/ZepplinResource.java @@ -37,7 +37,6 @@ public class ZepplinResource { @DELETE - @Path("{id}") @APIResponse(responseCode = "200", description = "Review deleted") @APIResponse(responseCode = "404", description = "Review not found") @Operation(summary = "Deprecate outdated airship technology", operationId = "deprecateZepplin") @@ -48,7 +47,6 @@ public Response deprecateZepplin(String string) { } @HEAD - @Path("{id}") @APIResponse(responseCode = "200", description = "Review deleted") @APIResponse(responseCode = "404", description = "Review not found") @Operation(summary = "Deprecate outdated airship technology", operationId = "deprecateZepplin") @@ -62,7 +60,6 @@ public Response headZepplin() { } @GET - @Path("{id}") @APIResponse(responseCode = "200", description = "Review deleted") @APIResponse(responseCode = "404", description = "Review not found") @Operation(summary = "Deprecate outdated airship technology", operationId = "deprecateZepplin") diff --git a/tck/src/main/java/org/eclipse/microprofile/openapi/reader/MyOASModelReaderImpl.java b/tck/src/main/java/org/eclipse/microprofile/openapi/reader/MyOASModelReaderImpl.java index e886cfbe..1dd3facf 100644 --- a/tck/src/main/java/org/eclipse/microprofile/openapi/reader/MyOASModelReaderImpl.java +++ b/tck/src/main/java/org/eclipse/microprofile/openapi/reader/MyOASModelReaderImpl.java @@ -280,13 +280,13 @@ public OpenAPI buildModel() { .description( "Indicates that the deletion event was processed successfully"))))) .paths(OASFactory.createObject(Paths.class) - .addPathItem("/zepplins/{id}", OASFactory.createObject(PathItem.class) + .addPathItem("/zepplins", OASFactory.createObject(PathItem.class) .HEAD(OASFactory.createObject(Operation.class) .requestBody(OASFactory.createRequestBody() - .ref("#/paths/~1zepplins~1{id}/delete/requestBody"))) + .ref("#/paths/~1zepplins/delete/requestBody"))) .GET(OASFactory.createObject(Operation.class) .requestBody(OASFactory.createRequestBody() - .ref("#/paths/~1zepplins~1{id}/delete/requestBody"))) + .ref("#/paths/~1zepplins/delete/requestBody"))) .DELETE(OASFactory.createObject(Operation.class) .requestBody(OASFactory.createRequestBody() .description("Something about a zepplin.") diff --git a/tck/src/main/java/org/eclipse/microprofile/openapi/tck/AirlinesAppTest.java b/tck/src/main/java/org/eclipse/microprofile/openapi/tck/AirlinesAppTest.java index 9781e1c3..7b238eb3 100644 --- a/tck/src/main/java/org/eclipse/microprofile/openapi/tck/AirlinesAppTest.java +++ b/tck/src/main/java/org/eclipse/microprofile/openapi/tck/AirlinesAppTest.java @@ -349,8 +349,8 @@ public void testParameter(String type) { } private void testParameterWithObjectAndStyle(ValidatableResponse vr) { - String headParameters = "paths.'/zepplins/{id}'.head.parameters"; - String getParameters = "paths.'/zepplins/{id}'.get.parameters"; + String headParameters = "paths.'/zepplins'.head.parameters"; + String getParameters = "paths.'/zepplins'.get.parameters"; vr.body(headParameters, hasSize(1)); vr.body(getParameters, hasSize(1)); @@ -565,7 +565,7 @@ public void testSecurityRequirement(String type) { hasEntry(equalTo("userApiKey"), empty()), hasEntry(equalTo("userBearerHttp"), empty())))); - vr.body("paths.'/zepplins/{id}'.delete.security[0].mutualTLSScheme[0]", equalTo("zepplinScope")); + vr.body("paths.'/zepplins'.delete.security[0].mutualTLSScheme[0]", equalTo("zepplinScope")); } @Test(dataProvider = "formatProvider") diff --git a/tck/src/main/java/org/eclipse/microprofile/openapi/tck/ModelReaderAppTest.java b/tck/src/main/java/org/eclipse/microprofile/openapi/tck/ModelReaderAppTest.java index ac60bc1d..ec2dd42f 100644 --- a/tck/src/main/java/org/eclipse/microprofile/openapi/tck/ModelReaderAppTest.java +++ b/tck/src/main/java/org/eclipse/microprofile/openapi/tck/ModelReaderAppTest.java @@ -373,10 +373,10 @@ public void testWebhooks(String type) { public void testRequestBodyInOperations(String type) { ValidatableResponse vr = callEndpoint(type); - vr.body("paths.'/zepplins/{id}'.delete.requestBody.description", equalTo("Something about a zepplin.")); - vr.body("paths.'/zepplins/{id}'.head.requestBody.$ref", equalTo("#/paths/~1zepplins~1{id}/delete/requestBody")); - vr.body("paths.'/zepplins/{id}'.get.requestBody.$ref", equalTo("#/paths/~1zepplins~1{id}/delete/requestBody")); + vr.body("paths.'/zepplins'.delete.requestBody.description", equalTo("Something about a zepplin.")); + vr.body("paths.'/zepplins'.head.requestBody.$ref", equalTo("#/paths/~1zepplins/delete/requestBody")); + vr.body("paths.'/zepplins'.get.requestBody.$ref", equalTo("#/paths/~1zepplins/delete/requestBody")); - vr.body("paths.'/zepplins/{id}'.delete.requestBody.content", notNullValue()); + vr.body("paths.'/zepplins'.delete.requestBody.content", notNullValue()); } }