Merge branch 'release/2024-12'

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

@@ -67,6 +67,7 @@
                         @MetaValue(value = "ConstraintDefinition", targetEntity = ConstraintDefinitionImpl.class),
                         @MetaValue(value = "ConstraintUsage", targetEntity = ConstraintUsageImpl.class),
                         @MetaValue(value = "ControlNode", targetEntity = ControlNodeImpl.class),
+                        @MetaValue(value = "CrossSubsetting", targetEntity = CrossSubsettingImpl.class),
                         @MetaValue(value = "DataType", targetEntity = DataTypeImpl.class),
                         @MetaValue(value = "DecisionNode", targetEntity = DecisionNodeImpl.class),
                         @MetaValue(value = "Definition", targetEntity = DefinitionImpl.class),
@@ -101,6 +102,7 @@
                         @MetaValue(value = "IfActionUsage", targetEntity = IfActionUsageImpl.class),
                         @MetaValue(value = "Import", targetEntity = ImportImpl.class),
                         @MetaValue(value = "IncludeUseCaseUsage", targetEntity = IncludeUseCaseUsageImpl.class),
+                        @MetaValue(value = "IndexExpression", targetEntity = IndexExpressionImpl.class),
                         @MetaValue(value = "Interaction", targetEntity = InteractionImpl.class),
                         @MetaValue(value = "InterfaceDefinition", targetEntity = InterfaceDefinitionImpl.class),
                         @MetaValue(value = "InterfaceUsage", targetEntity = InterfaceUsageImpl.class),

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

@@ -10,5 +10,7 @@ public interface AnnotatingElement extends Element, SysMLType {
 
     List<? extends Annotation> getAnnotation();
 
-    Collection<? extends Annotation> getOwnedAnnotatingRelationship();
+    List<? extends Annotation> getOwnedAnnotatingRelationship();
+
+    Annotation getOwningAnnotatingRelationship();
 }

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

@@ -10,6 +10,8 @@ public interface Annotation extends Relationship, SysMLType {
 
     AnnotatingElement getAnnotatingElement();
 
+    AnnotatingElement getOwnedAnnotatingElement();
+
     Element getOwningAnnotatedElement();
 
     AnnotatingElement getOwningAnnotatingElement();

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

@@ -5,4 +5,4 @@
 import java.util.List;
 import java.util.Set;
 
-public interface AssociationStructure extends Structure, Association, SysMLType {}
+public interface AssociationStructure extends Association, Structure, SysMLType {}

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

@@ -7,4 +7,7 @@
 
 public interface ConnectionDefinition extends AssociationStructure, PartDefinition, SysMLType {
     List<? extends Usage> getConnectionEnd();
+
+    @Override
+    Boolean getIsSufficient();
 }

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

@@ -0,0 +1,12 @@
+// 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 CrossSubsetting extends Subsetting, SysMLType {
+    Feature getCrossedFeature();
+
+    Feature getCrossingFeature();
+}

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

@@ -8,6 +8,8 @@
 public interface Feature extends Type, SysMLType {
     List<? extends Feature> getChainingFeature();
 
+    Feature getCrossFeature();
+
     FeatureDirectionKind getDirection();
 
     Type getEndOwningType();
@@ -30,6 +32,8 @@ public interface Feature extends Type, SysMLType {
 
     Boolean getIsUnique();
 
+    CrossSubsetting getOwnedCrossSubsetting();
+
     List<? extends FeatureChaining> getOwnedFeatureChaining();
 
     Collection<? extends FeatureInverting> getOwnedFeatureInverting();

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

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

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

@@ -5,4 +5,6 @@
 import java.util.List;
 import java.util.Set;
 
-public interface FlowConnectionDefinition extends Interaction, ConnectionDefinition, ActionDefinition, SysMLType {}
+public interface FlowConnectionDefinition extends Interaction, ActionDefinition, SysMLType {
+    Collection<? extends Usage> getFlowConnectionEnd();
+}

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

@@ -5,6 +5,6 @@
 import java.util.List;
 import java.util.Set;
 
-public interface FlowConnectionUsage extends ConnectionUsage, ItemFlow, ActionUsage, SysMLType {
+public interface FlowConnectionUsage extends ConnectorAsUsage, ItemFlow, ActionUsage, SysMLType {
     List<? extends Interaction> getFlowConnectionDefinition();
 }

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

@@ -0,0 +1,11 @@
+// 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 IndexExpression extends OperatorExpression, SysMLType {
+    @Override
+    String getOperator();
+}

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

@@ -5,4 +5,4 @@
 import java.util.List;
 import java.util.Set;
 
-public interface Interaction extends Behavior, Association, SysMLType {}
+public interface Interaction extends Association, Behavior, SysMLType {}

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

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

app/org/omg/sysml/metamodel/impl/AcceptActionUsageImpl.java

@@ -129,6 +129,24 @@ public void setChainingFeature(List<Feature> chainingFeature) {
         this.chainingFeature = chainingFeature;
     }
 
+    private Feature crossFeature;
+
+    @Override
+    @JsonGetter
+    @JsonSerialize(using = DataSerializer.class)
+    // @javax.persistence.Transient
+    @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "crossFeature_type"), fetch = FetchType.LAZY)
+    @JoinColumn(name = "crossFeature_id", table = "AcceptActionUsage")
+    public Feature getCrossFeature() {
+        return crossFeature;
+    }
+
+    @JsonSetter
+    @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class)
+    public void setCrossFeature(Feature crossFeature) {
+        this.crossFeature = crossFeature;
+    }
+
     private String declaredName;
 
     @Override
