Merge branch 'release/2022-01'

ivan-gomes · ivan-gomes · commit e9060179ca2d · 2022-02-04T21:49:25.000-05:00
diff --git a/app/org/omg/sysml/metamodel/AcceptActionUsage.java b/app/org/omg/sysml/metamodel/AcceptActionUsage.java
@@ -27,4 +27,10 @@
 
 public interface AcceptActionUsage extends ActionUsage, SysMLType {
     Expression getReceiverArgument();
+
+    ReferenceUsage getPayloadParameter();
+
+    Expression getPayloadArgument();
+
+    TriggerKind getTriggerKind();
 }
diff --git a/app/org/omg/sysml/metamodel/ForLoopActionUsage.java b/app/org/omg/sysml/metamodel/ForLoopActionUsage.java
@@ -26,7 +26,7 @@
 import java.util.Set;
 
 public interface ForLoopActionUsage extends LoopActionUsage, SysMLType {
-    ReferenceUsage getLoopVariable();
-
     Expression getSeqArgument();
+
+    ReferenceUsage getLoopVariable();
 }
diff --git a/app/org/omg/sysml/metamodel/SendActionUsage.java b/app/org/omg/sysml/metamodel/SendActionUsage.java
@@ -28,5 +28,5 @@
 public interface SendActionUsage extends ActionUsage, SysMLType {
     Expression getReceiverArgument();
 
-    Expression getItemsArgument();
+    Expression getPayloadArgument();
 }
