Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Closed
wants to merge 5 commits into from
Closed

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0b43f25
bugfix: SAMM-CLI aas generation: ConceptDescription idShort based on …
Yauhenikapl Oct 27, 2023
0abd57d
Merge branch 'main' into bugfix/457-aas-concept-description-idshort-b…
Yauhenikapl Oct 27, 2023
ff71eeb
Fix broken links
MelleD Oct 30, 2023
b9a8092
Revert "Fix broken links"
Yauhenikapl Nov 24, 2023
3ed0146
Merge branch 'main' into bugfix/457-aas-concept-description-idshort-b…
Yauhenikapl Nov 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions ...l-aas-generator/src/main/java/org/eclipse/esmf/aspectmodel/aas/AspectModelAASVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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( ID_PREFIX + property.getName() )
.displayName( LangStringMapper.NAME.map( property.getPreferredNames() ) )
.embeddedDataSpecifications( extractEmbeddedDataSpecification( property ) )
.id( DEFAULT_MAPPER.determineIdentifierFor( property ) )
.build();
Expand Down
20 changes: 11 additions & 9 deletions ...generator/src/test/java/org/eclipse/esmf/aspectmodel/aas/AspectModelAASGeneratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,15 +289,17 @@ void testGenerateAasxFromAspectModelWithEnumeration() throws IOException, Deseri

assertEquals( 2, env.getConceptDescriptions().size() );

final DataSpecificationIec61360 dataSpecificationContent = (DataSpecificationIec61360) env.getConceptDescriptions().stream()
.filter( conceptDescription -> conceptDescription.getIdShort().equals( "TestEnumeration" ) )
.findFirst()
.get()
.getEmbeddedDataSpecifications()
.stream()
.findFirst()
.get()
.getDataSpecificationContent();
final DataSpecificationIec61360 dataSpecificationContent =
(DataSpecificationIec61360)
env.getConceptDescriptions().stream()
.filter( x -> x.getIdShort().equals( "id_testProperty" ) )
.findFirst()
.get()
.getEmbeddedDataSpecifications()
.stream()
.findFirst()
.get()
.getDataSpecificationContent();
assertEquals( 3, dataSpecificationContent.getValueList().getValueReferencePairs().size() );

assertEquals( 1, env.getSubmodels().size() );
Expand Down
Loading