Merge pull request #40 from Systems-Modeling/feature/ST5AS-108

ST5AS-108 Incorporate 2020-12 metamodel changes in ST6RI-309

Author: ivan-gomes

app/org/omg/sysml/metamodel/MetadataFeatureValue.java

@@ -27,4 +27,6 @@
 
 public interface MetadataFeatureValue extends FeatureValue, MofObject {
     MetadataExpression getMetadataValue();
+
+    MetadataFeature getOwningMetadataFeature();
 }

app/org/omg/sysml/metamodel/MetadataReferenceExpression.java

@@ -26,5 +26,5 @@
 import java.util.Set;
 
 public interface MetadataReferenceExpression extends FeatureReferenceExpression, MetadataExpression, MofObject {
-    MetadataFeature getReferent();
+
 }

app/org/omg/sysml/metamodel/impl/MetadataFeatureImpl.java

@@ -593,13 +593,11 @@ public void setMembership(List<Membership> membership) {
 
 
 
-    // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("metadataFeatureValue")
     private MetadataFeatureValue metadataFeatureValue;
 
     @JsonGetter
     @JsonSerialize(using = MofObjectSerializer.class)
-    // @javax.persistence.Transient
     @Any(metaDef = "MetadataFeatureValueMetaDef", metaColumn = @javax.persistence.Column(name = "metadataFeatureValueType"), fetch = FetchType.LAZY)
     @JoinColumn(name = "metadataFeatureValueId", table = "MetadataFeature")
     public MetadataFeatureValue getMetadataFeatureValue() {

app/org/omg/sysml/metamodel/impl/MetadataFeatureValueImpl.java

@@ -473,6 +473,25 @@ public void setOwningMembership(Membership owningMembership) {
 
 
 
+    // @info.archinnov.achilles.annotations.Column("owningMetadataFeature")
+    private MetadataFeature owningMetadataFeature;
+
+    @JsonGetter
+    @JsonSerialize(using = MofObjectSerializer.class)
+    @Any(metaDef = "MetadataFeatureMetaDef", metaColumn = @javax.persistence.Column(name = "owningMetadataFeatureType"), fetch = FetchType.LAZY)
+    @JoinColumn(name = "owningMetadataFeatureId", table = "MetadataFeatureValue")
+    public MetadataFeature getOwningMetadataFeature() {
+        return owningMetadataFeature;
+    }
+
+    @JsonSetter
+    @JsonDeserialize(using = MofObjectDeserializer.class, as = MetadataFeatureImpl.class)
+    public void setOwningMetadataFeature(MetadataFeature owningMetadataFeature) {
+        this.owningMetadataFeature = owningMetadataFeature;
+    }
+
+
+
     // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("owningNamespace")
     private Namespace owningNamespace;

app/org/omg/sysml/metamodel/impl/MetadataReferenceExpressionImpl.java

@@ -1256,20 +1256,20 @@ public void setParameter(Collection<Feature> parameter) {
 
     // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("referent")
-    private MetadataFeature referent;
+    private Feature referent;
 
     @JsonGetter
     @JsonSerialize(using = MofObjectSerializer.class)
     // @javax.persistence.Transient
-    @Any(metaDef = "MetadataFeatureMetaDef", metaColumn = @javax.persistence.Column(name = "referentType"), fetch = FetchType.LAZY)
+    @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "referentType"), fetch = FetchType.LAZY)
     @JoinColumn(name = "referentId", table = "MetadataReferenceExpression")
-    public MetadataFeature getReferent() {
+    public Feature getReferent() {
         return referent;
     }
 
     @JsonSetter
-    @JsonDeserialize(using = MofObjectDeserializer.class, as = MetadataFeatureImpl.class)
-    public void setReferent(MetadataFeature referent) {
+    @JsonDeserialize(using = MofObjectDeserializer.class, as = FeatureImpl.class)
+    public void setReferent(Feature referent) {
         this.referent = referent;
     }
 

public/jsonld/MetadataFeatureValue.jsonld

@@ -24,6 +24,7 @@
         "ownedTextualRepresentation": {"@type": "@id"},
         "owner": {"@type": "@id"},
         "owningMembership": {"@type": "@id"},
+        "owningMetadataFeature": {"@type": "@id"},
         "owningNamespace": {"@type": "@id"},
         "owningRelatedElement": {"@type": "@id"},
         "owningRelationship": {"@type": "@id"},