Merge branch 'release/2025-02'

Author: ivan-gomes

app/org/omg/sysml/lifecycle/CommitReference.java

@@ -42,5 +42,7 @@ public interface CommitReference extends Record {
 
     ZonedDateTime getCreated();
 
+    ZonedDateTime getDeleted();
+
     void setCreated(ZonedDateTime created);
 }

app/org/omg/sysml/lifecycle/impl/BranchImpl.java

@@ -94,6 +94,12 @@ public void setCreated(ZonedDateTime created) {
         this.created = created;
     }
 
+    @Override
+    @Transient
+    public ZonedDateTime getDeleted() {
+        return null;
+    }
+
     @Transient
     @JsonProperty("@type")
     public String getType() {

app/org/omg/sysml/lifecycle/impl/CommitImpl.java

@@ -44,7 +44,6 @@ public class CommitImpl extends RecordImpl implements Commit {
     private Project owningProject;
     private Set<DataVersion> change;
     private ZonedDateTime created;
-    private String description;
     private Commit previousCommit;
 
     @Override
@@ -83,21 +82,6 @@ public void setCreated(ZonedDateTime created) {
         this.created = created;
     }
 
-    @JsonProperty(required = true)
-    @JsonGetter
-    @Lob
-    @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType")
-    @javax.persistence.Column(name = "description", table = "Commit")
-    public String getDescription() {
-        return description;
-    }
-
-    @JsonProperty(required = true)
-    @JsonSetter
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
     @ManyToOne(targetEntity = CommitImpl.class, fetch = FetchType.LAZY)
     @JsonSerialize(as = CommitImpl.class, using = RecordSerialization.RecordSerializer.class)
     public Commit getPreviousCommit() {

app/org/omg/sysml/lifecycle/impl/TagImpl.java

@@ -91,6 +91,12 @@ public void setCreated(ZonedDateTime created) {
         this.created = created;
     }
 
+    @Override
+    @Transient
+    public ZonedDateTime getDeleted() {
+        return null;
+    }
+
     @Transient
     @JsonProperty("@type")
     public String getType() {

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

@@ -66,6 +66,7 @@
                         @MetaValue(value = "ConnectorAsUsage", targetEntity = ConnectorAsUsageImpl.class),
                         @MetaValue(value = "ConstraintDefinition", targetEntity = ConstraintDefinitionImpl.class),
                         @MetaValue(value = "ConstraintUsage", targetEntity = ConstraintUsageImpl.class),
+                        @MetaValue(value = "ConstructorExpression", targetEntity = ConstructorExpressionImpl.class),
                         @MetaValue(value = "ControlNode", targetEntity = ControlNodeImpl.class),
                         @MetaValue(value = "CrossSubsetting", targetEntity = CrossSubsettingImpl.class),
                         @MetaValue(value = "DataType", targetEntity = DataTypeImpl.class),
@@ -92,9 +93,10 @@
                         @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 = "Flow", targetEntity = FlowImpl.class),
+                        @MetaValue(value = "FlowDefinition", targetEntity = FlowDefinitionImpl.class),
+                        @MetaValue(value = "FlowEnd", targetEntity = FlowEndImpl.class),
+                        @MetaValue(value = "FlowUsage", targetEntity = FlowUsageImpl.class),
                         @MetaValue(value = "ForLoopActionUsage", targetEntity = ForLoopActionUsageImpl.class),
                         @MetaValue(value = "ForkNode", targetEntity = ForkNodeImpl.class),
                         @MetaValue(value = "FramedConcernMembership", targetEntity = FramedConcernMembershipImpl.class),
@@ -103,20 +105,17 @@
                         @MetaValue(value = "Import", targetEntity = ImportImpl.class),
                         @MetaValue(value = "IncludeUseCaseUsage", targetEntity = IncludeUseCaseUsageImpl.class),
                         @MetaValue(value = "IndexExpression", targetEntity = IndexExpressionImpl.class),
+                        @MetaValue(value = "InstantiationExpression", targetEntity = InstantiationExpressionImpl.class),
                         @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),
-                        @MetaValue(value = "ItemFeature", targetEntity = ItemFeatureImpl.class),
-                        @MetaValue(value = "ItemFlow", targetEntity = ItemFlowImpl.class),
-                        @MetaValue(value = "ItemFlowEnd", targetEntity = ItemFlowEndImpl.class),
                         @MetaValue(value = "ItemUsage", targetEntity = ItemUsageImpl.class),
                         @MetaValue(value = "JoinNode", targetEntity = JoinNodeImpl.class),
                         @MetaValue(value = "LibraryPackage", targetEntity = LibraryPackageImpl.class),
-                        @MetaValue(value = "LifeClass", targetEntity = LifeClassImpl.class),
                         @MetaValue(value = "LiteralBoolean", targetEntity = LiteralBooleanImpl.class),
                         @MetaValue(value = "LiteralExpression", targetEntity = LiteralExpressionImpl.class),
                         @MetaValue(value = "LiteralInfinity", targetEntity = LiteralInfinityImpl.class),
@@ -148,6 +147,7 @@
                         @MetaValue(value = "ParameterMembership", targetEntity = ParameterMembershipImpl.class),
                         @MetaValue(value = "PartDefinition", targetEntity = PartDefinitionImpl.class),
                         @MetaValue(value = "PartUsage", targetEntity = PartUsageImpl.class),
+                        @MetaValue(value = "PayloadFeature", targetEntity = PayloadFeatureImpl.class),
                         @MetaValue(value = "PerformActionUsage", targetEntity = PerformActionUsageImpl.class),
                         @MetaValue(value = "PortConjugation", targetEntity = PortConjugationImpl.class),
                         @MetaValue(value = "PortDefinition", targetEntity = PortDefinitionImpl.class),
@@ -180,8 +180,8 @@
                         @MetaValue(value = "Subsetting", targetEntity = SubsettingImpl.class),
                         @MetaValue(value = "Succession", targetEntity = SuccessionImpl.class),
                         @MetaValue(value = "SuccessionAsUsage", targetEntity = SuccessionAsUsageImpl.class),
-                        @MetaValue(value = "SuccessionFlowConnectionUsage", targetEntity = SuccessionFlowConnectionUsageImpl.class),
-                        @MetaValue(value = "SuccessionItemFlow", targetEntity = SuccessionItemFlowImpl.class),
+                        @MetaValue(value = "SuccessionFlow", targetEntity = SuccessionFlowImpl.class),
+                        @MetaValue(value = "SuccessionFlowUsage", targetEntity = SuccessionFlowUsageImpl.class),
                         @MetaValue(value = "TerminateActionUsage", targetEntity = TerminateActionUsageImpl.class),
                         @MetaValue(value = "TextualRepresentation", targetEntity = TextualRepresentationImpl.class),
                         @MetaValue(value = "TransitionFeatureMembership", targetEntity = TransitionFeatureMembershipImpl.class),

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

@@ -10,6 +10,8 @@ public interface Connector extends Feature, Relationship, SysMLType {
 
     List<? extends Feature> getConnectorEnd();
 
+    Type getDefaultFeaturingType();
+
     List<? extends Feature> getRelatedFeature();
 
     Feature getSourceFeature();

app/org/omg/sysml/metamodel/LifeClass.java renamed to app/org/omg/sysml/metamodel/ConstructorExpression.java

@@ -5,7 +5,4 @@
 import java.util.List;
 import java.util.Set;
 
-public interface LifeClass extends Class, SysMLType {
-    @Override
-    Boolean getIsSufficient();
-}
+public interface ConstructorExpression extends InstantiationExpression, SysMLType {}

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

@@ -30,7 +30,7 @@ public interface Definition extends Classifier, SysMLType {
 
     List<? extends EnumerationUsage> getOwnedEnumeration();
 
-    Collection<? extends FlowConnectionUsage> getOwnedFlow();
+    Collection<? extends FlowUsage> getOwnedFlow();
 
     List<? extends InterfaceUsage> getOwnedInterface();
 

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

@@ -20,6 +20,8 @@ public interface Feature extends Type, SysMLType {
 
     Boolean getIsComposite();
 
+    Boolean getIsConstant();
+
     Boolean getIsDerived();
 
     Boolean getIsEnd();
@@ -28,10 +30,10 @@ public interface Feature extends Type, SysMLType {
 
     Boolean getIsPortion();
 
-    Boolean getIsReadOnly();
-
     Boolean getIsUnique();
 
+    Boolean getIsVariable();
+
     CrossSubsetting getOwnedCrossSubsetting();
 
     List<? extends FeatureChaining> getOwnedFeatureChaining();

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

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

app/org/omg/sysml/metamodel/ItemFlow.java renamed to app/org/omg/sysml/metamodel/Flow.java

@@ -5,14 +5,14 @@
 import java.util.List;
 import java.util.Set;
 
-public interface ItemFlow extends Connector, Step, SysMLType {
-    List<? extends Interaction> getInteraction();
+public interface Flow extends Connector, Step, SysMLType {
+    List<? extends FlowEnd> getFlowEnd();
 
-    ItemFeature getItemFeature();
+    List<? extends Interaction> getInteraction();
 
-    List<? extends ItemFlowEnd> getItemFlowEnd();
+    PayloadFeature getPayloadFeature();
 
-    List<? extends Classifier> getItemType();
+    List<? extends Classifier> getPayloadType();
 
     Feature getSourceOutputFeature();
 

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

@@ -5,8 +5,6 @@
 import java.util.List;
 import java.util.Set;
 
-public interface Featuring extends Relationship, SysMLType {
-    Feature getFeature();
-
-    Type getType();
+public interface FlowDefinition extends Interaction, ActionDefinition, SysMLType {
+    Collection<? extends Usage> getFlowEnd();
 }

app/org/omg/sysml/metamodel/Featuring.java renamed to app/org/omg/sysml/metamodel/FlowDefinition.java

@@ -5,4 +5,4 @@
 import java.util.List;
 import java.util.Set;
 
-public interface ItemFlowEnd extends Feature, SysMLType {}
+public interface FlowEnd extends Feature, SysMLType {}

app/org/omg/sysml/metamodel/ItemFlowEnd.java renamed to app/org/omg/sysml/metamodel/FlowEnd.java

@@ -0,0 +1,10 @@
+// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+package org.omg.sysml.metamodel;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+public interface FlowUsage extends ConnectorAsUsage, Flow, ActionUsage, SysMLType {
+    List<? extends Interaction> getFlowDefinition();
+}

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

@@ -5,6 +5,8 @@
 import java.util.List;
 import java.util.Set;
 
-public interface FlowConnectionDefinition extends Interaction, ActionDefinition, SysMLType {
-    Collection<? extends Usage> getFlowConnectionEnd();
+public interface InstantiationExpression extends Expression, SysMLType {
+    List<? extends Expression> getArgument();
+
+    Type getInstantiatedType();
 }

app/org/omg/sysml/metamodel/FlowConnectionDefinition.java renamed to app/org/omg/sysml/metamodel/InstantiationExpression.java

@@ -5,6 +5,4 @@
 import java.util.List;
 import java.util.Set;
 
-public interface InvocationExpression extends Expression, SysMLType {
-    List<? extends Expression> getArgument();
-}
+public interface InvocationExpression extends InstantiationExpression, SysMLType {}

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

@@ -7,6 +7,4 @@
 
 public interface OccurrenceDefinition extends Definition, Class, SysMLType {
     Boolean getIsIndividual();
-
-    LifeClass getLifeClass();
 }

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

@@ -5,4 +5,4 @@
 import java.util.List;
 import java.util.Set;
 
-public interface ItemFeature extends Feature, SysMLType {}
+public interface PayloadFeature extends Feature, SysMLType {}

app/org/omg/sysml/metamodel/ItemFeature.java renamed to app/org/omg/sysml/metamodel/PayloadFeature.java

@@ -5,12 +5,4 @@
 import java.util.List;
 import java.util.Set;
 
-public interface Succession extends Connector, SysMLType {
-    Collection<? extends Step> getEffectStep();
-
-    Collection<? extends Expression> getGuardExpression();
-
-    Step getTransitionStep();
-
-    Collection<? extends Step> getTriggerStep();
-}
+public interface Succession extends Connector, SysMLType {}

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

@@ -5,4 +5,4 @@
 import java.util.List;
 import java.util.Set;
 
-public interface SuccessionItemFlow extends ItemFlow, Succession, SysMLType {}
+public interface SuccessionFlow extends Succession, Flow, SysMLType {}

app/org/omg/sysml/metamodel/SuccessionItemFlow.java renamed to app/org/omg/sysml/metamodel/SuccessionFlow.java

@@ -0,0 +1,8 @@
+// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+package org.omg.sysml.metamodel;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+public interface SuccessionFlowUsage extends SuccessionFlow, FlowUsage, SysMLType {}

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

@@ -5,7 +5,7 @@
 import java.util.List;
 import java.util.Set;
 
-public interface TypeFeaturing extends Featuring, SysMLType {
+public interface TypeFeaturing extends Relationship, SysMLType {
     Feature getFeatureOfType();
 
     Type getFeaturingType();

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

@@ -14,6 +14,8 @@ public interface Usage extends Feature, SysMLType {
 
     Boolean getIsVariation();
 
+    Boolean getMayTimeVary();
+
     List<? extends ActionUsage> getNestedAction();
 
     List<? extends AllocationUsage> getNestedAllocation();
@@ -34,7 +36,7 @@ public interface Usage extends Feature, SysMLType {
 
     List<? extends EnumerationUsage> getNestedEnumeration();
 
-    Collection<? extends FlowConnectionUsage> getNestedFlow();
+    Collection<? extends FlowUsage> getNestedFlow();
 
     List<? extends InterfaceUsage> getNestedInterface();