Fixed bug in ComplexType in case an ComplexType is extended, and the extension itself is extended furthermore, the properties were not gathered correctly.

DvSmi · DvSmi · commit 8a2e7ef270c1 · 2022-08-04T09:22:29.000+02:00
diff --git a/core/sds-aspect-meta-model-java/src/main/java/io/openmanufacturing/sds/metamodel/ComplexType.java b/core/sds-aspect-meta-model-java/src/main/java/io/openmanufacturing/sds/metamodel/ComplexType.java
@@ -20,7 +20,7 @@ default boolean isAbstractEntity() {
     */
    default List<Property> getAllProperties() {
       if ( getExtends().isPresent() ) {
-         return Stream.of( getProperties(), getExtends().get().getProperties() ).flatMap( Collection::stream ).collect( Collectors.toList() );
+         return Stream.of( getProperties(), getExtends().get().getAllProperties() ).flatMap( Collection::stream ).collect( Collectors.toList() );
       }
       return List.copyOf( getProperties() );
    }

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ default boolean isAbstractEntity() {`
`20`	`20`	`*/`
`21`	`21`	`default List<Property> getAllProperties() {`
`22`	`22`	`if ( getExtends().isPresent() ) {`
`23`		`- return Stream.of( getProperties(), getExtends().get().getProperties() ).flatMap( Collection::stream ).collect( Collectors.toList() );`
	`23`	`+ return Stream.of( getProperties(), getExtends().get().getAllProperties() ).flatMap( Collection::stream ).collect( Collectors.toList() );`
`24`	`24`	`}`
`25`	`25`	`return List.copyOf( getProperties() );`
`26`	`26`	`}`