Merge branch 'release/2022-05-m1'

Systems-Modeling · Jun 10, 2022 · 6fc1fb6 · 6fc1fb6
2 parents 68bd8ed + fbe34fd
commit 6fc1fb6
Show file tree

Hide file tree

Showing 262 changed files with 3,347 additions and 183 deletions.
diff --git a/app/org/omg/sysml/lifecycle/impl/package-info.java b/app/org/omg/sysml/lifecycle/impl/package-info.java
@@ -85,6 +85,7 @@
                         @MetaValue(value = "Feature", targetEntity = FeatureImpl.class),
                         @MetaValue(value = "FeatureChainExpression", targetEntity = FeatureChainExpressionImpl.class),
                         @MetaValue(value = "FeatureChaining", targetEntity = FeatureChainingImpl.class),
+                        @MetaValue(value = "FeatureInverting", targetEntity = FeatureInvertingImpl.class),
                         @MetaValue(value = "FeatureMembership", targetEntity = FeatureMembershipImpl.class),
                         @MetaValue(value = "FeatureReferenceExpression", targetEntity = FeatureReferenceExpressionImpl.class),
                         @MetaValue(value = "FeatureTyping", targetEntity = FeatureTypingImpl.class),

diff --git a/app/org/omg/sysml/metamodel/ConnectorAsUsage.java b/app/org/omg/sysml/metamodel/ConnectorAsUsage.java
@@ -26,6 +26,6 @@
 import java.util.List;
 import java.util.Set;
 
