From 42e5f570771bff871ebb8e3d335f8ba934c56dc5 Mon Sep 17 00:00:00 2001 From: Yauhenikapl Date: Wed, 12 Jun 2024 12:11:52 +0300 Subject: [PATCH 1/2] Changes: - Update OpenAPI generator --- .../openapi/AspectModelOpenApiGenerator.java | 2 +- .../openapi/AspectModelOpenApiGeneratorTest.java | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) 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 65f2083f3..94e0c72d1 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 @@ -528,7 +528,7 @@ private ObjectNode getPathsNode( final Aspect aspect, final OpenApiSchemaGenerat final ObjectNode includeQueryPathNode = FACTORY.objectNode(); includeQueryPathNode.set( FIELD_POST, getRequestEndpointFilter( aspect, propertiesNode, config.baseUrl(), apiVersion, config.resourcePath() ) ); - endpointPathsNode.set( config.baseUrl() + String.format( QUERY_SERVER_PATH, apiVersion ) + finalResourcePath, + endpointPathsNode.set( String.format( QUERY_SERVER_PATH, apiVersion ) + finalResourcePath, includeQueryPathNode ); } 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 ecd7fdc01..dadcde72f 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 @@ -168,7 +168,7 @@ void testIncludeQueryApiWithSemanticVersion( final KnownVersion metaModelVersion final JsonNode json = apiJsonGenerator.apply( aspect, config ).getContent(); final SwaggerParseResult result = new OpenAPIParser().readContents( json.toString(), null, null ); final OpenAPI openApi = result.getOpenAPI(); - assertThat( openApi.getPaths().get( "https://test-aspect.example.com/query-api/v1.0.0/" + TEST_RESOURCE_PATH ).getPost().getServers() + assertThat( openApi.getPaths().get( "/query-api/v1.0.0/" + TEST_RESOURCE_PATH ).getPost().getServers() .get( 0 ).getUrl() ) .isEqualTo( "https://test-aspect.example.com/query-api/v1.0.0" ); } @@ -193,7 +193,7 @@ void testDefaultResourcePath( final KnownVersion metaModelVersion ) { assertThat( openApi.getPaths().get( apiEndpoint ).getPatch() ).isNull(); assertThat( openApi.getPaths().keySet() ).anyMatch( path -> path.equals( apiEndpoint ) ); assertThat( openApi.getPaths().keySet() ).anyMatch( - path -> path.equals( "https://test-aspect.example.com/query-api/v1.0.0" + apiEndpoint ) ); + path -> path.equals( "/query-api/v1.0.0" + apiEndpoint ) ); } @ParameterizedTest @@ -226,7 +226,7 @@ void testWithValidResourcePath( final KnownVersion metaModelVersion ) { assertThat( openApi.getPaths().keySet() ).anyMatch( path -> path.equals( "/" + TEST_RESOURCE_PATH ) ); assertThat( openApi.getPaths().keySet() ).anyMatch( - path -> path.equals( "https://test-aspect.example.com/query-api/v1.0.0/" + TEST_RESOURCE_PATH ) ); + path -> path.equals( "/query-api/v1.0.0/" + TEST_RESOURCE_PATH ) ); } @ParameterizedTest @@ -538,7 +538,7 @@ void testAspectWithAllCrud( final KnownVersion metaModelVersion ) { assertThat( openApi.getPaths().get( apiEndpoint ).getPut() ).isNotNull(); assertThat( openApi.getPaths().get( apiEndpoint ).getPatch() ).isNotNull(); assertThat( openApi.getPaths().keySet() ).anyMatch( - path -> path.equals( "https://test-aspect.example.com/query-api/v1.0.0" + apiEndpoint ) ); + path -> path.equals( "/query-api/v1.0.0" + apiEndpoint ) ); } @ParameterizedTest @@ -562,7 +562,7 @@ void testAspectWithPostOperation( final KnownVersion metaModelVersion ) { assertThat( openApi.getPaths().get( apiEndpoint ).getPut() ).isNull(); assertThat( openApi.getPaths().get( apiEndpoint ).getPatch() ).isNull(); assertThat( openApi.getPaths().keySet() ).anyMatch( - path -> path.equals( "https://test-aspect.example.com/query-api/v1.0.0" + apiEndpoint ) ); + path -> path.equals( "/query-api/v1.0.0" + apiEndpoint ) ); } @ParameterizedTest @@ -586,7 +586,7 @@ void testAspectWithPutOperation( final KnownVersion metaModelVersion ) { assertThat( openApi.getPaths().get( apiEndpoint ).getPut() ).isNotNull(); assertThat( openApi.getPaths().get( apiEndpoint ).getPatch() ).isNull(); assertThat( openApi.getPaths().keySet() ).anyMatch( - path -> path.equals( "https://test-aspect.example.com/query-api/v1.0.0" + apiEndpoint ) ); + path -> path.equals( "/query-api/v1.0.0" + apiEndpoint ) ); } @ParameterizedTest @@ -610,7 +610,7 @@ void testAspectWithPatchOperation( final KnownVersion metaModelVersion ) { assertThat( openApi.getPaths().get( apiEndpoint ).getPut() ).isNull(); assertThat( openApi.getPaths().get( apiEndpoint ).getPatch() ).isNotNull(); assertThat( openApi.getPaths().keySet() ).anyMatch( - path -> path.equals( "https://test-aspect.example.com/query-api/v1.0.0" + apiEndpoint ) ); + path -> path.equals( "/query-api/v1.0.0" + apiEndpoint ) ); } @ParameterizedTest @@ -635,7 +635,7 @@ void testAspectWithPatchAndPostOperation( final KnownVersion metaModelVersion ) assertThat( openApi.getPaths().get( apiEndpoint ).getPut() ).isNull(); assertThat( openApi.getPaths().get( apiEndpoint ).getPatch() ).isNotNull(); assertThat( openApi.getPaths().keySet() ).anyMatch( - path -> path.equals( "https://test-aspect.example.com/query-api/v1.0.0" + apiEndpoint ) ); + path -> path.equals( "/query-api/v1.0.0" + apiEndpoint ) ); } @ParameterizedTest From d8249ac691019437b528380a202bee34c6877315 Mon Sep 17 00:00:00 2001 From: Yauhenikapl Date: Wed, 12 Jun 2024 12:20:25 +0300 Subject: [PATCH 2/2] Changes: - lint --- .../generator/openapi/AspectModelOpenApiGenerator.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 e706e4f83..12edd8280 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 @@ -537,7 +537,8 @@ private ObjectNode getPathsNode( final Aspect aspect, final OpenApiSchemaGenerat if ( config.includeQueryApi() ) { final ObjectNode includeQueryPathNode = FACTORY.objectNode(); includeQueryPathNode.set( FIELD_POST, - getRequestEndpointFilter( aspect, propertiesNode, config.baseUrl(), apiVersion, config.resourcePath() ) ); + merge( getRequestEndpointFilter( aspect, propertiesNode, config.baseUrl(), apiVersion, config.resourcePath() ), + queriesTemplate, FIELD_POST ) ); endpointPathsNode.set( String.format( QUERY_SERVER_PATH, apiVersion ) + finalResourcePath, includeQueryPathNode ); }