Merge pull request #727 from bci-oss/726-scalar-value-source-file-is-null

Correctly return the source file for ScalarValue objects

Author: atextor

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

@@ -164,10 +164,9 @@ protected Value buildValue( final RDFNode node, final Optional<Resource> charact
       }
 
       if ( node.isResource() ) {
-         Resource resource = node.asResource();
-
+         final Resource resource = node.asResource();
          if ( resource.hasProperty( RDF.type, SammNs.SAMM.Value() ) ) {
-            Optional<String> valueOpt = optionalAttributeValue( resource, SammNs.SAMM.value() ).map( Statement::getString );
+            final Optional<String> valueOpt = optionalAttributeValue( resource, SammNs.SAMM.value() ).map( Statement::getString );
 
             if ( valueOpt.isEmpty() ) {
                throw new AspectLoadingException( "samm:Value must contain a samm:value property" );

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

@@ -10,7 +10,6 @@
 import org.apache.jena.rdf.model.Resource;
 
 public class ScalarValueInstantiator extends Instantiator<ScalarValue> {
-
    public ScalarValueInstantiator( final ModelElementFactory modelElementFactory ) {
       super( modelElementFactory, ScalarValue.class );
    }

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/metamodel/impl/DefaultScalarValue.java

@@ -62,14 +62,9 @@ public Set<LangString> getDescriptions() {
       return metaModelBaseAttributes.getDescriptions();
    }
 
-   /**
-    * Similar to {@link DefaultScalar#getSourceFile()}, scalar values are not defined in Aspect Model files, so this returns null.
-    *
-    * @return null
-    */
    @Override
    public AspectModelFile getSourceFile() {
-      return null;
+      return metaModelBaseAttributes.getSourceFile();
    }
 
    @Override
@@ -90,7 +85,7 @@ public int compareTo( final ScalarValue other ) {
 
    @SuppressWarnings( "unchecked" )
    private <T extends Comparable<T>> int compareTo( final Object value1, final Object value2 ) {
-      return ((T) value1).compareTo( (T) value2 );
+      return ( (T) value1 ).compareTo( (T) value2 );
    }
 
    @Override

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

@@ -29,6 +29,7 @@
 import org.eclipse.esmf.metamodel.AbstractEntity;
 import org.eclipse.esmf.metamodel.AspectModel;
 import org.eclipse.esmf.metamodel.ComplexType;
+import org.eclipse.esmf.metamodel.ModelElement;
 import org.eclipse.esmf.metamodel.vocabulary.SammNs;
 import org.eclipse.esmf.test.InvalidTestAspect;
 import org.eclipse.esmf.test.TestAspect;
@@ -38,8 +39,23 @@
 import org.apache.jena.rdf.model.Resource;
 import org.apache.jena.rdf.model.Statement;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
 
 class AspectModelLoaderTest {
+   @ParameterizedTest
+   @EnumSource( value = TestAspect.class )
+   void testLoadAspectModelsSourceFilesArePresent( final TestAspect testAspect ) {
+      final AspectModel aspectModel = TestResources.load( testAspect );
+      for ( final ModelElement element : aspectModel.elements() ) {
+         assertThat( element.getSourceFile() )
+               .describedAs( "Element %s has no source file", element ).isNotNull();
+         assertThat( element.getSourceFile() )
+               .describedAs( "Source file %s must contain defintion for %s", element.getSourceFile(), element.urn() )
+               .elements().contains( element );
+      }
+   }
+
    @Test
    void loadAspectModelWithoutCharacteristicDatatype() {
       assertThatThrownBy( () -> TestResources.load( InvalidTestAspect.INVALID_CHARACTERISTIC_DATATYPE ) )

core/esmf-aspect-model-document-generators/src/main/java/org/eclipse/esmf/aspectmodel/generator/json/AspectModelJsonPayloadGenerator.java

@@ -36,7 +36,6 @@
 import java.util.function.BiFunction;
 import java.util.function.Supplier;
 import java.util.stream.Stream;
-
 import javax.xml.datatype.DatatypeFactory;
 import javax.xml.datatype.Duration;
 import javax.xml.datatype.XMLGregorianCalendar;

core/esmf-aspect-model-document-generators/src/test/java/org/eclipse/esmf/aspectmodel/generator/json/AspectModelJsonPayloadGeneratorTest.java

@@ -37,7 +37,6 @@
 import java.util.stream.IntStream;
 import java.util.stream.LongStream;
 import java.util.stream.Stream;
-
 import javax.xml.datatype.DatatypeConfigurationException;
 import javax.xml.datatype.DatatypeFactory;