Merge branch 'release/2020-02'

Author: ivan-gomes

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

@@ -0,0 +1,9 @@
+package org.omg.sysml.metamodel;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+public interface AssertConstraintUsage extends ConstraintUsage, Invariant, MofObject {
+    ConstraintUsage getAssertedConstraint();
+}

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

@@ -4,6 +4,6 @@
 import java.util.List;
 import java.util.Set;
 
-public interface AssociationBlock extends Block, Association, MofObject {
+public interface AssociationBlock extends Association, Block, MofObject {
 
 }

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

@@ -4,7 +4,7 @@
 import java.util.List;
 import java.util.Set;
 
-public interface ConstraintUsage extends Invariant, Usage, MofObject {
+public interface ConstraintUsage extends BooleanExpression, Usage, MofObject {
     Predicate getConstraintDefinition();
 
     Usage getConstraintOwningUsage();

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

@@ -5,5 +5,5 @@
 import java.util.Set;
 
 public interface Invariant extends BooleanExpression, MofObject {
-
+    BindingConnector getAssertionConnector();
 }

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

@@ -6,4 +6,16 @@
 
 public interface TransitionUsage extends Step, Usage, MofObject {
     Usage getTransitionOwningUsage();
+
+    Step getSource();
+
+    Step getTarget();
+
+    AcceptActionUsage getTriggerAction();
+
+    Expression getGuardExpression();
+
+    ActionUsage getEffectAction();
+
+    Succession getSuccession();
 }

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

@@ -282,11 +282,13 @@ public void setOwnedConstraint(Collection<ConstraintUsage> ownedConstraint) {
 
 
 
+    // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("ownedTransition")
     private Collection<TransitionUsage> ownedTransition;
 
     @JsonGetter
     @JsonSerialize(contentUsing = MofObjectSerializer.class)
+    // @javax.persistence.Transient
     @ManyToAny(metaDef = "TransitionUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
     @JoinTable(name = "Activity_ownedTransition",
             joinColumns = @JoinColumn(name = "classId"),