Merge branch 'release/2019-12'

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

@@ -0,0 +1,11 @@
+package org.omg.sysml.metamodel;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+public interface ConjugatedPortDefinition extends PortDefinition, MofObject {
+    PortDefinition getOriginalPortDefinition();
+
+    PortConjugation getOwnedPortConjugator();
+}

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

@@ -0,0 +1,11 @@
+package org.omg.sysml.metamodel;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+public interface ConjugatedPortTyping extends FeatureTyping, MofObject {
+    PortDefinition getOriginalPortDefinition();
+
+    ConjugatedPortDefinition getConjugatedPortDefinition();
+}

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

@@ -0,0 +1,13 @@
+package org.omg.sysml.metamodel;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+public interface Conjugation extends Relationship, MofObject {
+    Type getOriginalType();
+
+    Type getConjugatedType();
+
+    Type getOwningType();
+}

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

@@ -16,4 +16,6 @@ public interface Definition extends Classifier, MofObject {
     Collection<? extends Property> getProperty();
 
     Collection<? extends ActionUsage> getOwnedAction();
+
+    Collection<? extends StateUsage> getOwnedState();
 }

app/org/omg/sysml/metamodel/EndPortMembership.java → app/org/omg/sysml/metamodel/ExhibitStateUsage.java

@@ -4,6 +4,6 @@
 import java.util.List;
 import java.util.Set;
 