@@ -1476,6 +1494,24 @@ public void setOwnedConjugator(Conjugation ownedConjugator) {
         this.ownedConjugator = ownedConjugator;
     }
 
+    private CrossSubsetting ownedCrossSubsetting;
+
+    @Override
+    @JsonGetter
+    @JsonSerialize(using = DataSerializer.class)
+    // @javax.persistence.Transient
+    @Any(metaDef = "CrossSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedCrossSubsetting_type"), fetch = FetchType.LAZY)
+    @JoinColumn(name = "ownedCrossSubsetting_id", table = "AcceptActionUsage")
+    public CrossSubsetting getOwnedCrossSubsetting() {
+        return ownedCrossSubsetting;
+    }
+
+    @JsonSetter
+    @JsonDeserialize(using = DataDeserializer.class, as = CrossSubsettingImpl.class)
+    public void setOwnedCrossSubsetting(CrossSubsetting ownedCrossSubsetting) {
+        this.ownedCrossSubsetting = ownedCrossSubsetting;
+    }
+
     private List<Differencing> ownedDifferencing;
 
     @Override

app/org/omg/sysml/metamodel/impl/ActionUsageImpl.java

@@ -129,6 +129,24 @@ public void setChainingFeature(List<Feature> chainingFeature) {
         this.chainingFeature = chainingFeature;
     }
 
+    private Feature crossFeature;
+
+    @Override
+    @JsonGetter
+    @JsonSerialize(using = DataSerializer.class)
+    // @javax.persistence.Transient
+    @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "crossFeature_type"), fetch = FetchType.LAZY)
+    @JoinColumn(name = "crossFeature_id", table = "ActionUsage")
+    public Feature getCrossFeature() {
+        return crossFeature;
+    }
+
+    @JsonSetter
+    @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class)
+    public void setCrossFeature(Feature crossFeature) {
+        this.crossFeature = crossFeature;
+    }
+
     private String declaredName;
 
     @Override
@@ -1476,6 +1494,24 @@ public void setOwnedConjugator(Conjugation ownedConjugator) {
         this.ownedConjugator = ownedConjugator;
     }
 
+    private CrossSubsetting ownedCrossSubsetting;
+
+    @Override
+    @JsonGetter
+    @JsonSerialize(using = DataSerializer.class)
+    // @javax.persistence.Transient
+    @Any(metaDef = "CrossSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedCrossSubsetting_type"), fetch = FetchType.LAZY)
+    @JoinColumn(name = "ownedCrossSubsetting_id", table = "ActionUsage")
+    public CrossSubsetting getOwnedCrossSubsetting() {
+        return ownedCrossSubsetting;
+    }
+
+    @JsonSetter
+    @JsonDeserialize(using = DataDeserializer.class, as = CrossSubsettingImpl.class)
+    public void setOwnedCrossSubsetting(CrossSubsetting ownedCrossSubsetting) {
+        this.ownedCrossSubsetting = ownedCrossSubsetting;
+    }
+
     private List<Differencing> ownedDifferencing;
 
     @Override

app/org/omg/sysml/metamodel/impl/AllocationDefinitionImpl.java

@@ -527,6 +527,25 @@ public void setIsSufficient(Boolean isSufficient) {
         this.isSufficient = isSufficient;
     }
 
