Merge pull request #65 from Systems-Modeling/feature/ST5AS-188

ST5AS-188 Update to 2022-02 metamodel baseline

Author: ivan-gomes

app/dao/impl/jpa/JpaDataDao.java

@@ -31,7 +31,6 @@
 import org.omg.sysml.internal.CommitDataVersionIndex;
 import org.omg.sysml.internal.impl.CommitDataVersionIndexImpl;
 import org.omg.sysml.internal.impl.CommitDataVersionIndexImpl_;
-import org.omg.sysml.internal.impl.CommitIndexImpl_;
 import org.omg.sysml.lifecycle.Commit;
 import org.omg.sysml.lifecycle.Data;
 import org.omg.sysml.lifecycle.DataIdentity;

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

@@ -54,6 +54,7 @@
                         @MetaValue(value = "CaseUsage", targetEntity = CaseUsageImpl.class),
                         @MetaValue(value = "Class", targetEntity = ClassImpl.class),
                         @MetaValue(value = "Classifier", targetEntity = ClassifierImpl.class),
+                        @MetaValue(value = "CollectExpression", targetEntity = CollectExpressionImpl.class),
                         @MetaValue(value = "Comment", targetEntity = CommentImpl.class),
                         @MetaValue(value = "ConcernDefinition", targetEntity = ConcernDefinitionImpl.class),
                         @MetaValue(value = "ConcernUsage", targetEntity = ConcernUsageImpl.class),
@@ -83,6 +84,7 @@
                         @MetaValue(value = "Expose", targetEntity = ExposeImpl.class),
                         @MetaValue(value = "Expression", targetEntity = ExpressionImpl.class),
                         @MetaValue(value = "Feature", targetEntity = FeatureImpl.class),
+                        @MetaValue(value = "FeatureChainExpression", targetEntity = FeatureChainExpressionImpl.class),
                         @MetaValue(value = "FeatureChaining", targetEntity = FeatureChainingImpl.class),
                         @MetaValue(value = "FeatureMembership", targetEntity = FeatureMembershipImpl.class),
                         @MetaValue(value = "FeatureReferenceExpression", targetEntity = FeatureReferenceExpressionImpl.class),
@@ -132,8 +134,6 @@
                         @MetaValue(value = "ParameterMembership", targetEntity = ParameterMembershipImpl.class),
                         @MetaValue(value = "PartDefinition", targetEntity = PartDefinitionImpl.class),
                         @MetaValue(value = "PartUsage", targetEntity = PartUsageImpl.class),
-                        @MetaValue(value = "PathSelectExpression", targetEntity = PathSelectExpressionImpl.class),
-                        @MetaValue(value = "PathStepExpression", targetEntity = PathStepExpressionImpl.class),
                         @MetaValue(value = "PerformActionUsage", targetEntity = PerformActionUsageImpl.class),
                         @MetaValue(value = "PortConjugation", targetEntity = PortConjugationImpl.class),
                         @MetaValue(value = "PortDefinition", targetEntity = PortDefinitionImpl.class),
@@ -152,6 +152,7 @@
                         @MetaValue(value = "ResultExpressionMembership", targetEntity = ResultExpressionMembershipImpl.class),
                         @MetaValue(value = "ReturnParameterMembership", targetEntity = ReturnParameterMembershipImpl.class),
                         @MetaValue(value = "SatisfyRequirementUsage", targetEntity = SatisfyRequirementUsageImpl.class),
+                        @MetaValue(value = "SelectExpression", targetEntity = SelectExpressionImpl.class),
                         @MetaValue(value = "SendActionUsage", targetEntity = SendActionUsageImpl.class),
                         @MetaValue(value = "SourceEnd", targetEntity = SourceEndImpl.class),
                         @MetaValue(value = "Specialization", targetEntity = SpecializationImpl.class),

…/sysml/metamodel/PathStepExpression.java …g/sysml/metamodel/CollectExpression.javaapp/org/omg/sysml/metamodel/PathStepExpression.java renamed to app/org/omg/sysml/metamodel/CollectExpression.java app/org/omg/sysml/metamodel/PathStepExpression.java renamed to app/org/omg/sysml/metamodel/CollectExpression.java

@@ -25,6 +25,6 @@
 import java.util.List;
 import java.util.Set;
 
-public interface PathStepExpression extends OperatorExpression, SysMLType {
+public interface CollectExpression extends OperatorExpression, SysMLType {
     String getOperator();
 }

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

@@ -0,0 +1,32 @@
+/*
+ * 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;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+public interface FeatureChainExpression extends OperatorExpression, SysMLType {
+    String getOperator();
+
+    Feature getTargetFeature();
+}

…ysml/metamodel/PathSelectExpression.java …mg/sysml/metamodel/SelectExpression.javaapp/org/omg/sysml/metamodel/PathSelectExpression.java renamed to app/org/omg/sysml/metamodel/SelectExpression.java app/org/omg/sysml/metamodel/PathSelectExpression.java renamed to app/org/omg/sysml/metamodel/SelectExpression.java

@@ -25,6 +25,6 @@
 import java.util.List;
 import java.util.Set;
 
-public interface PathSelectExpression extends OperatorExpression, SysMLType {
+public interface SelectExpression extends OperatorExpression, SysMLType {
     String getOperator();
 }