Merge pull request #807 from bci-oss/806-see-references-to-elements-are-resolved

`samm:see` references to elements are resolved

Author: atextor

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/aspectmodel/RdfUtil.java

@@ -78,6 +78,17 @@ public static Model getModelElementDefinition( final Resource element ) {
       return result;
    }
 
+   public static Set<AspectModelUrn> getAllUrnsInModelExceptOnlyReferencedBySee( final Model model ) {
+      return Streams.stream( model.listStatements() )
+            .flatMap( statement -> statement.getPredicate().equals( SammNs.SAMM.see() )
+                  ? Stream.of( statement.getSubject() )
+                  : Stream.of( statement.getSubject(), statement.getPredicate(), statement.getObject() ) )
+            .filter( RDFNode::isURIResource )
+            .map( node -> node.asResource().getURI() )
+            .flatMap( urn -> AspectModelUrn.from( urn ).toJavaOptional().stream() )
+            .collect( toSet() );
+   }
+
    public static Set<AspectModelUrn> getAllUrnsInModel( final Model model ) {
       return Streams.stream( model.listStatements() )
             .flatMap( statement -> Stream.of( statement.getSubject(), statement.getPredicate(), statement.getObject() ) )

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/aspectmodel/loader/AspectModelLoader.java

@@ -520,7 +520,7 @@ private void urnsFromModelNeedResolution( final AspectModelFile modelFile, final
             .filter( uri -> uri.startsWith( AspectModelUrn.PROTOCOL_AND_NAMESPACE_PREFIX ) )
             .forEach( urn -> context.resolvedUrns().add( urn ) );
 
-      RdfUtil.getAllUrnsInModel( modelFile.sourceModel() ).stream()
+      RdfUtil.getAllUrnsInModelExceptOnlyReferencedBySee( modelFile.sourceModel() ).stream()
             .map( AspectModelUrn::toString )
             .filter( urn -> !context.resolvedUrns().contains( urn ) )
             .filter( urn -> !SammNs.wellKnownNamespaces().map( rdfNamespace -> urn.startsWith( rdfNamespace.getNamespace() ) )

core/esmf-aspect-meta-model-java/src/test/java/org/eclipse/esmf/aspectmodel/loader/AspectModelInstantiatorTest.java

@@ -50,10 +50,10 @@ void testLoadAspectExpectSuccess( final TestAspect aspect ) {
 
    @Test
    void testAspectTransformationExpectSuccess() {
-      final Aspect aspect = loadAspect( TestAspect.ASPECT_WITH_SEE );
-      final AspectModelUrn expectedAspectModelUrn = TestAspect.ASPECT_WITH_SEE.getUrn();
-      assertBaseAttributes( aspect, expectedAspectModelUrn, "AspectWithSee", "Test Aspect With See",
-            "This is a test description", "http://example.com/" );
+      final Aspect aspect = loadAspect( TestAspect.ASPECT_WITH_SEE_ATTRIBUTE );
+      final AspectModelUrn expectedAspectModelUrn = TestAspect.ASPECT_WITH_SEE_ATTRIBUTE.getUrn();
+      assertBaseAttributes( aspect, expectedAspectModelUrn, "AspectWithSeeAttribute", "Test Aspect",
+            "This is a test Aspect.", "http://example.com/" );
    }
 
    @Test

core/esmf-aspect-meta-model-java/src/test/java/org/eclipse/esmf/aspectmodel/resolver/AspectModelResolverTest.java

@@ -34,6 +34,7 @@
 import org.eclipse.esmf.metamodel.vocabulary.SammNs;
 import org.eclipse.esmf.samm.KnownVersion;
 import org.eclipse.esmf.test.InvalidTestAspect;
+import org.eclipse.esmf.test.TestAspect;
 import org.eclipse.esmf.test.TestModel;
 import org.eclipse.esmf.test.TestResources;
 
@@ -245,4 +246,11 @@ void getExceptionWhileLoadingModelWithTwoAspects() {
                   "Aspect Model file testmodel:invalid/org.eclipse.esmf.test/1.0.0/InvalidAspectWithTwoAspects.ttl contains 2 "
                         + "aspects, but may only contain one." );
    }
+
+   @Test
+   void testSeeReferencesAreNotResolved() {
+      assertThatCode( () -> {
+         TestResources.load( TestAspect.ASPECT_WITH_SEE_TO_ELEMENT );
+      } ).doesNotThrowAnyException();
+   }
 }

core/esmf-test-aspect-models/src/main/java/org/eclipse/esmf/test/TestAspect.java

@@ -175,8 +175,8 @@ public enum TestAspect implements TestModel {
    ASPECT_WITH_REGULAR_EXPRESSION_CONSTRAINT,
    ASPECT_WITH_RUBY_GEM_UPDATE_COMMAND,
    ASPECT_WITH_SCRIPT_TAGS,
-   ASPECT_WITH_SEE,
    ASPECT_WITH_SEE_ATTRIBUTE,
+   ASPECT_WITH_SEE_TO_ELEMENT,
    ASPECT_WITH_SET,
    ASPECT_WITH_SIMPLE_ENTITY,
    ASPECT_WITH_SIMPLE_PROPERTIES,

core/esmf-test-aspect-models/src/main/resources/valid/org.eclipse.esmf.test/1.0.0/AspectWithSee.ttl renamed to core/esmf-test-aspect-models/src/main/resources/valid/org.eclipse.esmf.test/1.0.0/AspectWithSeeToElement.ttl

@@ -12,12 +12,10 @@
 @prefix : <urn:samm:org.eclipse.esmf.test:1.0.0#> .
 @prefix samm: <urn:samm:org.eclipse.esmf.samm:meta-model:2.2.0#> .
 @prefix samm-c: <urn:samm:org.eclipse.esmf.samm:characteristic:2.2.0#> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix unit: <urn:samm:org.eclipse.esmf.samm:unit:2.2.0#> .
 
-:AspectWithSee a samm:Aspect ;
-   samm:preferredName "Test Aspect With See"@en ;
-   samm:description "This is a test description"@en ;
-   samm:see <http://example.com/> ;
+:AspectWithSeeToElement a samm:Aspect ;
+   samm:preferredName "Test Aspect"@en ;
+   samm:description "This is a test Aspect."@en ;
+   samm:see <urn:samm:org.eclipse.test:1.0.0#NonExistingElement> ;
    samm:properties ( ) ;
-   samm:operations ( ) .
+   samm:operations ( ) .

tools/esmf-aspect-model-maven-plugin/src/test/resources/validate-pom-multiple-aspect-models/pom.xml

@@ -33,7 +33,7 @@
                   <include>urn:samm:org.eclipse.esmf.test:1.0.0#AspectWithBlankNode</include>
                   <include>urn:samm:org.eclipse.esmf.test:1.0.0#AspectWithComplexSet</include>
                   <include>urn:samm:org.eclipse.esmf.test:1.0.0#AspectWithList</include>
-                  <include>urn:samm:org.eclipse.esmf.test:1.0.0#AspectWithSee</include>
+                  <include>urn:samm:org.eclipse.esmf.test:1.0.0#AspectWithSeeAttribute</include>
                </includes>
             </configuration>
          </plugin>