+    /*
+     * shadowed by `4d59a8b1-fd56-4252-aac9-8ac40e8a847c`
+
+    private Boolean isSufficient;
+
+    @Override
+    @JsonGetter
+    @javax.persistence.Column(name = "isSufficient", table = "AllocationDefinition")
+    public Boolean getIsSufficient() {
+        return isSufficient;
+    }
+
+    @JsonSetter
+    public void setIsSufficient(Boolean isSufficient) {
+        this.isSufficient = isSufficient;
+    }
+
+    */
+
     private Boolean isVariation;
 
     @Override

app/org/omg/sysml/metamodel/impl/AllocationUsageImpl.java

@@ -171,6 +171,24 @@ public void setConnectorEnd(List<Feature> connectorEnd) {
         this.connectorEnd = connectorEnd;
     }
 
+    private Feature crossFeature;
+
+    @Override
+    @JsonGetter
+    @JsonSerialize(using = DataSerializer.class)
+    // @javax.persistence.Transient
+    @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "crossFeature_type"), fetch = FetchType.LAZY)
+    @JoinColumn(name = "crossFeature_id", table = "AllocationUsage")
+    public Feature getCrossFeature() {
+        return crossFeature;
+    }
+
+    @JsonSetter
+    @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class)
+    public void setCrossFeature(Feature crossFeature) {
+        this.crossFeature = crossFeature;
+    }
+
     private String declaredName;
 
     @Override
@@ -1553,6 +1571,24 @@ public void setOwnedConjugator(Conjugation ownedConjugator) {
         this.ownedConjugator = ownedConjugator;
     }
 
+    private CrossSubsetting ownedCrossSubsetting;
+
+    @Override
+    @JsonGetter
+    @JsonSerialize(using = DataSerializer.class)
+    // @javax.persistence.Transient
+    @Any(metaDef = "CrossSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedCrossSubsetting_type"), fetch = FetchType.LAZY)
+    @JoinColumn(name = "ownedCrossSubsetting_id", table = "AllocationUsage")
+    public CrossSubsetting getOwnedCrossSubsetting() {
+        return ownedCrossSubsetting;
+    }
+
+    @JsonSetter
+    @JsonDeserialize(using = DataDeserializer.class, as = CrossSubsettingImpl.class)
+    public void setOwnedCrossSubsetting(CrossSubsetting ownedCrossSubsetting) {
+        this.ownedCrossSubsetting = ownedCrossSubsetting;
+    }
+
     private List<Differencing> ownedDifferencing;
 
     @Override

app/org/omg/sysml/metamodel/impl/AnalysisCaseUsageImpl.java

@@ -204,6 +204,24 @@ public void setChainingFeature(List<Feature> chainingFeature) {
         this.chainingFeature = chainingFeature;
     }
 
+    private Feature crossFeature;
+
+    @Override
+    @JsonGetter
+    @JsonSerialize(using = DataSerializer.class)
+    // @javax.persistence.Transient
+    @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "crossFeature_type"), fetch = FetchType.LAZY)
+    @JoinColumn(name = "crossFeature_id", table = "AnalysisCaseUsage")
+    public Feature getCrossFeature() {
+        return crossFeature;
+    }
+
+    @JsonSetter
+    @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class)
+    public void setCrossFeature(Feature crossFeature) {
+        this.crossFeature = crossFeature;
+    }
+
     private String declaredName;
 
     @Override
@@ -1602,6 +1620,24 @@ public void setOwnedConjugator(Conjugation ownedConjugator) {
         this.ownedConjugator = ownedConjugator;
     }
 
+    private CrossSubsetting ownedCrossSubsetting;
+
+    @Override
+    @JsonGetter
+    @JsonSerialize(using = DataSerializer.class)
+    // @javax.persistence.Transient
+    @Any(metaDef = "CrossSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedCrossSubsetting_type"), fetch = FetchType.LAZY)
+    @JoinColumn(name = "ownedCrossSubsetting_id", table = "AnalysisCaseUsage")
+    public CrossSubsetting getOwnedCrossSubsetting() {
+        return ownedCrossSubsetting;
+    }
+
+    @JsonSetter
+    @JsonDeserialize(using = DataDeserializer.class, as = CrossSubsettingImpl.class)
+    public void setOwnedCrossSubsetting(CrossSubsetting ownedCrossSubsetting) {
+        this.ownedCrossSubsetting = ownedCrossSubsetting;
+    }
+
     private List<Differencing> ownedDifferencing;
 
     @Override