-public interface ConnectorAsUsage extends Usage, Connector, SysMLType {
+public interface ConnectorAsUsage extends Connector, Usage, SysMLType {
 
 }
diff --git a/app/org/omg/sysml/metamodel/Feature.java b/app/org/omg/sysml/metamodel/Feature.java
@@ -43,7 +43,7 @@ public interface Feature extends Type, SysMLType {
 
     Boolean getIsComposite();
 
-    Boolean getIsPortion();
+    Boolean getIsEnd();
 
     Type getEndOwningType();
 
@@ -53,15 +53,17 @@ public interface Feature extends Type, SysMLType {
 
     List<? extends TypeFeaturing> getOwnedTypeFeaturing();
 
+    Boolean getIsDerived();
+
     List<? extends Feature> getChainingFeature();
 
-    List<? extends FeatureChaining> getOwnedFeatureChaining();
+    Collection<? extends FeatureInverting> getOwnedFeatureInverting();
 
-    Boolean getIsDerived();
+    List<? extends FeatureChaining> getOwnedFeatureChaining();
 
     Boolean getIsReadOnly();
 
-    Boolean getIsEnd();
+    Boolean getIsPortion();
 
     FeatureDirectionKind getDirection();
 

diff --git a/app/org/omg/sysml/metamodel/FeatureInverting.java b/app/org/omg/sysml/metamodel/FeatureInverting.java
@@ -0,0 +1,35 @@
+/*
+ * SysML v2 REST/HTTP Pilot Implementation
+ * Copyright (C) 2020 InterCAX LLC
+ * Copyright (C) 2020 California Institute of Technology ("Caltech")
+ * Copyright (C) 2021-2022 Twingineer LLC
+ *
+ * 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;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+public interface FeatureInverting extends Relationship, SysMLType {
+    Feature getFeatureInverted();
+
+    Feature getInvertingFeature();
+
+    Feature getOwningFeature();
+}
diff --git a/app/org/omg/sysml/metamodel/FlowConnectionUsage.java b/app/org/omg/sysml/metamodel/FlowConnectionUsage.java
@@ -26,6 +26,6 @@
 import java.util.List;
 import java.util.Set;
 
-public interface FlowConnectionUsage extends ConnectionUsage, ItemFlow, SysMLType {
+public interface FlowConnectionUsage extends ItemFlow, ConnectionUsage, SysMLType {
 
 }
diff --git a/app/org/omg/sysml/metamodel/MetadataDefinition.java b/app/org/omg/sysml/metamodel/MetadataDefinition.java
@@ -26,6 +26,6 @@
 import java.util.List;
 import java.util.Set;
 
-public interface MetadataDefinition extends Metaclass, ItemDefinition, SysMLType {
+public interface MetadataDefinition extends ItemDefinition, Metaclass, SysMLType {
 
 }
diff --git a/app/org/omg/sysml/metamodel/MetadataUsage.java b/app/org/omg/sysml/metamodel/MetadataUsage.java
@@ -26,6 +26,6 @@
 import java.util.List;
 import java.util.Set;
 
-public interface MetadataUsage extends MetadataFeature, ItemUsage, SysMLType {
+public interface MetadataUsage extends ItemUsage, MetadataFeature, SysMLType {
     Metaclass getMetadataDefinition();
 }
diff --git a/app/org/omg/sysml/metamodel/SuccessionAsUsage.java b/app/org/omg/sysml/metamodel/SuccessionAsUsage.java
@@ -26,6 +26,6 @@
 import java.util.List;
 import java.util.Set;
 
-public interface SuccessionAsUsage extends ConnectorAsUsage, Succession, SysMLType {
+public interface SuccessionAsUsage extends Succession, ConnectorAsUsage, SysMLType {
 
 }
diff --git a/app/org/omg/sysml/metamodel/SuccessionFlowConnectionUsage.java b/app/org/omg/sysml/metamodel/SuccessionFlowConnectionUsage.java
@@ -26,6 +26,6 @@
 import java.util.List;
 import java.util.Set;
 
-public interface SuccessionFlowConnectionUsage extends SuccessionItemFlow, FlowConnectionUsage, SysMLType {
+public interface SuccessionFlowConnectionUsage extends FlowConnectionUsage, SuccessionItemFlow, SysMLType {
 
 }
diff --git a/app/org/omg/sysml/metamodel/impl/AcceptActionUsageImpl.java b/app/org/omg/sysml/metamodel/impl/AcceptActionUsageImpl.java
@@ -1805,6 +1805,32 @@ public void setOwnedFeatureChaining(List<FeatureChaining> ownedFeatureChaining)
 
 
 
+    // @info.archinnov.achilles.annotations.Transient
+    // @info.archinnov.achilles.annotations.Column("ownedFeatureInverting")
+    private Collection<FeatureInverting> ownedFeatureInverting;
+
+    @JsonGetter
+    @JsonSerialize(contentUsing = DataSerializer.class)
+    // @javax.persistence.Transient
+    @ManyToAny(metaDef = "FeatureInvertingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY)
+    @JoinTable(name = "AcceptActionUsage_ownedFeatureInverting",
+            joinColumns = @JoinColumn(name = "class_id"),
+            inverseJoinColumns = @JoinColumn(name = "attribute_id"))
+    public Collection<FeatureInverting> getOwnedFeatureInverting() {
+        if (ownedFeatureInverting == null) {
+            ownedFeatureInverting = new ArrayList<>();
+        }
+        return ownedFeatureInverting;
+    }
+
+    @JsonSetter
+    @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureInvertingImpl.class)
+    public void setOwnedFeatureInverting(Collection<FeatureInverting> ownedFeatureInverting) {
+        this.ownedFeatureInverting = ownedFeatureInverting;
+    }
+
+
+
     // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("ownedFeatureMembership")
     private List<FeatureMembership> ownedFeatureMembership;

diff --git a/app/org/omg/sysml/metamodel/impl/ActionUsageImpl.java b/app/org/omg/sysml/metamodel/impl/ActionUsageImpl.java
@@ -1805,6 +1805,32 @@ public void setOwnedFeatureChaining(List<FeatureChaining> ownedFeatureChaining)
 
 
 
+    // @info.archinnov.achilles.annotations.Transient
+    // @info.archinnov.achilles.annotations.Column("ownedFeatureInverting")
+    private Collection<FeatureInverting> ownedFeatureInverting;
+
+    @JsonGetter
+    @JsonSerialize(contentUsing = DataSerializer.class)
+    // @javax.persistence.Transient
+    @ManyToAny(metaDef = "FeatureInvertingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY)
+    @JoinTable(name = "ActionUsage_ownedFeatureInverting",
+            joinColumns = @JoinColumn(name = "class_id"),
+            inverseJoinColumns = @JoinColumn(name = "attribute_id"))
+    public Collection<FeatureInverting> getOwnedFeatureInverting() {
+        if (ownedFeatureInverting == null) {
+            ownedFeatureInverting = new ArrayList<>();
+        }
+        return ownedFeatureInverting;
+    }
+
+    @JsonSetter
+    @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureInvertingImpl.class)
+    public void setOwnedFeatureInverting(Collection<FeatureInverting> ownedFeatureInverting) {
+        this.ownedFeatureInverting = ownedFeatureInverting;
+    }
+
+
+
     // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("ownedFeatureMembership")
     private List<FeatureMembership> ownedFeatureMembership;

diff --git a/app/org/omg/sysml/metamodel/impl/AllocationUsageImpl.java b/app/org/omg/sysml/metamodel/impl/AllocationUsageImpl.java
@@ -1899,6 +1899,32 @@ public void setOwnedFeatureChaining(List<FeatureChaining> ownedFeatureChaining)
 
 
 
+    // @info.archinnov.achilles.annotations.Transient
+    // @info.archinnov.achilles.annotations.Column("ownedFeatureInverting")
+    private Collection<FeatureInverting> ownedFeatureInverting;
+
+    @JsonGetter
+    @JsonSerialize(contentUsing = DataSerializer.class)
+    // @javax.persistence.Transient
+    @ManyToAny(metaDef = "FeatureInvertingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY)
+    @JoinTable(name = "AllocationUsage_ownedFeatureInverting",
+            joinColumns = @JoinColumn(name = "class_id"),
+            inverseJoinColumns = @JoinColumn(name = "attribute_id"))
+    public Collection<FeatureInverting> getOwnedFeatureInverting() {
+        if (ownedFeatureInverting == null) {
+            ownedFeatureInverting = new ArrayList<>();
+        }
+        return ownedFeatureInverting;
+    }
+
+    @JsonSetter
+    @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureInvertingImpl.class)
+    public void setOwnedFeatureInverting(Collection<FeatureInverting> ownedFeatureInverting) {
+        this.ownedFeatureInverting = ownedFeatureInverting;
+    }
+
+
+
     // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("ownedFeatureMembership")
     private List<FeatureMembership> ownedFeatureMembership;

diff --git a/app/org/omg/sysml/metamodel/impl/AnalysisCaseUsageImpl.java b/app/org/omg/sysml/metamodel/impl/AnalysisCaseUsageImpl.java
@@ -1980,6 +1980,32 @@ public void setOwnedFeatureChaining(List<FeatureChaining> ownedFeatureChaining)
 
 
 
+    // @info.archinnov.achilles.annotations.Transient
+    // @info.archinnov.achilles.annotations.Column("ownedFeatureInverting")
+    private Collection<FeatureInverting> ownedFeatureInverting;
+
+    @JsonGetter
+    @JsonSerialize(contentUsing = DataSerializer.class)
+    // @javax.persistence.Transient
+    @ManyToAny(metaDef = "FeatureInvertingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY)
+    @JoinTable(name = "AnalysisCaseUsage_ownedFeatureInverting",
+            joinColumns = @JoinColumn(name = "class_id"),
+            inverseJoinColumns = @JoinColumn(name = "attribute_id"))
+    public Collection<FeatureInverting> getOwnedFeatureInverting() {
+        if (ownedFeatureInverting == null) {
+            ownedFeatureInverting = new ArrayList<>();
+        }
+        return ownedFeatureInverting;
+    }
+
+    @JsonSetter
+    @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureInvertingImpl.class)
+    public void setOwnedFeatureInverting(Collection<FeatureInverting> ownedFeatureInverting) {
+        this.ownedFeatureInverting = ownedFeatureInverting;
+    }
+
+
+
     // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("ownedFeatureMembership")
     private List<FeatureMembership> ownedFeatureMembership;

diff --git a/app/org/omg/sysml/metamodel/impl/AnnotationImpl.java b/app/org/omg/sysml/metamodel/impl/AnnotationImpl.java
@@ -332,11 +332,13 @@ public void setOwner(Element owner) {
 
 
 
+    // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("owningAnnotatedElement")
     private Element owningAnnotatedElement;
 
     @JsonGetter
     @JsonSerialize(using = DataSerializer.class)
+    // @javax.persistence.Transient
     @Any(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "owningAnnotatedElement_type"), fetch = FetchType.LAZY)
     @JoinColumn(name = "owningAnnotatedElement_id", table = "Annotation")
     public Element getOwningAnnotatedElement() {

diff --git a/app/org/omg/sysml/metamodel/impl/AssertConstraintUsageImpl.java b/app/org/omg/sysml/metamodel/impl/AssertConstraintUsageImpl.java
@@ -1876,6 +1876,32 @@ public void setOwnedFeatureChaining(List<FeatureChaining> ownedFeatureChaining)
 
 
 
+    // @info.archinnov.achilles.annotations.Transient
+    // @info.archinnov.achilles.annotations.Column("ownedFeatureInverting")
+    private Collection<FeatureInverting> ownedFeatureInverting;
+
+    @JsonGetter
+    @JsonSerialize(contentUsing = DataSerializer.class)
+    // @javax.persistence.Transient
+    @ManyToAny(metaDef = "FeatureInvertingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY)
+    @JoinTable(name = "AssertConstraintUsage_ownedFeatureInverting",
+            joinColumns = @JoinColumn(name = "class_id"),
+            inverseJoinColumns = @JoinColumn(name = "attribute_id"))
+    public Collection<FeatureInverting> getOwnedFeatureInverting() {
+        if (ownedFeatureInverting == null) {
+            ownedFeatureInverting = new ArrayList<>();
+        }
+        return ownedFeatureInverting;
+    }
+
+    @JsonSetter
+    @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureInvertingImpl.class)
+    public void setOwnedFeatureInverting(Collection<FeatureInverting> ownedFeatureInverting) {
+        this.ownedFeatureInverting = ownedFeatureInverting;
+    }
+
+
+
     // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("ownedFeatureMembership")
     private List<FeatureMembership> ownedFeatureMembership;

diff --git a/app/org/omg/sysml/metamodel/impl/AssignmentActionUsageImpl.java b/app/org/omg/sysml/metamodel/impl/AssignmentActionUsageImpl.java
@@ -1805,6 +1805,32 @@ public void setOwnedFeatureChaining(List<FeatureChaining> ownedFeatureChaining)
 
 
 
+    // @info.archinnov.achilles.annotations.Transient
+    // @info.archinnov.achilles.annotations.Column("ownedFeatureInverting")
+    private Collection<FeatureInverting> ownedFeatureInverting;
+
+    @JsonGetter
+    @JsonSerialize(contentUsing = DataSerializer.class)
+    // @javax.persistence.Transient
+    @ManyToAny(metaDef = "FeatureInvertingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY)
+    @JoinTable(name = "AssignmentActionUsage_ownedFeatureInverting",
+            joinColumns = @JoinColumn(name = "class_id"),
+            inverseJoinColumns = @JoinColumn(name = "attribute_id"))
+    public Collection<FeatureInverting> getOwnedFeatureInverting() {
+        if (ownedFeatureInverting == null) {
+            ownedFeatureInverting = new ArrayList<>();
+        }
+        return ownedFeatureInverting;
+    }
+
+    @JsonSetter
+    @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureInvertingImpl.class)
+    public void setOwnedFeatureInverting(Collection<FeatureInverting> ownedFeatureInverting) {
+        this.ownedFeatureInverting = ownedFeatureInverting;
+    }
+
+
+
     // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("ownedFeatureMembership")
     private List<FeatureMembership> ownedFeatureMembership;

diff --git a/app/org/omg/sysml/metamodel/impl/AttributeUsageImpl.java b/app/org/omg/sysml/metamodel/impl/AttributeUsageImpl.java
@@ -1714,6 +1714,32 @@ public void setOwnedFeatureChaining(List<FeatureChaining> ownedFeatureChaining)
 
 
 
+    // @info.archinnov.achilles.annotations.Transient
+    // @info.archinnov.achilles.annotations.Column("ownedFeatureInverting")
+    private Collection<FeatureInverting> ownedFeatureInverting;
+
+    @JsonGetter
+    @JsonSerialize(contentUsing = DataSerializer.class)
+    // @javax.persistence.Transient
+    @ManyToAny(metaDef = "FeatureInvertingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY)
+    @JoinTable(name = "AttributeUsage_ownedFeatureInverting",
+            joinColumns = @JoinColumn(name = "class_id"),
+            inverseJoinColumns = @JoinColumn(name = "attribute_id"))
+    public Collection<FeatureInverting> getOwnedFeatureInverting() {
+        if (ownedFeatureInverting == null) {
+            ownedFeatureInverting = new ArrayList<>();
+        }
+        return ownedFeatureInverting;
+    }
+
+    @JsonSetter
+    @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureInvertingImpl.class)
+    public void setOwnedFeatureInverting(Collection<FeatureInverting> ownedFeatureInverting) {
+        this.ownedFeatureInverting = ownedFeatureInverting;
+    }
+
+
+
     // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("ownedFeatureMembership")
     private List<FeatureMembership> ownedFeatureMembership;