-public interface EndPortMembership extends EndFeatureMembership, PortMembership, MofObject {
-
+public interface ExhibitStateUsage extends StateUsage, MofObject {
+    StateUsage getExhibitedState();
 }

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

@@ -0,0 +1,11 @@
+package org.omg.sysml.metamodel;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+public interface PortConjugation extends Conjugation, MofObject {
+    PortDefinition getOriginalPortDefinition();
+
+    ConjugatedPortDefinition getConjugatedPortDefinition();
+}

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

@@ -5,5 +5,5 @@
 import java.util.Set;
 
 public interface PortDefinition extends Definition, MofObject {
-
+    ConjugatedPortDefinition getConjugatedPortDefinition();
 }

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

@@ -4,7 +4,7 @@
 import java.util.List;
 import java.util.Set;
 
-public interface PortUsage extends Usage, Feature, MofObject {
+public interface PortUsage extends Usage, MofObject {
     PortDefinition getPortDefinition();
 
     Definition getPortOwningDefinition();

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

@@ -0,0 +1,7 @@
+package org.omg.sysml.metamodel;
+
+public enum StateActionKind {
+    ENTRY,
+    DO,
+    EXIT
+}

app/org/omg/sysml/metamodel/PortMembership.java → app/org/omg/sysml/metamodel/StateActionMembership.java

@@ -4,6 +4,6 @@
 import java.util.List;
 import java.util.Set;
 
-public interface PortMembership extends FeatureMembership, MofObject {
-    PortUsage getMemberPort();
+public interface StateActionMembership extends FeatureMembership, MofObject {
+    StateActionKind getKind();
 }

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

@@ -0,0 +1,9 @@
+package org.omg.sysml.metamodel;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+public interface StateDefinition extends Definition, Behavior, MofObject {
+    Collection<? extends StateUsage> getState();
+}

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

@@ -0,0 +1,13 @@
+package org.omg.sysml.metamodel;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+public interface StateUsage extends Step, Usage, MofObject {
+    Usage getStateOwningUsage();
+
+    Definition getStateOwningDefinition();
+
+    Collection<? extends Behavior> getStateDefinition();
+}

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

@@ -0,0 +1,7 @@
+package org.omg.sysml.metamodel;
+
+public enum TransitionFeatureKind {
+    TRIGGER,
+    GUARD,
+    EFFECT
+}

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

@@ -0,0 +1,9 @@
+package org.omg.sysml.metamodel;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+public interface TransitionFeatureMembership extends FeatureMembership, MofObject {
+    TransitionFeatureKind getKind();
+}

app/org/omg/sysml/metamodel/ConjugatedPortMembership.java → app/org/omg/sysml/metamodel/TransitionStep.java

@@ -4,6 +4,6 @@
 import java.util.List;
 import java.util.Set;
 
-public interface ConjugatedPortMembership extends PortMembership, MofObject {
+public interface TransitionStep extends Step, MofObject {
 
 }

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

@@ -26,4 +26,14 @@ public interface Type extends Package, MofObject {
     Collection<? extends Feature> getOwnedEndFeature();
 
     Boolean getIsSufficient();
+
+    Conjugation getOwnedConjugator();
+
+    Boolean getIsConjugated();
+
+    Conjugation getConjugator();
+
+    List<? extends FeatureMembership> getFeatureMembership();
+
+    Collection<? extends Feature> getInheritedFeature();
 }

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

@@ -18,4 +18,6 @@ public interface Usage extends Feature, MofObject {
     Collection<? extends Property> getProperty();
 
     Collection<? extends ActionUsage> getNestedAction();
+
+    Collection<? extends StateUsage> getNestedState();
 }

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

@@ -309,6 +309,32 @@ public void setNestedAction(Collection<ActionUsage> nestedAction) {
 
 
 
+    // @info.archinnov.achilles.annotations.Transient
+    // @info.archinnov.achilles.annotations.Column("nestedState")
+    private Collection<StateUsage> nestedState;
+
+    @JsonGetter
+    @JsonSerialize(contentUsing = MofObjectSerializer.class)
+    // @javax.persistence.Transient
+    @ManyToAny(metaDef = "StateUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+    @JoinTable(name = "AcceptActionUsage_nestedState",
+            joinColumns = @JoinColumn(name = "classId"),
+            inverseJoinColumns = @JoinColumn(name = "attributeId"))
+    public Collection<StateUsage> getNestedState() {
+        if (nestedState == null) {
+            nestedState = new ArrayList<>();
+        }
+        return nestedState;
+    }
+
+    @JsonSetter
+    @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = StateUsageImpl.class)
+    public void setNestedState(Collection<StateUsage> nestedState) {
+        this.nestedState = nestedState;
+    }
+
+
+
     // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("behavior")
     private Collection<Behavior> behavior;
@@ -921,6 +947,116 @@ public void setIsSufficient(Boolean isSufficient) {
 
 
 
+    // @info.archinnov.achilles.annotations.Transient
+    // @info.archinnov.achilles.annotations.Column("ownedConjugator")
+    private Conjugation ownedConjugator;
+
+    @JsonGetter
+    @JsonSerialize(using = MofObjectSerializer.class)
+    // @javax.persistence.Transient
+    @Any(metaDef = "ConjugationMetaDef", metaColumn = @javax.persistence.Column(name = "ownedConjugatorType"), fetch = FetchType.LAZY)
+    @JoinColumn(name = "ownedConjugatorId", table = "AcceptActionUsage")
+    public Conjugation getOwnedConjugator() {
+        return ownedConjugator;
+    }
+
+    @JsonSetter
+    @JsonDeserialize(using = MofObjectDeserializer.class, as = ConjugationImpl.class)
+    public void setOwnedConjugator(Conjugation ownedConjugator) {
+        this.ownedConjugator = ownedConjugator;
+    }
+
+
+
+    // @info.archinnov.achilles.annotations.Transient
+    // @info.archinnov.achilles.annotations.Column("isConjugated")
+    private Boolean isConjugated;
+
+    @JsonGetter
+    // @javax.persistence.Transient
+    @javax.persistence.Column(name = "isConjugated", table = "AcceptActionUsage")
+    public Boolean getIsConjugated() {
+        return isConjugated;
+    }
+
+    @JsonSetter
+    public void setIsConjugated(Boolean isConjugated) {
+        this.isConjugated = isConjugated;
+    }
+
+
+
+    // @info.archinnov.achilles.annotations.Column("conjugator")
+    private Conjugation conjugator;
+
+    @JsonGetter
+    @JsonSerialize(using = MofObjectSerializer.class)
+    @Any(metaDef = "ConjugationMetaDef", metaColumn = @javax.persistence.Column(name = "conjugatorType"), fetch = FetchType.LAZY)
+    @JoinColumn(name = "conjugatorId", table = "AcceptActionUsage")
+    public Conjugation getConjugator() {
+        return conjugator;
+    }
+
+    @JsonSetter
+    @JsonDeserialize(using = MofObjectDeserializer.class, as = ConjugationImpl.class)
+    public void setConjugator(Conjugation conjugator) {
+        this.conjugator = conjugator;
+    }
+
+
+
+    // @info.archinnov.achilles.annotations.Transient
+    // @info.archinnov.achilles.annotations.Column("featureMembership")
+    private List<FeatureMembership> featureMembership;
+
+    @JsonGetter
+    @JsonSerialize(contentUsing = MofObjectSerializer.class)
+    // @javax.persistence.Transient
+    @ManyToAny(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+    @JoinTable(name = "AcceptActionUsage_featureMembership",
+            joinColumns = @JoinColumn(name = "classId"),
+            inverseJoinColumns = @JoinColumn(name = "attributeId"))
+    public List<FeatureMembership> getFeatureMembership() {
+        if (featureMembership == null) {
+            featureMembership = new ArrayList<>();
+        }
+        return featureMembership;
+    }
+
+    @JsonSetter
+    @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = FeatureMembershipImpl.class)
+    public void setFeatureMembership(List<FeatureMembership> featureMembership) {
+        this.featureMembership = featureMembership;
+    }
+
+
+
+    // @info.archinnov.achilles.annotations.Transient
+    // @info.archinnov.achilles.annotations.Column("inheritedFeature")
+    private Collection<Feature> inheritedFeature;
+
+    @JsonGetter
+    @JsonSerialize(contentUsing = MofObjectSerializer.class)
+    // @javax.persistence.Transient
+    @ManyToAny(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+    @JoinTable(name = "AcceptActionUsage_inheritedFeature",
+            joinColumns = @JoinColumn(name = "classId"),
+            inverseJoinColumns = @JoinColumn(name = "attributeId"))
+    public Collection<Feature> getInheritedFeature() {
+        if (inheritedFeature == null) {
+            inheritedFeature = new ArrayList<>();
+        }
+        return inheritedFeature;
+    }
+
+    @JsonSetter
+    @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = FeatureImpl.class)
+    public void setInheritedFeature(Collection<Feature> inheritedFeature) {
+        this.inheritedFeature = inheritedFeature;
+    }
+
+
+
     // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("membership")
     private List<Membership> membership;