Merge pull request #799 from bci-oss/769-take-payload-names-into-account

Set `IdShort` for element when `PayloadName` is present and add corresponding test

Author: atextor

core/esmf-aspect-model-aas-generator/src/main/java/org/eclipse/esmf/aspectmodel/aas/AspectModelAasVisitor.java

@@ -285,6 +285,10 @@ private Optional<SubmodelElement> mapText( final Property property, final Contex
       final SubmodelElement element = context.getPropertyResult();
       element.setSupplementalSemanticIds( updateGlobalReferenceWithSeeReferences( element, property ) );
 
+      if ( !property.getPayloadName().isEmpty() ) {
+         element.setIdShort( property.getPayloadName() );
+      }
+
       recursiveProperty.remove( property );
 
       return Optional.of( element );

core/esmf-aspect-model-aas-generator/src/test/java/org/eclipse/esmf/aspectmodel/aas/AspectModelAasGeneratorTest.java

@@ -360,7 +360,7 @@ void testGenerateAasxFromAspectModelWithEnumeration() throws DeserializationExce
    @EnumSource( value = TestAspect.class )
    // anonymous enumeration in test has no urn for enum values but is required for Concept
    // Description referencing
-   public void testGeneration( final TestAspect testAspect ) throws DeserializationException {
+   void testGeneration( final TestAspect testAspect ) throws DeserializationException {
       final String aasXmlString = aspectToAasXml( testAspect );
       final byte[] aasXmlInput = aasXmlString.getBytes();
 
@@ -424,6 +424,15 @@ void testGeneratedAasxFromAspectModelSemanticIdsAreGlobalReferences() throws Des
       assertThat( property.getSemanticId().getKeys().get( 0 ).getType() ).isEqualTo( KeyTypes.GLOBAL_REFERENCE );
    }
 
+   @Test
+   void testAspectWithPayloadName() throws DeserializationException {
+      final Environment environment = getAssetAdministrationShellFromAspect( TestAspect.ASPECT_WITH_PROPERTY_WITH_PAYLOAD_NAME );
+
+      final Property property = (Property) environment.getSubmodels().get( 0 ).getSubmodelElements().get( 0 );
+      assertThat( environment.getSubmodels().get( 0 ).getSubmodelElements() ).hasSize( 1 );
+      assertThat( environment.getSubmodels().get( 0 ).getSubmodelElements().get( 0 ).getIdShort() ).isEqualTo( property.getIdShort() );
+   }
+
    private void checkDataSpecificationIec61360( final Set<String> semanticIds, final Environment env ) {
       semanticIds.forEach( semanticId -> getDataSpecificationIec61360( semanticId, env ) );
    }