Merge pull request #77 from Systems-Modeling/feature/ST5AS-208

ST5AS-208 Update to 2022-08 baseline

Author: ivan-gomes

app/org/omg/sysml/lifecycle/impl/package-info.java

@@ -71,6 +71,7 @@
                         @MetaValue(value = "DecisionNode", targetEntity = DecisionNodeImpl.class),
                         @MetaValue(value = "Definition", targetEntity = DefinitionImpl.class),
                         @MetaValue(value = "Dependency", targetEntity = DependencyImpl.class),
+                        @MetaValue(value = "Differencing", targetEntity = DifferencingImpl.class),
                         @MetaValue(value = "Disjoining", targetEntity = DisjoiningImpl.class),
                         @MetaValue(value = "Documentation", targetEntity = DocumentationImpl.class),
                         @MetaValue(value = "Element", targetEntity = ElementImpl.class),
@@ -90,6 +91,8 @@
                         @MetaValue(value = "FeatureReferenceExpression", targetEntity = FeatureReferenceExpressionImpl.class),
                         @MetaValue(value = "FeatureTyping", targetEntity = FeatureTypingImpl.class),
                         @MetaValue(value = "FeatureValue", targetEntity = FeatureValueImpl.class),
+                        @MetaValue(value = "Featuring", targetEntity = FeaturingImpl.class),
+                        @MetaValue(value = "FlowConnectionDefinition", targetEntity = FlowConnectionDefinitionImpl.class),
                         @MetaValue(value = "FlowConnectionUsage", targetEntity = FlowConnectionUsageImpl.class),
                         @MetaValue(value = "ForLoopActionUsage", targetEntity = ForLoopActionUsageImpl.class),
                         @MetaValue(value = "ForkNode", targetEntity = ForkNodeImpl.class),
@@ -101,6 +104,7 @@
                         @MetaValue(value = "Interaction", targetEntity = InteractionImpl.class),
                         @MetaValue(value = "InterfaceDefinition", targetEntity = InterfaceDefinitionImpl.class),
                         @MetaValue(value = "InterfaceUsage", targetEntity = InterfaceUsageImpl.class),
+                        @MetaValue(value = "Intersecting", targetEntity = IntersectingImpl.class),
                         @MetaValue(value = "Invariant", targetEntity = InvariantImpl.class),
                         @MetaValue(value = "InvocationExpression", targetEntity = InvocationExpressionImpl.class),
                         @MetaValue(value = "ItemDefinition", targetEntity = ItemDefinitionImpl.class),
@@ -143,8 +147,8 @@
                         @MetaValue(value = "PortUsage", targetEntity = PortUsageImpl.class),
                         @MetaValue(value = "PortioningFeature", targetEntity = PortioningFeatureImpl.class),
                         @MetaValue(value = "Predicate", targetEntity = PredicateImpl.class),
-                        @MetaValue(value = "PrefixComment", targetEntity = PrefixCommentImpl.class),
                         @MetaValue(value = "Redefinition", targetEntity = RedefinitionImpl.class),
+                        @MetaValue(value = "ReferenceSubsetting", targetEntity = ReferenceSubsettingImpl.class),
                         @MetaValue(value = "ReferenceUsage", targetEntity = ReferenceUsageImpl.class),
                         @MetaValue(value = "Relationship", targetEntity = RelationshipImpl.class),
                         @MetaValue(value = "RenderingDefinition", targetEntity = RenderingDefinitionImpl.class),
@@ -180,6 +184,7 @@
                         @MetaValue(value = "TriggerInvocationExpression", targetEntity = TriggerInvocationExpressionImpl.class),
                         @MetaValue(value = "Type", targetEntity = TypeImpl.class),
                         @MetaValue(value = "TypeFeaturing", targetEntity = TypeFeaturingImpl.class),
+                        @MetaValue(value = "Unioning", targetEntity = UnioningImpl.class),
                         @MetaValue(value = "Usage", targetEntity = UsageImpl.class),
                         @MetaValue(value = "UseCaseDefinition", targetEntity = UseCaseDefinitionImpl.class),
                         @MetaValue(value = "UseCaseUsage", targetEntity = UseCaseUsageImpl.class),

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

@@ -26,6 +26,6 @@
 import java.util.List;
 import java.util.Set;
 
-public interface BindingConnectorAsUsage extends BindingConnector, ConnectorAsUsage, SysMLType {
+public interface BindingConnectorAsUsage extends ConnectorAsUsage, BindingConnector, SysMLType {
 
 }

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

@@ -29,13 +29,13 @@
 public interface Connector extends Feature, Relationship, SysMLType {
     List<? extends Feature> getRelatedFeature();
 
-    Collection<? extends Association> getAssociation();
+    List<? extends Association> getAssociation();
 
     Boolean getIsDirected();
 
-    Collection<? extends Feature> getConnectorEnd();
+    List<? extends Feature> getConnectorEnd();
 
     Feature getSourceFeature();
 
-    Collection<? extends Feature> getTargetFeature();
+    List<? extends Feature> getTargetFeature();
 }

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

@@ -26,6 +26,6 @@
 import java.util.List;
 import java.util.Set;
 
-public interface ConnectorAsUsage extends Connector, Usage, SysMLType {
+public interface ConnectorAsUsage extends Usage, Connector, SysMLType {
 
 }

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

@@ -88,4 +88,6 @@ public interface Definition extends Classifier, SysMLType {
     List<? extends UseCaseUsage> getOwnedUseCase();
 
     Collection<? extends FlowConnectionUsage> getOwnedFlow();
+
+    List<? extends MetadataUsage> getOwnedMetadata();
 }

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

@@ -0,0 +1,33 @@
+/*
+ * 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 Differencing extends Relationship, SysMLType {
+    Type getTypeDifferenced();
+
+    Type getDifferencingType();
+}

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

@@ -51,9 +51,11 @@ public interface Element extends SysMLType {
 
     String getShortName();
 
-    String getEffectiveName();
-
     String getName();
 
+    String getEffectiveName();
+
     String getQualifiedName();
+
+    Boolean getIsImpliedIncluded();
 }

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

@@ -67,5 +67,7 @@ public interface Feature extends Type, SysMLType {
 
     FeatureDirectionKind getDirection();
 
+    ReferenceSubsetting getOwnedReferenceSubsetting();
+
     Boolean getIsNonunique();
 }

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

@@ -26,7 +26,7 @@
 import java.util.List;
 import java.util.Set;
 
-public interface FeatureMembership extends OwningMembership, TypeFeaturing, SysMLType {
+public interface FeatureMembership extends OwningMembership, Featuring, SysMLType {
     Type getOwningType();
 
     Feature getOwnedMemberFeature();

…g/omg/sysml/metamodel/PrefixComment.java …p/org/omg/sysml/metamodel/Featuring.javaapp/org/omg/sysml/metamodel/PrefixComment.java renamed to app/org/omg/sysml/metamodel/Featuring.java app/org/omg/sysml/metamodel/PrefixComment.java renamed to app/org/omg/sysml/metamodel/Featuring.java

@@ -26,6 +26,8 @@
 import java.util.List;
 import java.util.Set;
 
-public interface PrefixComment extends Comment, SysMLType {
+public interface Featuring extends Relationship, SysMLType {
+    Type getType();
 
+    Feature getFeature();
 }