Merge pull request #591 from bci-oss/590-update-generated-http-path-i…

…n-openapi Changes:
eclipse-esmf · Jun 12, 2024 · 8f1d533 · 8f1d533
2 parents b9f5458 + d8249ac
commit 8f1d533
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/...main/java/org/eclipse/esmf/aspectmodel/generator/openapi/AspectModelOpenApiGenerator.java b/...main/java/org/eclipse/esmf/aspectmodel/generator/openapi/AspectModelOpenApiGenerator.java
@@ -539,7 +539,7 @@ private ObjectNode getPathsNode( final Aspect aspect, final OpenApiSchemaGenerat
          includeQueryPathNode.set( FIELD_POST,
                merge( getRequestEndpointFilter( aspect, propertiesNode, config.baseUrl(), apiVersion, config.resourcePath() ),
                      queriesTemplate, FIELD_POST ) );
-         endpointPathsNode.set( config.baseUrl() + String.format( QUERY_SERVER_PATH, apiVersion ) + finalResourcePath,
+         endpointPathsNode.set( String.format( QUERY_SERVER_PATH, apiVersion ) + finalResourcePath,
                includeQueryPathNode );
       }
 

diff --git a/.../java/org/eclipse/esmf/aspectmodel/generator/openapi/AspectModelOpenApiGeneratorTest.java b/.../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
@@ -549,7 +549,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
@@ -573,7 +573,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
@@ -597,7 +597,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
@@ -621,7 +621,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
@@ -646,7 +646,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