Merge branch 'release/2024-01'

Systems-Modeling · Jan 30, 2024 · 26dbe5b · 26dbe5b
2 parents 2487e7c + e9dd940
commit 26dbe5b
Show file tree

Hide file tree

Showing 135 changed files with 861,721 additions and 863,081 deletions.
diff --git a/app/org/omg/sysml/metamodel/AnnotatingElement.java b/app/org/omg/sysml/metamodel/AnnotatingElement.java
@@ -27,7 +27,9 @@
 import java.util.Set;
 
 public interface AnnotatingElement extends Element, SysMLType {
-    List<? extends Annotation> getAnnotation();
-
     List<? extends Element> getAnnotatedElement();
+
+    Collection<? extends Annotation> getOwnedAnnotatingRelationship();
+
+    List<? extends Annotation> getAnnotation();
 }
diff --git a/app/org/omg/sysml/metamodel/Annotation.java b/app/org/omg/sysml/metamodel/Annotation.java
@@ -32,4 +32,6 @@ public interface Annotation extends Relationship, SysMLType {
     Element getAnnotatedElement();
 
     Element getOwningAnnotatedElement();
+
+    AnnotatingElement getOwningAnnotatingElement();
 }
diff --git a/app/org/omg/sysml/metamodel/Connector.java b/app/org/omg/sysml/metamodel/Connector.java
@@ -31,8 +31,6 @@ public interface Connector extends Feature, Relationship, SysMLType {
 
     List<? extends Association> getAssociation();
 
-    Boolean getIsDirected();
-
     List<? extends Feature> getConnectorEnd();
 
     Feature getSourceFeature();

diff --git a/app/org/omg/sysml/metamodel/impl/AllocationUsageImpl.java b/app/org/omg/sysml/metamodel/impl/AllocationUsageImpl.java
@@ -765,22 +765,6 @@ public void setIsDerived(Boolean isDerived) {
 
 
 
-    // @info.archinnov.achilles.annotations.Column("isDirected")
-    private Boolean isDirected;
-
-    @JsonGetter
-    @javax.persistence.Column(name = "isDirected", table = "AllocationUsage")
-    public Boolean getIsDirected() {
-        return isDirected;
-    }
-
-    @JsonSetter
-    public void setIsDirected(Boolean isDirected) {
-        this.isDirected = isDirected;
-    }
-
-
-
     // @info.archinnov.achilles.annotations.Column("isEnd")
     private Boolean isEnd;
 

diff --git a/app/org/omg/sysml/metamodel/impl/AnnotatingElementImpl.java b/app/org/omg/sysml/metamodel/impl/AnnotatingElementImpl.java
@@ -275,6 +275,32 @@ public void setName(String name) {
 
 
 
+    // @info.archinnov.achilles.annotations.Transient
+    // @info.archinnov.achilles.annotations.Column("ownedAnnotatingRelationship")
+    private Collection<Annotation> ownedAnnotatingRelationship;
+
+    @JsonGetter
+    @JsonSerialize(contentUsing = DataSerializer.class)
+    // @javax.persistence.Transient
+    @ManyToAny(metaDef = "AnnotationMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY)
+    @JoinTable(name = "AnnotatingElement_ownedAnnotatingRelationship",
+            joinColumns = @JoinColumn(name = "class_id"),
+            inverseJoinColumns = @JoinColumn(name = "attribute_id"))
+    public Collection<Annotation> getOwnedAnnotatingRelationship() {
+        if (ownedAnnotatingRelationship == null) {
+            ownedAnnotatingRelationship = new ArrayList<>();
+        }
+        return ownedAnnotatingRelationship;
+    }
+
+    @JsonSetter
+    @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = AnnotationImpl.class)
+    public void setOwnedAnnotatingRelationship(Collection<Annotation> ownedAnnotatingRelationship) {
+        this.ownedAnnotatingRelationship = ownedAnnotatingRelationship;
+    }
+
+
+
     // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("ownedAnnotation")
     private List<Annotation> ownedAnnotation;

diff --git a/app/org/omg/sysml/metamodel/impl/AnnotationImpl.java b/app/org/omg/sysml/metamodel/impl/AnnotationImpl.java
@@ -421,6 +421,27 @@ public void setOwningAnnotatedElement(Element owningAnnotatedElement) {
 
 
 
+    // @info.archinnov.achilles.annotations.Transient
+    // @info.archinnov.achilles.annotations.Column("owningAnnotatingElement")
+    private AnnotatingElement owningAnnotatingElement;
+
+    @JsonGetter
+    @JsonSerialize(using = DataSerializer.class)
+    // @javax.persistence.Transient
+    @Any(metaDef = "AnnotatingElementMetaDef", metaColumn = @javax.persistence.Column(name = "owningAnnotatingElement_type"), fetch = FetchType.LAZY)
+    @JoinColumn(name = "owningAnnotatingElement_id", table = "Annotation")
+    public AnnotatingElement getOwningAnnotatingElement() {
+        return owningAnnotatingElement;
+    }
+
+    @JsonSetter
+    @JsonDeserialize(using = DataDeserializer.class, as = AnnotatingElementImpl.class)
+    public void setOwningAnnotatingElement(AnnotatingElement owningAnnotatingElement) {
+        this.owningAnnotatingElement = owningAnnotatingElement;
+    }
+
+
+
     // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("owningMembership")
     private OwningMembership owningMembership;

diff --git a/app/org/omg/sysml/metamodel/impl/BindingConnectorAsUsageImpl.java b/app/org/omg/sysml/metamodel/impl/BindingConnectorAsUsageImpl.java
@@ -692,22 +692,6 @@ public void setIsDerived(Boolean isDerived) {
 
 
 
-    // @info.archinnov.achilles.annotations.Column("isDirected")
-    private Boolean isDirected;
-
-    @JsonGetter
-    @javax.persistence.Column(name = "isDirected", table = "BindingConnectorAsUsage")
-    public Boolean getIsDirected() {
-        return isDirected;
-    }
-
-    @JsonSetter
-    public void setIsDirected(Boolean isDirected) {
-        this.isDirected = isDirected;
-    }
-
-
-
     // @info.archinnov.achilles.annotations.Column("isEnd")
     private Boolean isEnd;
 

diff --git a/app/org/omg/sysml/metamodel/impl/BindingConnectorImpl.java b/app/org/omg/sysml/metamodel/impl/BindingConnectorImpl.java
@@ -640,22 +640,6 @@ public void setIsDerived(Boolean isDerived) {
 
 
 
-    // @info.archinnov.achilles.annotations.Column("isDirected")
-    private Boolean isDirected;
-
-    @JsonGetter
-    @javax.persistence.Column(name = "isDirected", table = "BindingConnector")
-    public Boolean getIsDirected() {
-        return isDirected;
-    }
-
-    @JsonSetter
-    public void setIsDirected(Boolean isDirected) {
-        this.isDirected = isDirected;
-    }
-
-
-
     // @info.archinnov.achilles.annotations.Column("isEnd")
     private Boolean isEnd;
 

diff --git a/app/org/omg/sysml/metamodel/impl/CommentImpl.java b/app/org/omg/sysml/metamodel/impl/CommentImpl.java
@@ -311,6 +311,32 @@ public void setName(String name) {
 
 
 
+    // @info.archinnov.achilles.annotations.Transient
+    // @info.archinnov.achilles.annotations.Column("ownedAnnotatingRelationship")
+    private Collection<Annotation> ownedAnnotatingRelationship;
+
+    @JsonGetter
+    @JsonSerialize(contentUsing = DataSerializer.class)
+    // @javax.persistence.Transient
+    @ManyToAny(metaDef = "AnnotationMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY)
+    @JoinTable(name = "Comment_ownedAnnotatingRelationship",
+            joinColumns = @JoinColumn(name = "class_id"),
+            inverseJoinColumns = @JoinColumn(name = "attribute_id"))
+    public Collection<Annotation> getOwnedAnnotatingRelationship() {
+        if (ownedAnnotatingRelationship == null) {
+            ownedAnnotatingRelationship = new ArrayList<>();
+        }
+        return ownedAnnotatingRelationship;
+    }
+
+    @JsonSetter
+    @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = AnnotationImpl.class)
+    public void setOwnedAnnotatingRelationship(Collection<Annotation> ownedAnnotatingRelationship) {
+        this.ownedAnnotatingRelationship = ownedAnnotatingRelationship;
+    }
+
+
+
     // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("ownedAnnotation")
     private List<Annotation> ownedAnnotation;

diff --git a/app/org/omg/sysml/metamodel/impl/ConnectionUsageImpl.java b/app/org/omg/sysml/metamodel/impl/ConnectionUsageImpl.java
@@ -739,22 +739,6 @@ public void setIsDerived(Boolean isDerived) {
 
 
 
-    // @info.archinnov.achilles.annotations.Column("isDirected")
-    private Boolean isDirected;
-
-    @JsonGetter
-    @javax.persistence.Column(name = "isDirected", table = "ConnectionUsage")
-    public Boolean getIsDirected() {
-        return isDirected;
-    }
-
-    @JsonSetter
-    public void setIsDirected(Boolean isDirected) {
-        this.isDirected = isDirected;
-    }
-
-
-
     // @info.archinnov.achilles.annotations.Column("isEnd")
     private Boolean isEnd;
 

diff --git a/app/org/omg/sysml/metamodel/impl/ConnectorAsUsageImpl.java b/app/org/omg/sysml/metamodel/impl/ConnectorAsUsageImpl.java
@@ -692,22 +692,6 @@ public void setIsDerived(Boolean isDerived) {
 
 
 
-    // @info.archinnov.achilles.annotations.Column("isDirected")
-    private Boolean isDirected;
-
-    @JsonGetter
-    @javax.persistence.Column(name = "isDirected", table = "ConnectorAsUsage")
-    public Boolean getIsDirected() {
-        return isDirected;
-    }
-
-    @JsonSetter
-    public void setIsDirected(Boolean isDirected) {
-        this.isDirected = isDirected;
-    }
-
-
-
     // @info.archinnov.achilles.annotations.Column("isEnd")
     private Boolean isEnd;
 

diff --git a/app/org/omg/sysml/metamodel/impl/ConnectorImpl.java b/app/org/omg/sysml/metamodel/impl/ConnectorImpl.java
@@ -640,22 +640,6 @@ public void setIsDerived(Boolean isDerived) {
 
 
 
-    // @info.archinnov.achilles.annotations.Column("isDirected")
-    private Boolean isDirected;
-
-    @JsonGetter
-    @javax.persistence.Column(name = "isDirected", table = "Connector")
-    public Boolean getIsDirected() {
-        return isDirected;
-    }
-
-    @JsonSetter
-    public void setIsDirected(Boolean isDirected) {
-        this.isDirected = isDirected;
-    }
-
-
-
     // @info.archinnov.achilles.annotations.Column("isEnd")
     private Boolean isEnd;
 

diff --git a/app/org/omg/sysml/metamodel/impl/DocumentationImpl.java b/app/org/omg/sysml/metamodel/impl/DocumentationImpl.java
@@ -332,6 +332,32 @@ public void setName(String name) {
 
 
 
+    // @info.archinnov.achilles.annotations.Transient
+    // @info.archinnov.achilles.annotations.Column("ownedAnnotatingRelationship")
+    private Collection<Annotation> ownedAnnotatingRelationship;
+
+    @JsonGetter
+    @JsonSerialize(contentUsing = DataSerializer.class)
+    // @javax.persistence.Transient
+    @ManyToAny(metaDef = "AnnotationMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY)
+    @JoinTable(name = "Documentation_ownedAnnotatingRelationship",
+            joinColumns = @JoinColumn(name = "class_id"),
+            inverseJoinColumns = @JoinColumn(name = "attribute_id"))
+    public Collection<Annotation> getOwnedAnnotatingRelationship() {
+        if (ownedAnnotatingRelationship == null) {
+            ownedAnnotatingRelationship = new ArrayList<>();
+        }
+        return ownedAnnotatingRelationship;
+    }
+
+    @JsonSetter
+    @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = AnnotationImpl.class)
+    public void setOwnedAnnotatingRelationship(Collection<Annotation> ownedAnnotatingRelationship) {
+        this.ownedAnnotatingRelationship = ownedAnnotatingRelationship;
+    }
+
+
+
     // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("ownedAnnotation")
     private List<Annotation> ownedAnnotation;

diff --git a/app/org/omg/sysml/metamodel/impl/FlowConnectionUsageImpl.java b/app/org/omg/sysml/metamodel/impl/FlowConnectionUsageImpl.java
@@ -843,22 +843,6 @@ public void setIsDerived(Boolean isDerived) {
 
 
 
-    // @info.archinnov.achilles.annotations.Column("isDirected")
-    private Boolean isDirected;
-
-    @JsonGetter
-    @javax.persistence.Column(name = "isDirected", table = "FlowConnectionUsage")
-    public Boolean getIsDirected() {
-        return isDirected;
-    }
-
-    @JsonSetter
-    public void setIsDirected(Boolean isDirected) {
-        this.isDirected = isDirected;
-    }
-
-
-
     // @info.archinnov.achilles.annotations.Column("isEnd")
     private Boolean isEnd;
 

diff --git a/app/org/omg/sysml/metamodel/impl/InterfaceUsageImpl.java b/app/org/omg/sysml/metamodel/impl/InterfaceUsageImpl.java
@@ -765,22 +765,6 @@ public void setIsDerived(Boolean isDerived) {
 
 
 
-    // @info.archinnov.achilles.annotations.Column("isDirected")
-    private Boolean isDirected;
-
-    @JsonGetter
-    @javax.persistence.Column(name = "isDirected", table = "InterfaceUsage")
-    public Boolean getIsDirected() {
-        return isDirected;
-    }
-
-    @JsonSetter
-    public void setIsDirected(Boolean isDirected) {
-        this.isDirected = isDirected;
-    }
-
-
-
     // @info.archinnov.achilles.annotations.Column("isEnd")
     private Boolean isEnd;
 

diff --git a/app/org/omg/sysml/metamodel/impl/ItemFlowImpl.java b/app/org/omg/sysml/metamodel/impl/ItemFlowImpl.java
@@ -692,22 +692,6 @@ public void setIsDerived(Boolean isDerived) {
 
 
 
-    // @info.archinnov.achilles.annotations.Column("isDirected")
-    private Boolean isDirected;
-
-    @JsonGetter
-    @javax.persistence.Column(name = "isDirected", table = "ItemFlow")
-    public Boolean getIsDirected() {
-        return isDirected;
-    }
-
-    @JsonSetter
-    public void setIsDirected(Boolean isDirected) {
-        this.isDirected = isDirected;
-    }
-
-
-
     // @info.archinnov.achilles.annotations.Column("isEnd")
     private Boolean isEnd;
 

diff --git a/app/org/omg/sysml/metamodel/impl/MetadataFeatureImpl.java b/app/org/omg/sysml/metamodel/impl/MetadataFeatureImpl.java
@@ -908,6 +908,32 @@ public void setOutput(List<Feature> output) {
 
 
 
+    // @info.archinnov.achilles.annotations.Transient
+    // @info.archinnov.achilles.annotations.Column("ownedAnnotatingRelationship")
+    private Collection<Annotation> ownedAnnotatingRelationship;
+
+    @JsonGetter
+    @JsonSerialize(contentUsing = DataSerializer.class)
+    // @javax.persistence.Transient
+    @ManyToAny(metaDef = "AnnotationMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY)
+    @JoinTable(name = "MetadataFeature_ownedAnnotatingRelationship",
+            joinColumns = @JoinColumn(name = "class_id"),
+            inverseJoinColumns = @JoinColumn(name = "attribute_id"))
+    public Collection<Annotation> getOwnedAnnotatingRelationship() {
+        if (ownedAnnotatingRelationship == null) {
+            ownedAnnotatingRelationship = new ArrayList<>();
+        }
+        return ownedAnnotatingRelationship;
+    }
+
+    @JsonSetter
+    @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = AnnotationImpl.class)
+    public void setOwnedAnnotatingRelationship(Collection<Annotation> ownedAnnotatingRelationship) {
+        this.ownedAnnotatingRelationship = ownedAnnotatingRelationship;
+    }
+
+
+
     // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("ownedAnnotation")
     private List<Annotation> ownedAnnotation;