Merge branch 'release/2021-11'

Systems-Modeling · Dec 7, 2021 · a7d118b · a7d118b
2 parents 0e58481 + 52ea366
commit a7d118b
Show file tree

Hide file tree

Showing 401 changed files with 5,349 additions and 5,344 deletions.
diff --git a/app/org/omg/sysml/metamodel/BindingConnectorAsUsage.java b/app/org/omg/sysml/metamodel/BindingConnectorAsUsage.java
@@ -25,6 +25,6 @@
 import java.util.List;
 import java.util.Set;
 
-public interface BindingConnectorAsUsage extends ConnectorAsUsage, BindingConnector, SysMLType {
+public interface BindingConnectorAsUsage extends BindingConnector, ConnectorAsUsage, SysMLType {
 
 }
diff --git a/app/org/omg/sysml/metamodel/ConnectorAsUsage.java b/app/org/omg/sysml/metamodel/ConnectorAsUsage.java
@@ -25,6 +25,6 @@
 import java.util.List;
 import java.util.Set;
 
-public interface ConnectorAsUsage extends Connector, Usage, SysMLType {
+public interface ConnectorAsUsage extends Usage, Connector, SysMLType {
 
 }
diff --git a/app/org/omg/sysml/metamodel/IncludeUseCaseUsage.java b/app/org/omg/sysml/metamodel/IncludeUseCaseUsage.java
@@ -25,6 +25,6 @@
 import java.util.List;
 import java.util.Set;
 
-public interface IncludeUseCaseUsage extends PerformActionUsage, UseCaseUsage, SysMLType {
+public interface IncludeUseCaseUsage extends UseCaseUsage, PerformActionUsage, SysMLType {
     UseCaseUsage getUseCaseIncluded();
 }
diff --git a/app/org/omg/sysml/metamodel/SuccessionAsUsage.java b/app/org/omg/sysml/metamodel/SuccessionAsUsage.java
@@ -25,6 +25,6 @@
 import java.util.List;
 import java.util.Set;
 
-public interface SuccessionAsUsage extends Succession, ConnectorAsUsage, SysMLType {
+public interface SuccessionAsUsage extends ConnectorAsUsage, Succession, SysMLType {
 
 }
diff --git a/app/org/omg/sysml/metamodel/SuccessionFlowConnectionUsage.java b/app/org/omg/sysml/metamodel/SuccessionFlowConnectionUsage.java
@@ -25,6 +25,6 @@
 import java.util.List;
 import java.util.Set;
 
-public interface SuccessionFlowConnectionUsage extends FlowConnectionUsage, SuccessionItemFlow, SysMLType {
+public interface SuccessionFlowConnectionUsage extends SuccessionItemFlow, FlowConnectionUsage, SysMLType {
 
 }
diff --git a/app/org/omg/sysml/metamodel/Type.java b/app/org/omg/sysml/metamodel/Type.java
@@ -58,8 +58,6 @@ public interface Type extends Namespace, SysMLType {
 
     Multiplicity getMultiplicity();
 
-    Collection<? extends Type> getDisjointType();
-
     List<? extends Feature> getDirectedFeature();
 
     Collection<? extends Disjoining> getOwnedDisjoining();

diff --git a/app/org/omg/sysml/metamodel/impl/AcceptActionUsageImpl.java b/app/org/omg/sysml/metamodel/impl/AcceptActionUsageImpl.java
@@ -21,25 +21,45 @@
 
 package org.omg.sysml.metamodel.impl;
 
-import com.fasterxml.jackson.annotation.JsonGetter;
-import com.fasterxml.jackson.annotation.JsonSetter;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import jackson.DataDeserializer;
-import jackson.DataSerializer;
+import org.omg.sysml.metamodel.*;
+
+import org.omg.sysml.metamodel.Package;
+import org.omg.sysml.metamodel.Class;
+
 import jackson.DataSerializer;
+import jackson.DataDeserializer;
+
+import com.fasterxml.jackson.annotation.*;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+
 import org.hibernate.annotations.Any;
-import org.hibernate.annotations.FetchMode;
 import org.hibernate.annotations.ManyToAny;
-import org.omg.sysml.metamodel.Class;
-import org.omg.sysml.metamodel.*;
+import org.hibernate.annotations.FetchMode;
+
+// import info.archinnov.achilles.annotations.UDT;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.EnumType;
+import javax.persistence.ElementCollection;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.PrimaryKeyJoinColumn;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.Lob;
+import javax.persistence.FetchType;
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Table;
+import javax.persistence.SecondaryTable;
+import javax.persistence.CollectionTable;
 
-import javax.persistence.*;
-import java.util.ArrayList;
 import java.util.Collection;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
+import java.util.HashSet;
 
 @Entity(name = "AcceptActionUsageImpl")
 @SecondaryTable(name = "AcceptActionUsage")
@@ -246,32 +266,6 @@ public void setDirection(FeatureDirectionKind direction) {
 
 
 
-    // @info.archinnov.achilles.annotations.Transient
-    // @info.archinnov.achilles.annotations.Column("disjointType")
-    private Collection<Type> disjointType;
-
-    @JsonGetter
-    @JsonSerialize(contentUsing = DataSerializer.class)
-    // @javax.persistence.Transient
-    @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
-    @JoinTable(name = "AcceptActionUsage_disjointType",
-            joinColumns = @JoinColumn(name = "classId"),
-            inverseJoinColumns = @JoinColumn(name = "attributeId"))
-    public Collection<Type> getDisjointType() {
-        if (disjointType == null) {
-            disjointType = new ArrayList<>();
-        }
-        return disjointType;
-    }
-
-    @JsonSetter
-    @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class)
-    public void setDisjointType(Collection<Type> disjointType) {
-        this.disjointType = disjointType;
-    }
-
-
-
     // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("documentation")
     private List<Documentation> documentation;

diff --git a/app/org/omg/sysml/metamodel/impl/ActionDefinitionImpl.java b/app/org/omg/sysml/metamodel/impl/ActionDefinitionImpl.java
@@ -21,23 +21,45 @@
 
 package org.omg.sysml.metamodel.impl;
 
-import com.fasterxml.jackson.annotation.JsonGetter;
-import com.fasterxml.jackson.annotation.JsonSetter;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import jackson.DataDeserializer;
+import org.omg.sysml.metamodel.*;
+
+import org.omg.sysml.metamodel.Package;
+import org.omg.sysml.metamodel.Class;
+
 import jackson.DataSerializer;
+import jackson.DataDeserializer;
+
+import com.fasterxml.jackson.annotation.*;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+
 import org.hibernate.annotations.Any;
-import org.hibernate.annotations.FetchMode;
 import org.hibernate.annotations.ManyToAny;
-import org.omg.sysml.metamodel.*;
+import org.hibernate.annotations.FetchMode;
+
+// import info.archinnov.achilles.annotations.UDT;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.EnumType;
+import javax.persistence.ElementCollection;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.PrimaryKeyJoinColumn;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.Lob;
+import javax.persistence.FetchType;
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Table;
+import javax.persistence.SecondaryTable;
+import javax.persistence.CollectionTable;
 
-import javax.persistence.*;
-import java.util.ArrayList;
 import java.util.Collection;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
+import java.util.HashSet;
 
 @Entity(name = "ActionDefinitionImpl")
 @SecondaryTable(name = "ActionDefinition")
@@ -148,32 +170,6 @@ public void setDirectedUsage(List<Usage> directedUsage) {
 
 
 
-    // @info.archinnov.achilles.annotations.Transient
-    // @info.archinnov.achilles.annotations.Column("disjointType")
-    private Collection<Type> disjointType;
-
-    @JsonGetter
-    @JsonSerialize(contentUsing = DataSerializer.class)
-    // @javax.persistence.Transient
-    @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
-    @JoinTable(name = "ActionDefinition_disjointType",
-            joinColumns = @JoinColumn(name = "classId"),
-            inverseJoinColumns = @JoinColumn(name = "attributeId"))
-    public Collection<Type> getDisjointType() {
-        if (disjointType == null) {
-            disjointType = new ArrayList<>();
-        }
-        return disjointType;
-    }
-
-    @JsonSetter
-    @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class)
-    public void setDisjointType(Collection<Type> disjointType) {
-        this.disjointType = disjointType;
-    }
-
-
-
     // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("documentation")
     private List<Documentation> documentation;

diff --git a/app/org/omg/sysml/metamodel/impl/ActionUsageImpl.java b/app/org/omg/sysml/metamodel/impl/ActionUsageImpl.java
@@ -21,24 +21,45 @@
 
 package org.omg.sysml.metamodel.impl;
 
-import com.fasterxml.jackson.annotation.JsonGetter;
-import com.fasterxml.jackson.annotation.JsonSetter;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import jackson.DataDeserializer;
+import org.omg.sysml.metamodel.*;
+
+import org.omg.sysml.metamodel.Package;
+import org.omg.sysml.metamodel.Class;
+
 import jackson.DataSerializer;
+import jackson.DataDeserializer;
+
+import com.fasterxml.jackson.annotation.*;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+
 import org.hibernate.annotations.Any;
-import org.hibernate.annotations.FetchMode;
 import org.hibernate.annotations.ManyToAny;
-import org.omg.sysml.metamodel.Class;
-import org.omg.sysml.metamodel.*;
+import org.hibernate.annotations.FetchMode;
+
+// import info.archinnov.achilles.annotations.UDT;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.EnumType;
+import javax.persistence.ElementCollection;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.PrimaryKeyJoinColumn;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.Lob;
+import javax.persistence.FetchType;
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Table;
+import javax.persistence.SecondaryTable;
+import javax.persistence.CollectionTable;
 
-import javax.persistence.*;
-import java.util.ArrayList;
 import java.util.Collection;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
+import java.util.HashSet;
 
 @Entity(name = "ActionUsageImpl")
 @SecondaryTable(name = "ActionUsage")
@@ -245,32 +266,6 @@ public void setDirection(FeatureDirectionKind direction) {
 
 
 
-    // @info.archinnov.achilles.annotations.Transient
-    // @info.archinnov.achilles.annotations.Column("disjointType")
-    private Collection<Type> disjointType;
-
-    @JsonGetter
-    @JsonSerialize(contentUsing = DataSerializer.class)
-    // @javax.persistence.Transient
-    @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
-    @JoinTable(name = "ActionUsage_disjointType",
-            joinColumns = @JoinColumn(name = "classId"),
-            inverseJoinColumns = @JoinColumn(name = "attributeId"))
-    public Collection<Type> getDisjointType() {
-        if (disjointType == null) {
-            disjointType = new ArrayList<>();
-        }
-        return disjointType;
-    }
-
-    @JsonSetter
-    @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class)
-    public void setDisjointType(Collection<Type> disjointType) {
-        this.disjointType = disjointType;
-    }
-
-
-
     // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("documentation")
     private List<Documentation> documentation;

diff --git a/app/org/omg/sysml/metamodel/impl/ActorMembershipImpl.java b/app/org/omg/sysml/metamodel/impl/ActorMembershipImpl.java
@@ -21,23 +21,45 @@
 
 package org.omg.sysml.metamodel.impl;
 
-import com.fasterxml.jackson.annotation.JsonGetter;
-import com.fasterxml.jackson.annotation.JsonSetter;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import jackson.DataDeserializer;
+import org.omg.sysml.metamodel.*;
+
+import org.omg.sysml.metamodel.Package;
+import org.omg.sysml.metamodel.Class;
+
 import jackson.DataSerializer;
+import jackson.DataDeserializer;
+
+import com.fasterxml.jackson.annotation.*;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+
 import org.hibernate.annotations.Any;
-import org.hibernate.annotations.FetchMode;
 import org.hibernate.annotations.ManyToAny;
-import org.omg.sysml.metamodel.*;
+import org.hibernate.annotations.FetchMode;
+
+// import info.archinnov.achilles.annotations.UDT;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.EnumType;
+import javax.persistence.ElementCollection;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.PrimaryKeyJoinColumn;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.Lob;
+import javax.persistence.FetchType;
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Table;
+import javax.persistence.SecondaryTable;
+import javax.persistence.CollectionTable;
 
-import javax.persistence.*;
-import java.util.ArrayList;
 import java.util.Collection;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
+import java.util.HashSet;
 
 @Entity(name = "ActorMembershipImpl")
 @SecondaryTable(name = "ActorMembership")