Merge branch 'release/2021-12'

Author: ivan-gomes

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

@@ -26,5 +26,7 @@
 import java.util.Set;
 
 public interface ForLoopActionUsage extends LoopActionUsage, SysMLType {
+    ReferenceUsage getLoopVariable();
+
     Expression getSeqArgument();
 }

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

@@ -2475,11 +2475,13 @@ public void setUsage(List<Usage> usage) {
 
 
 
+    // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("valueExpression")
     private Expression valueExpression;
 
     @JsonGetter
     @JsonSerialize(using = DataSerializer.class)
+    // @javax.persistence.Transient
     @Any(metaDef = "ExpressionMetaDef", metaColumn = @javax.persistence.Column(name = "valueExpressionType"), fetch = FetchType.LAZY)
     @JoinColumn(name = "valueExpressionId", table = "AssignmentActionUsage")
     public Expression getValueExpression() {

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

@@ -873,6 +873,27 @@ public void setIsVariation(Boolean isVariation) {
 
 
 
+    // @info.archinnov.achilles.annotations.Transient
+    // @info.archinnov.achilles.annotations.Column("loopVariable")
+    private ReferenceUsage loopVariable;
+
+    @JsonGetter
+    @JsonSerialize(using = DataSerializer.class)
+    // @javax.persistence.Transient
+    @Any(metaDef = "ReferenceUsageMetaDef", metaColumn = @javax.persistence.Column(name = "loopVariableType"), fetch = FetchType.LAZY)
+    @JoinColumn(name = "loopVariableId", table = "ForLoopActionUsage")
+    public ReferenceUsage getLoopVariable() {
+        return loopVariable;
+    }
+
+    @JsonSetter
+    @JsonDeserialize(using = DataDeserializer.class, as = ReferenceUsageImpl.class)
+    public void setLoopVariable(ReferenceUsage loopVariable) {
+        this.loopVariable = loopVariable;
+    }
+
+
+
     // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("member")
     private List<Element> member;

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

@@ -861,11 +861,13 @@ public void setName(String name) {
 
 
 
+    // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("operand")
     private List<Expression> operand;
 
     @JsonGetter
     @JsonSerialize(contentUsing = DataSerializer.class)
+    // @javax.persistence.Transient
     @ManyToAny(metaDef = "ExpressionMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
     @JoinTable(name = "OperatorExpression_operand",
             joinColumns = @JoinColumn(name = "classId"),

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

@@ -861,11 +861,13 @@ public void setName(String name) {
 
 
 
+    // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("operand")
     private List<Expression> operand;
 
     @JsonGetter
     @JsonSerialize(contentUsing = DataSerializer.class)
+    // @javax.persistence.Transient
     @ManyToAny(metaDef = "ExpressionMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
     @JoinTable(name = "PathSelectExpression_operand",
             joinColumns = @JoinColumn(name = "classId"),

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

@@ -861,11 +861,13 @@ public void setName(String name) {
 
 
 
+    // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("operand")
     private List<Expression> operand;
 
     @JsonGetter
     @JsonSerialize(contentUsing = DataSerializer.class)
+    // @javax.persistence.Transient
     @ManyToAny(metaDef = "ExpressionMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
     @JoinTable(name = "PathStepExpression_operand",
             joinColumns = @JoinColumn(name = "classId"),

build.sbt

@@ -1,7 +1,7 @@
 name := """SysML-v2-API-Services"""
 organization := "org.omg"
 
-version := "2021-11"
+version := "2021-12"
 
 javacOptions ++= Seq("-source", "11", "-target", "11", "-Xlint")
 

conf/META-INF/persistence.xml

@@ -116,7 +116,6 @@
         <class>org.omg.sysml.metamodel.impl.MergeNodeImpl</class>
         <class>org.omg.sysml.metamodel.impl.MetadataFeatureImpl</class>
         <class>org.omg.sysml.metamodel.impl.MetadataFeatureValueImpl</class>
-        <class>org.omg.sysml.metamodel.impl.SysMLTypeImpl</class>
         <class>org.omg.sysml.metamodel.impl.MultiplicityImpl</class>
         <class>org.omg.sysml.metamodel.impl.MultiplicityRangeImpl</class>
         <class>org.omg.sysml.metamodel.impl.NamespaceImpl</class>
@@ -165,6 +164,7 @@
         <class>org.omg.sysml.metamodel.impl.SuccessionFlowConnectionUsageImpl</class>
         <class>org.omg.sysml.metamodel.impl.SuccessionImpl</class>
         <class>org.omg.sysml.metamodel.impl.SuccessionItemFlowImpl</class>
+        <class>org.omg.sysml.metamodel.impl.SysMLTypeImpl</class>
         <class>org.omg.sysml.metamodel.impl.TargetEndImpl</class>
         <class>org.omg.sysml.metamodel.impl.TextualRepresentationImpl</class>
         <class>org.omg.sysml.metamodel.impl.TransitionFeatureMembershipImpl</class>

public/jsonld/metamodel/ForLoopActionUsage.jsonld

@@ -43,6 +43,7 @@
         "isSufficient": {"@type": "xsd:boolean"},
         "isUnique": {"@type": "xsd:boolean"},
         "isVariation": {"@type": "xsd:boolean"},
+        "loopVariable": {"@type": "@id"},
         "member": {"@type": "@id"},
         "membership": {"@type": "@id"},
         "multiplicity": {"@type": "@id"},