diff --git a/core/esmf-aspect-model-document-generators/src/main/java/org/eclipse/esmf/aspectmodel/generator/openapi/AspectModelOpenApiGenerator.java b/core/esmf-aspect-model-document-generators/src/main/java/org/eclipse/esmf/aspectmodel/generator/openapi/AspectModelOpenApiGenerator.java index 2350133c7..81534f4ab 100644 --- a/core/esmf-aspect-model-document-generators/src/main/java/org/eclipse/esmf/aspectmodel/generator/openapi/AspectModelOpenApiGenerator.java +++ b/core/esmf-aspect-model-document-generators/src/main/java/org/eclipse/esmf/aspectmodel/generator/openapi/AspectModelOpenApiGenerator.java @@ -423,7 +423,7 @@ private Optional getRequestEndpointOperations( final Aspect aspect, if ( !aspect.getOperations().isEmpty() ) { final ObjectNode objectNode = FACTORY.objectNode(); - setServers( objectNode, baseUrl, apiVersion, OPERATIONS_SERVER_PATH ); + setServers( objectNode, baseUrl, apiVersion, OPERATIONS_SERVER_PATH.formatted( apiVersion ) ); objectNode.set( "tags", FACTORY.arrayNode().add( aspect.getName() ) ); objectNode.put( FIELD_OPERATION_ID, FIELD_POST + FIELD_OPERATION + aspect.getName() ); objectNode.set( FIELD_PARAMETERS, getRequiredParameters( parameterNode, isEmpty( resourcePath ) ) ); diff --git a/core/esmf-aspect-model-document-generators/src/test/java/org/eclipse/esmf/aspectmodel/generator/openapi/AspectModelOpenApiGeneratorTest.java b/core/esmf-aspect-model-document-generators/src/test/java/org/eclipse/esmf/aspectmodel/generator/openapi/AspectModelOpenApiGeneratorTest.java index e382541de..c6cb3f0f1 100644 --- a/core/esmf-aspect-model-document-generators/src/test/java/org/eclipse/esmf/aspectmodel/generator/openapi/AspectModelOpenApiGeneratorTest.java +++ b/core/esmf-aspect-model-document-generators/src/test/java/org/eclipse/esmf/aspectmodel/generator/openapi/AspectModelOpenApiGeneratorTest.java @@ -524,6 +524,8 @@ void testAspectWithOperation() { final JsonNode json = new AspectModelOpenApiGenerator( aspect, config ).getContent(); final SwaggerParseResult result = new OpenAPIParser().readContents( json.toString(), null, null ); final OpenAPI openApi = result.getOpenAPI(); + assertThat( openApi.getPaths().get( "/" + TEST_RESOURCE_PATH + "/operations" ).getPost().getServers().getFirst() + .getUrl() ).isEqualTo( TEST_BASE_URL + "/rpc-api/v1.0.0" ); assertThat( openApi.getComponents().getSchemas() ).containsKey( "AspectWithOperation" ); assertThat( openApi.getComponents().getSchemas() ).containsKey( "Operation" ); assertThat( openApi.getComponents().getSchemas() ).containsKey( "OperationResponse" );