Merge pull request #389 from bci-oss/bugfix/esmf-372-fix-wrong-json-payloads

Fix problems with JSON payload generation.

Author: atextor

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

@@ -34,11 +34,9 @@
 import org.apache.jena.rdf.model.Statement;
 import org.apache.jena.vocabulary.RDF;
 import org.apache.jena.vocabulary.RDFS;
-
-import org.eclipse.esmf.aspectmodel.vocabulary.SAMM;
-import org.eclipse.esmf.samm.KnownVersion;
 import org.eclipse.esmf.aspectmodel.resolver.services.ExtendedXsdDataType;
 import org.eclipse.esmf.aspectmodel.urn.AspectModelUrn;
+import org.eclipse.esmf.aspectmodel.vocabulary.SAMM;
 import org.eclipse.esmf.aspectmodel.vocabulary.SAMMC;
 import org.eclipse.esmf.aspectmodel.vocabulary.UNIT;
 import org.eclipse.esmf.metamodel.AbstractEntity;
@@ -53,10 +51,11 @@
 import org.eclipse.esmf.metamodel.Type;
 import org.eclipse.esmf.metamodel.Value;
 import org.eclipse.esmf.metamodel.datatypes.LangString;
-import org.eclipse.esmf.metamodel.impl.DefaultScalarValue;
 import org.eclipse.esmf.metamodel.impl.DefaultCollectionValue;
 import org.eclipse.esmf.metamodel.impl.DefaultEntityInstance;
 import org.eclipse.esmf.metamodel.impl.DefaultScalar;
+import org.eclipse.esmf.metamodel.impl.DefaultScalarValue;
+import org.eclipse.esmf.samm.KnownVersion;
 
 public abstract class Instantiator<T extends ModelElement> extends AttributeValueRetriever implements Function<Resource, T> {
    protected final ModelElementFactory modelElementFactory;
@@ -223,9 +222,7 @@ private ScalarValue buildScalarValue( final Literal literal ) {
       //    but _not_ org.eclipse.esmf.metamodel.datatypes.LangString as we would like to.
       // 3. So we construct an instance of LangString here from the RDFLangString.
       if ( literal.getDatatypeURI().equals( RDF.langString.getURI() ) ) {
-         final LangString langString = new LangString( literal.getString(), Locale.forLanguageTag( literal.getLanguage() ) );
-         final Scalar type = new DefaultScalar( RDF.langString.getURI(), metaModelVersion );
-         return new DefaultScalarValue( langString, type );
+         return buildLanguageString( literal );
       }
 
       return Stream.concat( ExtendedXsdDataType.supportedXsdTypes.stream(), Stream.of( curieDataType ) )
@@ -236,6 +233,12 @@ private ScalarValue buildScalarValue( final Literal literal ) {
             .orElseThrow( () -> new AspectLoadingException( "Literal can not be parsed: " + literal ) );
    }
 
+   protected ScalarValue buildLanguageString( final Literal literal ) {
+      final LangString langString = new LangString( literal.getString(), Locale.forLanguageTag( literal.getLanguage() ) );
+      final Scalar type = new DefaultScalar( RDF.langString.getURI(), metaModelVersion );
+      return new DefaultScalarValue( langString, type );
+   }
+
    private CollectionValue buildCollectionValue( final RDFList list, final CollectionValue.CollectionType collectionType,
          final Optional<Resource> elementCharacteristic, final Type elementType ) {
       final java.util.Collection<Value> values = createEmptyCollectionForType( collectionType );

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/metamodel/loader/instantiator/PropertyInstantiator.java

@@ -18,11 +18,10 @@
 import java.util.Optional;
 
 import org.apache.jena.datatypes.BaseDatatype;
+import org.apache.jena.rdf.model.Literal;
 import org.apache.jena.rdf.model.Resource;
 import org.apache.jena.rdf.model.Statement;
 import org.apache.jena.vocabulary.RDF;
-
-import org.eclipse.esmf.samm.KnownVersion;
 import org.eclipse.esmf.aspectmodel.resolver.exceptions.InvalidModelException;
 import org.eclipse.esmf.metamodel.Characteristic;
 import org.eclipse.esmf.metamodel.Property;
@@ -35,6 +34,7 @@
 import org.eclipse.esmf.metamodel.loader.Instantiator;
 import org.eclipse.esmf.metamodel.loader.MetaModelBaseAttributes;
 import org.eclipse.esmf.metamodel.loader.ModelElementFactory;
+import org.eclipse.esmf.samm.KnownVersion;
 
 public class PropertyInstantiator extends Instantiator<Property> {
    private final Characteristic fallbackCharacteristic;
@@ -81,18 +81,22 @@ public Property apply( final Resource property ) {
                         }
                         return type.as( Scalar.class );
                      } )
-                     .map( type -> {
-                        final Object literal = statement.getLiteral().getValue();
-                        final Object value = literal instanceof BaseDatatype.TypedValue
-                              ? statement.getLiteral().getLexicalForm()
-                              : literal;
-                        return new DefaultScalarValue( value, type );
-                     } ) );
+                     .map( type -> buildScalarValue( statement.getLiteral(), type ) ) );
 
          defProperty = new DefaultProperty( metaModelBaseAttributes, Optional.of( characteristic ), exampleValue, isOptional,
                isNotInPayload, payloadName, isAbstract, extends_ );
       }
       defaultPropertyWrapper.setProperty( defProperty );
       return defaultPropertyWrapper;
    }
+
+   private ScalarValue buildScalarValue( final Literal literal, final Scalar type ) {
+      final Object literalValue = literal.getValue();
+      if ( literalValue instanceof BaseDatatype.TypedValue ) {
+         return new DefaultScalarValue( literal.getLexicalForm(), type );
+      } else if ( literal.getDatatypeURI().equals( RDF.langString.getURI() ) ) {
+         return buildLanguageString( literal );
+      }
+      return new DefaultScalarValue( literalValue, type );
+   }
 }