Fix calculation of languages rachable via an aspect.

Author: RaMisess

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/metamodel/visitor/LanguageCollectorModelVisitor.java

@@ -19,19 +19,20 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import com.google.common.collect.Sets;
-
+import org.eclipse.esmf.characteristic.Collection;
+import org.eclipse.esmf.characteristic.Trait;
 import org.eclipse.esmf.metamodel.Aspect;
-import org.eclipse.esmf.metamodel.ModelElement;
 import org.eclipse.esmf.metamodel.Entity;
+import org.eclipse.esmf.metamodel.ModelElement;
 import org.eclipse.esmf.metamodel.NamedElement;
 import org.eclipse.esmf.metamodel.Operation;
 import org.eclipse.esmf.metamodel.Property;
 import org.eclipse.esmf.metamodel.QuantityKind;
-import org.eclipse.esmf.characteristic.Trait;
 import org.eclipse.esmf.metamodel.Unit;
 import org.eclipse.esmf.metamodel.datatypes.LangString;
 
+import com.google.common.collect.Sets;
+
 /**
  * Aspect Model Visitor that retrieves all used Locales in an Aspect Model
  */
@@ -101,4 +102,10 @@ public Set<Locale> visitUnit( final Unit unit, final Set<Locale> context ) {
    public Set<Locale> visitQuantityKind( final QuantityKind quantityKind, final Set<Locale> context ) {
       return Collections.emptySet();
    }
+
+   @Override
+   public Set<Locale> visitCollection( final Collection collection, final Set<Locale> context ) {
+      return collection.getElementCharacteristic().isPresent() ? collection.getElementCharacteristic().get().accept( this, Collections.emptySet() ) :
+            collection.getDataType().get().accept( this, Collections.emptySet() );
+   }
 }

core/esmf-aspect-meta-model-java/src/test/java/org/eclipse/esmf/metamodel/visitor/LanguageCollectorModelVisitorTest.java

@@ -0,0 +1,72 @@
+package org.eclipse.esmf.metamodel.visitor;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.HashSet;
+import java.util.Locale;
+import java.util.Set;
+
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.ModelFactory;
+import org.apache.jena.riot.RDFLanguages;
+import org.eclipse.esmf.aspectmodel.VersionNumber;
+import org.eclipse.esmf.aspectmodel.resolver.services.SammAspectMetaModelResourceResolver;
+import org.eclipse.esmf.aspectmodel.resolver.services.VersionedModel;
+import org.eclipse.esmf.metamodel.Aspect;
+import org.eclipse.esmf.metamodel.loader.AspectModelLoader;
+import org.junit.jupiter.api.Test;
+
+class LanguageCollectorModelVisitorTest {
+
+   @Test
+   void testLanguageCollector() {
+      final VersionedModel versionedModel = model( """
+            @prefix samm: <urn:samm:org.eclipse.esmf.samm:meta-model:2.0.0#> .
+            @prefix samm-c: <urn:samm:org.eclipse.esmf.samm:characteristic:2.0.0#> .
+            @prefix : <urn:samm:test:0.0.1#> .
+            @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+                        
+            :Reference a samm:Aspect ;
+               samm:preferredName "Reference"@en ;
+               samm:description "Beschreibung."@de ;
+               samm:properties ( :items ) ;
+               samm:operations ( ) .
+                        
+            :items a samm:Property ;
+               samm:preferredName "Items"@es ;
+               samm:description "Items."@it ;
+               samm:characteristic [
+                  a samm-c:Set ;
+                  samm:dataType :AEntity
+               ] .
+                        
+            :AEntity a samm:Entity ;
+               samm:preferredName "A name"@pt ;
+               samm:preferredName "Ein name"@de ;
+               samm:properties ( :AProperty ) .
+                        
+            :AProperty a samm:Property ;
+               samm:preferredName "Common Property"@en ;
+               samm:description "Bon idee"@fr ;
+               samm:characteristic :ACharacteristic .
+                        
+            :ACharacteristic a samm-c:Code ;
+               samm:dataType xsd:string .
+            """ );
+      final Aspect aspect = AspectModelLoader.getSingleAspectUnchecked( versionedModel );
+      final Set<Locale> reachableLocales = new LanguageCollectorModelVisitor().visitAspect( aspect, new HashSet<>() );
+      assertThat( reachableLocales ).containsExactlyInAnyOrder( Locale.ENGLISH, Locale.GERMAN, Locale.ITALIAN, Locale.FRENCH, Locale.forLanguageTag( "es" ),
+            Locale.forLanguageTag( "pt" ) );
+   }
+
+   private VersionedModel model( final String ttlRepresentation ) {
+      final Model model = ModelFactory.createDefaultModel();
+      final InputStream in = new ByteArrayInputStream( ttlRepresentation.getBytes( StandardCharsets.UTF_8 ) );
+      model.read( in, "", RDFLanguages.strLangTurtle );
+      return new SammAspectMetaModelResourceResolver().mergeMetaModelIntoRawModel( model, VersionNumber.parse( "2.0.0" ) )
+            .get();
+   }
+}