Merge pull request #255 from bci-oss/#197_#254_Fix_and_test_AbstractProperty

[#254] [#197] Fix java code generation when an abstract entity contains only abstract properties

Author: atextor

core/sds-aspect-model-document-generators/src/test/java/io/openmanufacturing/sds/aspectmodel/generator/jsonschema/AspectModelJsonSchemaGeneratorTest.java

@@ -996,6 +996,28 @@ public void testAspectWithAbstractEntity( final KnownVersion metaModelVersion )
             .isEqualTo( "#/components/schemas/urn_bamm_io.openmanufacturing.test_1.0.0_ExtendingTestEntity" );
    }
 
+   /**
+    * Test to validate the json schema generated from the given aspect model containing an abstract property.
+    *
+    * @param metaModelVersion the used meta model version.
+    */
+   @ParameterizedTest
+   @MethodSource( value = "versionsStartingWith2_0_0" )
+   public void testAspectWithAbstractProperty( final KnownVersion metaModelVersion ) {
+      final Aspect aspect = loadAspect( TestAspect.ASPECT_WITH_ABSTRACT_PROPERTY, metaModelVersion );
+      final JsonNode schema = buildJsonSchema( aspect );
+
+      assertThat( schema.at( "/components/schemas/urn_bamm_io.openmanufacturing.test_1.0.0_ExtendingTestEntity/"
+            + "description" ).asText() )
+            .isEqualTo( "This is a test entity" );
+      assertThat( schema.at( "/components/schemas/urn_bamm_io.openmanufacturing.test_1.0.0_ExtendingTestEntity/"
+            + "properties/abstractTestProperty/description" ).asText() )
+            .isEqualTo( "This is an abstract test property" );
+      assertThat( schema.at( "/components/schemas/urn_bamm_io.openmanufacturing.test_1.0.0_ExtendingTestEntity/"
+            + "properties/abstractTestProperty/$ref" ).asText() )
+            .isEqualTo( "#/components/schemas/urn_bamm_io.openmanufacturing_characteristic_2.0.0_Text" );
+   }
+
    @ParameterizedTest
    @MethodSource( value = "versionsStartingWith2_0_0" )
    public void testAspectWithCollectionWithAbstractEntity( final KnownVersion metaModelVersion ) {

core/sds-aspect-model-java-generator/src/main/resources/java-pojo-equals-method-lib.vm

@@ -27,11 +27,16 @@ if (o == null || getClass() != o.getClass()) {
         }
     #end
 #end
-final $element.getName() that = ($element.getName())o;
-    return
-    #if( $element.getProperties().isEmpty() ) true
+
+    #if( $element.getProperties().isEmpty() ) return true
     #else
-        ${util.objectEqualsExpression( $element )}
+        #set( $objectEqualsExpression = $util.objectEqualsExpression( $element ) )
+        #if( $objectEqualsExpression && !$objectEqualsExpression.empty )
+            final $element.getName() that = ($element.getName())o;
+            return $objectEqualsExpression
+        #else
+            return true
+        #end
     #end;
 }
 #end

core/sds-aspect-model-serializer/src/test/java/io/openmanufacturing/sds/aspectmodel/serializer/RdfModelCreatorVisitorTest.java

@@ -56,7 +56,8 @@ public class RdfModelCreatorVisitorTest extends MetaModelVersions {
          "ASPECT_WITHOUT_PROPERTIES_AND_OPERATIONS",
          "ASPECT_WITH_ENUM_ONLY_ONE_SEE",
          "ASPECT_WITH_COLLECTION_WITH_ABSTRACT_ENTITY",
-         "ASPECT_WITH_ABSTRACT_SINGLE_ENTITY"
+         "ASPECT_WITH_ABSTRACT_SINGLE_ENTITY",
+         "ASPECT_WITH_ABSTRACT_PROPERTY"
    } )
    public void testRdfModelCreatorVisitor( final TestAspect aspect ) {
       testRdfCreation( aspect, KnownVersion.getLatest() );

core/sds-test-aspect-models/src/main/java/io/openmanufacturing/sds/test/TestAspect.java

@@ -21,6 +21,7 @@ public enum TestAspect implements TestModel {
    ASPECT_WITHOUT_PROPERTIES_AND_OPERATIONS,
    ASPECT_WITHOUT_SEE_ATTRIBUTE,
    ASPECT_WITH_ABSTRACT_ENTITY,
+   ASPECT_WITH_ABSTRACT_PROPERTY,
    ASPECT_WITH_ABSTRACT_SINGLE_ENTITY,
    ASPECT_WITH_ALL_BASE_ATTRIBUTES,
    ASPECT_WITH_BINARY,

core/sds-test-aspect-models/src/main/resources/valid/bamm_2_0_0/io.openmanufacturing.test/1.0.0/AspectWithAbstractProperty.ttl

@@ -0,0 +1,55 @@
+#
+# Copyright (c) 2022 Robert Bosch Manufacturing Solutions GmbH
+#
+# See the AUTHORS file(s) distributed with this work for additional
+# information regarding authorship.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+#
+# SPDX-License-Identifier: MPL-2.0
+#
+@prefix : <urn:bamm:io.openmanufacturing.test:1.0.0#> .
+@prefix bamm: <urn:bamm:io.openmanufacturing:meta-model:2.0.0#> .
+@prefix bamm-c: <urn:bamm:io.openmanufacturing:characteristic:2.0.0#> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+
+:AspectWithAbstractProperty a bamm:Aspect ;
+   bamm:preferredName "Test Aspect"@en ;
+   bamm:description "This is a test description"@en ;
+   bamm:see <http://example.com/omp> ;
+   bamm:properties ( :testProperty ) ;
+   bamm:operations ( ) .
+
+:testProperty a bamm:Property ;
+   bamm:preferredName "Test Property"@en ;
+   bamm:description "This is a test property."@en ;
+   bamm:see <http://example.com/omp> ;
+   bamm:see <http://example.com/me> ;
+   bamm:characteristic :EntityCharacteristic .
+
+:EntityCharacteristic a bamm-c:SingleEntity ;
+   bamm:preferredName "Test Entity Characteristic"@en ;
+   bamm:description "This is a test entity"@en ;
+   bamm:see <http://example.com/omp> ;
+   bamm:dataType :ExtendingTestEntity .
+
+:AbstractTestEntity a bamm:AbstractEntity ;
+   bamm:preferredName "Abstract Test Entity"@en ;
+   bamm:description "This is a abstract test entity"@en ;
+   bamm:properties ( :abstractTestProperty ).
+
+:abstractTestProperty a bamm:AbstractProperty ;
+   bamm:description "This is an abstract test property"@en .
+
+:ExtendingTestEntity a bamm:Entity ;
+   bamm:extends :AbstractTestEntity ;
+   bamm:preferredName "Test Entity"@en ;
+   bamm:description "This is a test entity"@en ;
+   bamm:properties (
+     [ bamm:extends :abstractTestProperty ; bamm:characteristic bamm-c:Text ]
+   ) .
+
+
+