bugfix: SAMM-CLI aas generation: ConceptDescription idShort based on …

…property name Changes: - Provide id_short of Property name to ConceptDescription; - Provide Property displayName to ConceptDescription; - Fix tests. Fixes eclipse-esmf#457
bci-oss · Nov 24, 2023 · 4be18c6 · 4be18c6
1 parent ae63e63
commit 4be18c6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/...l-aas-generator/src/main/java/org/eclipse/esmf/aspectmodel/aas/AspectModelAASVisitor.java b/...l-aas-generator/src/main/java/org/eclipse/esmf/aspectmodel/aas/AspectModelAASVisitor.java
@@ -358,13 +358,12 @@ private void createConceptDescription( final Property property, final Context co
       if ( property.getCharacteristic().isEmpty() ) {
          return;
       }
-      final Characteristic characteristic = property.getCharacteristic().get();
       // check if the concept description is already created. If not create a new one.
       if ( !context.hasEnvironmentConceptDescription( property.getAspectModelUrn().toString() ) ) {
          final ConceptDescription conceptDescription =
                new DefaultConceptDescription.Builder()
-                     .idShort( characteristic.getName() )
-                     .displayName( LangStringMapper.NAME.map( characteristic.getPreferredNames() ) )
+                     .idShort( property.getName() )
+                     .displayName( LangStringMapper.NAME.map( property.getPreferredNames() ) )
                      .embeddedDataSpecifications( extractEmbeddedDataSpecification( property ) )
                      .id( DEFAULT_MAPPER.determineIdentifierFor( property ) )
                      .build();

diff --git a/...generator/src/test/java/org/eclipse/esmf/aspectmodel/aas/AspectModelAASGeneratorTest.java b/...generator/src/test/java/org/eclipse/esmf/aspectmodel/aas/AspectModelAASGeneratorTest.java
@@ -290,7 +290,7 @@ void testGenerateAasxFromAspectModelWithEnumeration() throws IOException, Deseri
       assertEquals( 2, env.getConceptDescriptions().size() );
 
       final DataSpecificationIec61360 dataSpecificationContent = (DataSpecificationIec61360) env.getConceptDescriptions().stream()
-            .filter( conceptDescription -> conceptDescription.getIdShort().equals( "TestEnumeration" ) )
+            .filter( conceptDescription -> conceptDescription.getIdShort().equals( "testProperty" ) )
             .findFirst()
             .get()
             .getEmbeddedDataSpecifications()