Merge branch 'main' into 756-fix-custom-resolver

Author: atextor

core/esmf-aspect-model-document-generators/src/main/java/org/eclipse/esmf/aspectmodel/generator/openapi/AspectModelPagingGenerator.java

@@ -134,7 +134,7 @@ private void setSchemaInformation( final Aspect aspect, final PagingOption pagin
       schemaNode.set( AspectModelOpenApiGenerator.FIELD_PAGING_SCHEMA, node );
 
       final ObjectNode itemNode = (ObjectNode) node.get( "properties" ).get( "items" );
-      itemNode.set( "items", FACTORY.objectNode().put( "$ref", "#/components/schemas/" + aspect.getName() ) );
+      itemNode.put( "$ref", "#/components/schemas/" + aspect.getName() );
    }
 
    private void validatePaging( final PagingOption definedPagingOption, final Set<PagingOption> possiblePagingOptions ) {

core/esmf-aspect-model-document-generators/src/test/java/org/eclipse/esmf/aspectmodel/generator/openapi/AspectModelOpenApiGeneratorTest.java

@@ -669,6 +669,42 @@ void testAspectWithCommentForSeeAttributes() {
             .isEqualTo( "See: http://example.com/" );
    }
 
+   @Test
+   void testPagingSchemaStructure() {
+      final Aspect aspect = TestResources.load( TestAspect.ASPECT_WITH_COLLECTION ).aspect();
+
+      final OpenApiSchemaGenerationConfig config = OpenApiSchemaGenerationConfigBuilder.builder()
+            .useSemanticVersion( true )
+            .baseUrl( TEST_BASE_URL )
+            .resourcePath( TEST_RESOURCE_PATH )
+            .locale( Locale.ENGLISH )
+            .build();
+
+      final JsonNode json = new AspectModelOpenApiGenerator( aspect, config ).getContent();
+      final SwaggerParseResult result = new OpenAPIParser().readContents( json.toString(), null, null );
+      final OpenAPI openApi = result.getOpenAPI();
+
+      Schema pagingSchema = openApi.getComponents().getSchemas().get( "PagingSchema" );
+      assertThat( pagingSchema ).isNotNull();
+
+      Schema itemsProperty = (Schema) pagingSchema.getProperties().get( "items" );
+      assertThat( itemsProperty.get$ref() )
+            .isEqualTo( "#/components/schemas/" + aspect.getName() );
+
+      assertThat( itemsProperty.getType() ).isNull();
+      assertThat( itemsProperty.getItems() ).isNull();
+
+      assertThat( pagingSchema.getProperties() ).containsKeys(
+            "totalItems",
+            "totalPages",
+            "pageSize",
+            "currentPage"
+      );
+
+      assertThat( openApi.getComponents().getSchemas().get( aspect.getName() ) )
+            .isNotNull();
+   }
+
    private void assertSpecificationIsValid( final JsonNode jsonNode, final String json, final Aspect aspect ) throws IOException {
       validateUnsupportedKeywords( jsonNode );