diff --git a/app/org/omg/sysml/metamodel/TriggerKind.java b/app/org/omg/sysml/metamodel/TriggerKind.java
@@ -0,0 +1,29 @@
+/*
+ * SysML v2 REST/HTTP Pilot Implementation
+ * Copyright (C) 2020  InterCAX LLC
+ * Copyright (C) 2020  California Institute of Technology ("Caltech")
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * @license LGPL-3.0-or-later <http://spdx.org/licenses/LGPL-3.0-or-later>
+ */
+
+package org.omg.sysml.metamodel;
+
+public enum TriggerKind {
+    ACCEPT,
+    WHEN,
+    AT,
+    AFTER
+}
diff --git a/app/org/omg/sysml/metamodel/impl/AcceptActionUsageImpl.java b/app/org/omg/sysml/metamodel/impl/AcceptActionUsageImpl.java
@@ -2322,6 +2322,48 @@ public void setParameter(List<Feature> parameter) {
 
 
 
+    // @info.archinnov.achilles.annotations.Transient
+    // @info.archinnov.achilles.annotations.Column("payloadArgument")
+    private Expression payloadArgument;
+
+    @JsonGetter
+    @JsonSerialize(using = DataSerializer.class)
+    // @javax.persistence.Transient
+    @Any(metaDef = "ExpressionMetaDef", metaColumn = @javax.persistence.Column(name = "payloadArgumentType"), fetch = FetchType.LAZY)
+    @JoinColumn(name = "payloadArgumentId", table = "AcceptActionUsage")
+    public Expression getPayloadArgument() {
+        return payloadArgument;
+    }
+
+    @JsonSetter
+    @JsonDeserialize(using = DataDeserializer.class, as = ExpressionImpl.class)
+    public void setPayloadArgument(Expression payloadArgument) {
+        this.payloadArgument = payloadArgument;
+    }
+
+
+
+    // @info.archinnov.achilles.annotations.Transient
+    // @info.archinnov.achilles.annotations.Column("payloadParameter")
+    private ReferenceUsage payloadParameter;
+
+    @JsonGetter
+    @JsonSerialize(using = DataSerializer.class)
+    // @javax.persistence.Transient
+    @Any(metaDef = "ReferenceUsageMetaDef", metaColumn = @javax.persistence.Column(name = "payloadParameterType"), fetch = FetchType.LAZY)
+    @JoinColumn(name = "payloadParameterId", table = "AcceptActionUsage")
+    public ReferenceUsage getPayloadParameter() {
+        return payloadParameter;
+    }
+
+    @JsonSetter
+    @JsonDeserialize(using = DataDeserializer.class, as = ReferenceUsageImpl.class)
+    public void setPayloadParameter(ReferenceUsage payloadParameter) {
+        this.payloadParameter = payloadParameter;
+    }
+
+
+
     // @info.archinnov.achilles.annotations.Column("portionKind")
     // @info.archinnov.achilles.annotations.Enumerated(info.archinnov.achilles.annotations.Enumerated.Encoding.NAME)
     private PortionKind portionKind;
@@ -2402,6 +2444,24 @@ public void setReceiverArgument(Expression receiverArgument) {
 
 
 
+    // @info.archinnov.achilles.annotations.Column("triggerKind")
+    // @info.archinnov.achilles.annotations.Enumerated(info.archinnov.achilles.annotations.Enumerated.Encoding.NAME)
+    private TriggerKind triggerKind;
+
+    @JsonGetter
+    @javax.persistence.Enumerated(EnumType.STRING)
+    @javax.persistence.Column(name = "triggerKind", table = "AcceptActionUsage")
+    public TriggerKind getTriggerKind() {
+        return triggerKind;
+    }
+
+    @JsonSetter
+    public void setTriggerKind(TriggerKind triggerKind) {
+        this.triggerKind = triggerKind;
+    }
+
+
+
     // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("type")
     private List<Type> type;
diff --git a/app/org/omg/sysml/metamodel/impl/SendActionUsageImpl.java b/app/org/omg/sysml/metamodel/impl/SendActionUsageImpl.java
@@ -852,27 +852,6 @@ public void setIsVariation(Boolean isVariation) {
 
 
 
-    // @info.archinnov.achilles.annotations.Transient
-    // @info.archinnov.achilles.annotations.Column("itemsArgument")
-    private Expression itemsArgument;
-
-    @JsonGetter
-    @JsonSerialize(using = DataSerializer.class)
-    // @javax.persistence.Transient
-    @Any(metaDef = "ExpressionMetaDef", metaColumn = @javax.persistence.Column(name = "itemsArgumentType"), fetch = FetchType.LAZY)
-    @JoinColumn(name = "itemsArgumentId", table = "SendActionUsage")
-    public Expression getItemsArgument() {
-        return itemsArgument;
-    }
-
-    @JsonSetter
-    @JsonDeserialize(using = DataDeserializer.class, as = ExpressionImpl.class)
-    public void setItemsArgument(Expression itemsArgument) {
-        this.itemsArgument = itemsArgument;
-    }
-
-
-
     // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("member")
     private List<Element> member;
@@ -2343,6 +2322,27 @@ public void setParameter(List<Feature> parameter) {
 
 
 
+    // @info.archinnov.achilles.annotations.Transient
+    // @info.archinnov.achilles.annotations.Column("payloadArgument")
+    private Expression payloadArgument;
+
+    @JsonGetter
+    @JsonSerialize(using = DataSerializer.class)
+    // @javax.persistence.Transient
+    @Any(metaDef = "ExpressionMetaDef", metaColumn = @javax.persistence.Column(name = "payloadArgumentType"), fetch = FetchType.LAZY)
+    @JoinColumn(name = "payloadArgumentId", table = "SendActionUsage")
+    public Expression getPayloadArgument() {
+        return payloadArgument;
+    }
+
+    @JsonSetter
+    @JsonDeserialize(using = DataDeserializer.class, as = ExpressionImpl.class)
+    public void setPayloadArgument(Expression payloadArgument) {
+        this.payloadArgument = payloadArgument;
+    }
+
+
+
     // @info.archinnov.achilles.annotations.Column("portionKind")
     // @info.archinnov.achilles.annotations.Enumerated(info.archinnov.achilles.annotations.Enumerated.Encoding.NAME)
     private PortionKind portionKind;
diff --git a/build.sbt b/build.sbt
@@ -1,7 +1,7 @@
 name := """SysML-v2-API-Services"""
 organization := "org.omg"
 
-version := "2021-12"
+version := "2022-01"
 
 javacOptions ++= Seq("-source", "11", "-target", "11", "-Xlint")
 
diff --git a/generated/org/omg/sysml/metamodel/impl/AcceptActionUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/AcceptActionUsageImpl_.java
@@ -48,6 +48,7 @@
 import org.omg.sysml.metamodel.Subsetting;
 import org.omg.sysml.metamodel.TextualRepresentation;
 import org.omg.sysml.metamodel.TransitionUsage;
+import org.omg.sysml.metamodel.TriggerKind;
 import org.omg.sysml.metamodel.Type;
 import org.omg.sysml.metamodel.TypeFeaturing;
 import org.omg.sysml.metamodel.Usage;
@@ -70,6 +71,7 @@ public abstract class AcceptActionUsageImpl_ extends org.omg.sysml.lifecycle.imp
 	public static volatile SingularAttribute<AcceptActionUsageImpl, Boolean> isUnique;
 	public static volatile ListAttribute<AcceptActionUsageImpl, Usage> nestedUsage;
 	public static volatile CollectionAttribute<AcceptActionUsageImpl, Subsetting> ownedSubsetting;
+	public static volatile SingularAttribute<AcceptActionUsageImpl, TriggerKind> triggerKind;
 	public static volatile ListAttribute<AcceptActionUsageImpl, Type> type;
 	public static volatile ListAttribute<AcceptActionUsageImpl, RequirementUsage> nestedRequirement;
 	public static volatile ListAttribute<AcceptActionUsageImpl, Feature> output;
@@ -161,6 +163,7 @@ public abstract class AcceptActionUsageImpl_ extends org.omg.sysml.lifecycle.imp
 	public static final String IS_UNIQUE = "isUnique";
 	public static final String NESTED_USAGE = "nestedUsage";
 	public static final String OWNED_SUBSETTING = "ownedSubsetting";
+	public static final String TRIGGER_KIND = "triggerKind";
 	public static final String TYPE = "type";
 	public static final String NESTED_REQUIREMENT = "nestedRequirement";
 	public static final String OUTPUT = "output";
diff --git a/public/jsonld/metamodel/AcceptActionUsage.jsonld b/public/jsonld/metamodel/AcceptActionUsage.jsonld
@@ -101,10 +101,13 @@
         "owningType": {"@type": "@id"},
         "owningUsage": {"@type": "@id"},
         "parameter": {"@type": "@id"},
+        "payloadArgument": {"@type": "@id"},
+        "payloadParameter": {"@type": "@id"},
         "portionKind": {"@type": "@vocab"},
         "portioningFeature": {"@type": "@id"},
         "qualifiedName": {"@type": "xsd:string"},
         "receiverArgument": {"@type": "@id"},
+        "triggerKind": {"@type": "@vocab"},
         "type": {"@type": "@id"},
         "usage": {"@type": "@id"},
         "variant": {"@type": "@id"},
diff --git a/public/jsonld/metamodel/SendActionUsage.jsonld b/public/jsonld/metamodel/SendActionUsage.jsonld
@@ -42,7 +42,6 @@
         "isSufficient": {"@type": "xsd:boolean"},
         "isUnique": {"@type": "xsd:boolean"},
         "isVariation": {"@type": "xsd:boolean"},
-        "itemsArgument": {"@type": "@id"},
         "member": {"@type": "@id"},
         "membership": {"@type": "@id"},
         "multiplicity": {"@type": "@id"},
@@ -102,6 +101,7 @@
         "owningType": {"@type": "@id"},
         "owningUsage": {"@type": "@id"},
         "parameter": {"@type": "@id"},
+        "payloadArgument": {"@type": "@id"},
         "portionKind": {"@type": "@vocab"},
         "portioningFeature": {"@type": "@id"},
         "qualifiedName": {"@type": "xsd:string"},

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`import java.util.Set;`
`27`	`27`
`28`	`28`	`public interface ForLoopActionUsage extends LoopActionUsage, SysMLType {`
`29`		`- ReferenceUsage getLoopVariable();`
`30`		`-`
`31`	`29`	`Expression getSeqArgument();`
	`30`	`+`
	`31`	`+ ReferenceUsage getLoopVariable();`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,5 +28,5 @@`
`28`	`28`	`public interface SendActionUsage extends ActionUsage, SysMLType {`
`29`	`29`	`Expression getReceiverArgument();`
`30`	`30`
`31`		`- Expression getItemsArgument();`
	`31`	`+ Expression getPayloadArgument();`
`32`	`32`	`}`