Correct getAllProperties method so it will generate runnable code

Author: DvSmi

core/sds-aspect-model-java-generator/src/main/resources/java-static-class-body-lib.vm

@@ -77,15 +77,16 @@ static {
 
     @Override
     public List<StaticProperty<?>> getAllProperties() {
-        #if( $element.getExtends().isPresent() )
-            #set( $extendedElement = $element.getExtends().get() )
-            $codeGenerationConfig.getImportTracker().importExplicit( "${codeGenerationConfig.getPackageName()}.Meta${extendedElement.getName()}" )
-            List<StaticProperty<?>> properties = getProperties();
-            properties.addAll(Meta${extendedElement.getName()}.INSTANCE.getAllProperties());
-            return properties;
-        #else
-            return getProperties();
-        #end
+    #if( $element.getExtends().isPresent() )
+        #set( $extendedElement = $element.getExtends().get() )
+        $codeGenerationConfig.getImportTracker().importExplicit( "java.util.stream.Stream" )
+        $codeGenerationConfig.getImportTracker().importExplicit( "java.util.stream.Collectors" )
+        $codeGenerationConfig.getImportTracker().importExplicit( "java.util.Collection" )
+        $codeGenerationConfig.getImportTracker().importExplicit( "${codeGenerationConfig.getPackageName()}.Meta${extendedElement.getName()}" )
+        return Stream.of( getProperties(), Meta${extendedElement.getName()}.INSTANCE.getAllProperties() ).flatMap( Collection::stream ).collect( Collectors.toList() );
+    #else
+        return getProperties();
+    #end
     }
 
 #if( !$element.getPreferredNames().isEmpty() )

core/sds-aspect-model-java-generator/src/test/java/io/openmanufacturing/sds/aspectmodel/java/StaticMetaModelJavaGeneratorTest.java

@@ -244,13 +244,9 @@ public void testGenerateStaticMetaModelWithExtendedEntity( final KnownVersion me
       final int expectedNumberOfParameters = 0;
       final List<String> getAllPropertiesWithoutExtended = List.of( "returngetProperties();" );
       final List<String> getPropertiesMetaTestEntity = List.of(
-            "List<StaticProperty<?>>properties=getProperties();",
-            "properties.addAll(MetaParentTestEntity.INSTANCE.getAllProperties());",
-            "returnproperties;" );
+            "returnStream.of(getProperties(),MetaParentTestEntity.INSTANCE.getAllProperties()).flatMap(Collection::stream).collect(Collectors.toList());" );
       final List<String> getPropertiesMetaParentTestEntity = List.of(
-            "List<StaticProperty<?>>properties=getProperties();",
-            "properties.addAll(MetaParentOfParentEntity.INSTANCE.getAllProperties());",
-            "returnproperties;" );
+            "returnStream.of(getProperties(),MetaParentOfParentEntity.INSTANCE.getAllProperties()).flatMap(Collection::stream).collect(Collectors.toList());" );
       result.assertMethodBody( "MetaAspectWithExtendedEntity", methodName, expectOverride, Optional.empty(), expectedNumberOfParameters,
             getAllPropertiesWithoutExtended );
       result.assertMethodBody( "MetaParentTestEntity", methodName, expectOverride, Optional.empty(), expectedNumberOfParameters,