Merge branch 'release/2022-03'

Systems-Modeling · Apr 7, 2022 · 44041c1 · 44041c1
2 parents 97fe096 + a426861
commit 44041c1
Show file tree

Hide file tree

Showing 502 changed files with 10,204 additions and 11,484 deletions.
diff --git a/app/org/omg/sysml/lifecycle/impl/package-info.java b/app/org/omg/sysml/lifecycle/impl/package-info.java
@@ -36,7 +36,6 @@
                         @MetaValue(value = "AnalysisCaseDefinition", targetEntity = AnalysisCaseDefinitionImpl.class),
                         @MetaValue(value = "AnalysisCaseUsage", targetEntity = AnalysisCaseUsageImpl.class),
                         @MetaValue(value = "AnnotatingElement", targetEntity = AnnotatingElementImpl.class),
-                        @MetaValue(value = "AnnotatingFeature", targetEntity = AnnotatingFeatureImpl.class),
                         @MetaValue(value = "Annotation", targetEntity = AnnotationImpl.class),
                         @MetaValue(value = "AssertConstraintUsage", targetEntity = AssertConstraintUsageImpl.class),
                         @MetaValue(value = "AssignmentActionUsage", targetEntity = AssignmentActionUsageImpl.class),
@@ -120,8 +119,10 @@
                         @MetaValue(value = "LoopActionUsage", targetEntity = LoopActionUsageImpl.class),
                         @MetaValue(value = "Membership", targetEntity = MembershipImpl.class),
                         @MetaValue(value = "MergeNode", targetEntity = MergeNodeImpl.class),
+                        @MetaValue(value = "Metaclass", targetEntity = MetaclassImpl.class),
+                        @MetaValue(value = "MetadataDefinition", targetEntity = MetadataDefinitionImpl.class),
                         @MetaValue(value = "MetadataFeature", targetEntity = MetadataFeatureImpl.class),
-                        @MetaValue(value = "MetadataFeatureValue", targetEntity = MetadataFeatureValueImpl.class),
+                        @MetaValue(value = "MetadataUsage", targetEntity = MetadataUsageImpl.class),
                         @MetaValue(value = "Multiplicity", targetEntity = MultiplicityImpl.class),
                         @MetaValue(value = "MultiplicityRange", targetEntity = MultiplicityRangeImpl.class),
                         @MetaValue(value = "Namespace", targetEntity = NamespaceImpl.class),

diff --git a/app/org/omg/sysml/metamodel/Comment.java b/app/org/omg/sysml/metamodel/Comment.java
@@ -26,5 +26,7 @@
 import java.util.Set;
 
 public interface Comment extends AnnotatingElement, SysMLType {
+    String getLocale();
+
     String getBody();
 }
diff --git a/app/org/omg/sysml/metamodel/Documentation.java b/app/org/omg/sysml/metamodel/Documentation.java
@@ -25,8 +25,6 @@
 import java.util.List;
 import java.util.Set;
 
-public interface Documentation extends Annotation, SysMLType {
-    Element getOwningDocumentedElement();
-
-    Comment getDocumentingComment();
+public interface Documentation extends Comment, SysMLType {
+    Element getDocumentedElement();
 }
diff --git a/app/org/omg/sysml/metamodel/Element.java b/app/org/omg/sysml/metamodel/Element.java
@@ -44,11 +44,9 @@ public interface Element extends SysMLType {
 
     List<? extends Documentation> getDocumentation();
 
-    List<? extends Comment> getDocumentationComment();
-
     List<? extends Annotation> getOwnedAnnotation();
 
-    Collection<? extends TextualRepresentation> getOwnedTextualRepresentation();
+    List<? extends TextualRepresentation> getTextualRepresentation();
 
     String getQualifiedName();
 

diff --git a/...sysml/metamodel/MetadataFeatureValue.java → app/org/omg/sysml/metamodel/Metaclass.java b/...sysml/metamodel/MetadataFeatureValue.java → app/org/omg/sysml/metamodel/Metaclass.java
@@ -25,8 +25,6 @@
 import java.util.List;
 import java.util.Set;
 
-public interface MetadataFeatureValue extends FeatureValue, SysMLType {
-    Expression getMetadataValue();
+public interface Metaclass extends Structure, SysMLType {
 
-    MetadataFeature getOwningMetadataFeature();
 }
diff --git a/...mg/sysml/metamodel/AnnotatingFeature.java → ...g/sysml/metamodel/MetadataDefinition.java b/...mg/sysml/metamodel/AnnotatingFeature.java → ...g/sysml/metamodel/MetadataDefinition.java
@@ -25,8 +25,6 @@
 import java.util.List;
 import java.util.Set;
 
-public interface AnnotatingFeature extends AnnotatingElement, Feature, SysMLType {
-    DataType getMetadataType();
+public interface MetadataDefinition extends Definition, ItemDefinition, Metaclass, SysMLType {
 
-    List<? extends MetadataFeature> getOwnedMetadata();
 }
diff --git a/app/org/omg/sysml/metamodel/MetadataFeature.java b/app/org/omg/sysml/metamodel/MetadataFeature.java
@@ -25,6 +25,6 @@
 import java.util.List;
 import java.util.Set;
 
-public interface MetadataFeature extends Feature, SysMLType {
-    MetadataFeatureValue getMetadataFeatureValue();
+public interface MetadataFeature extends AnnotatingElement, Feature, SysMLType {
+    Metaclass getMetaclass();
 }
diff --git a/app/org/omg/sysml/metamodel/MetadataUsage.java b/app/org/omg/sysml/metamodel/MetadataUsage.java
@@ -0,0 +1,30 @@
+/*
+ * SysML v2 REST/HTTP Pilot Implementation
+ * Copyright (C) 2020  InterCAX LLC
+ * Copyright (C) 2020  California Institute of Technology ("Caltech")
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * @license LGPL-3.0-or-later <http://spdx.org/licenses/LGPL-3.0-or-later>
+ */
+
+package org.omg.sysml.metamodel;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+public interface MetadataUsage extends ItemUsage, MetadataFeature, Usage, SysMLType {
+    Metaclass getMetadataDefinition();
+}
diff --git a/app/org/omg/sysml/metamodel/TextualRepresentation.java b/app/org/omg/sysml/metamodel/TextualRepresentation.java
@@ -28,7 +28,7 @@
 public interface TextualRepresentation extends AnnotatingElement, SysMLType {
     String getLanguage();
 
-    String getBody();
-
     Element getRepresentedElement();
+
+    String getBody();
 }
diff --git a/app/org/omg/sysml/metamodel/impl/AcceptActionUsageImpl.java b/app/org/omg/sysml/metamodel/impl/AcceptActionUsageImpl.java
@@ -292,32 +292,6 @@ public void setDocumentation(List<Documentation> documentation) {
 
 
 
-    // @info.archinnov.achilles.annotations.Transient
-    // @info.archinnov.achilles.annotations.Column("documentationComment")
-    private List<Comment> documentationComment;
-
-    @JsonGetter
-    @JsonSerialize(contentUsing = DataSerializer.class)
-    // @javax.persistence.Transient
-    @ManyToAny(metaDef = "CommentMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
-    @JoinTable(name = "AcceptActionUsage_documentationComment",
-            joinColumns = @JoinColumn(name = "classId"),
-            inverseJoinColumns = @JoinColumn(name = "attributeId"))
-    public List<Comment> getDocumentationComment() {
-        if (documentationComment == null) {
-            documentationComment = new ArrayList<>();
-        }
-        return documentationComment;
-    }
-
-    @JsonSetter
-    @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = CommentImpl.class)
-    public void setDocumentationComment(List<Comment> documentationComment) {
-        this.documentationComment = documentationComment;
-    }
-
-
-
     // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("effectiveName")
     private String effectiveName;
@@ -2056,32 +2030,6 @@ public void setOwnedSubsetting(Collection<Subsetting> ownedSubsetting) {
 
 
 
-    // @info.archinnov.achilles.annotations.Transient
-    // @info.archinnov.achilles.annotations.Column("ownedTextualRepresentation")
-    private Collection<TextualRepresentation> ownedTextualRepresentation;
-
-    @JsonGetter
-    @JsonSerialize(contentUsing = DataSerializer.class)
-    // @javax.persistence.Transient
-    @ManyToAny(metaDef = "TextualRepresentationMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
-    @JoinTable(name = "AcceptActionUsage_ownedTextualRepresentation",
-            joinColumns = @JoinColumn(name = "classId"),
-            inverseJoinColumns = @JoinColumn(name = "attributeId"))
-    public Collection<TextualRepresentation> getOwnedTextualRepresentation() {
-        if (ownedTextualRepresentation == null) {
-            ownedTextualRepresentation = new ArrayList<>();
-        }
-        return ownedTextualRepresentation;
-    }
-
-    @JsonSetter
-    @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TextualRepresentationImpl.class)
-    public void setOwnedTextualRepresentation(Collection<TextualRepresentation> ownedTextualRepresentation) {
-        this.ownedTextualRepresentation = ownedTextualRepresentation;
-    }
-
-
-
     // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing")
     private List<TypeFeaturing> ownedTypeFeaturing;
@@ -2444,6 +2392,32 @@ public void setReceiverArgument(Expression receiverArgument) {
 
 
 
+    // @info.archinnov.achilles.annotations.Transient
+    // @info.archinnov.achilles.annotations.Column("textualRepresentation")
+    private List<TextualRepresentation> textualRepresentation;
+
+    @JsonGetter
+    @JsonSerialize(contentUsing = DataSerializer.class)
+    // @javax.persistence.Transient
+    @ManyToAny(metaDef = "TextualRepresentationMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+    @JoinTable(name = "AcceptActionUsage_textualRepresentation",
+            joinColumns = @JoinColumn(name = "classId"),
+            inverseJoinColumns = @JoinColumn(name = "attributeId"))
+    public List<TextualRepresentation> getTextualRepresentation() {
+        if (textualRepresentation == null) {
+            textualRepresentation = new ArrayList<>();
+        }
+        return textualRepresentation;
+    }
+
+    @JsonSetter
+    @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TextualRepresentationImpl.class)
+    public void setTextualRepresentation(List<TextualRepresentation> textualRepresentation) {
+        this.textualRepresentation = textualRepresentation;
+    }
+
+
+
     // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("type")
     private List<Type> type;

diff --git a/app/org/omg/sysml/metamodel/impl/ActionDefinitionImpl.java b/app/org/omg/sysml/metamodel/impl/ActionDefinitionImpl.java
@@ -196,32 +196,6 @@ public void setDocumentation(List<Documentation> documentation) {
 
 
 
-    // @info.archinnov.achilles.annotations.Transient
-    // @info.archinnov.achilles.annotations.Column("documentationComment")
-    private List<Comment> documentationComment;
-
-    @JsonGetter
-    @JsonSerialize(contentUsing = DataSerializer.class)
-    // @javax.persistence.Transient
-    @ManyToAny(metaDef = "CommentMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
-    @JoinTable(name = "ActionDefinition_documentationComment",
-            joinColumns = @JoinColumn(name = "classId"),
-            inverseJoinColumns = @JoinColumn(name = "attributeId"))
-    public List<Comment> getDocumentationComment() {
-        if (documentationComment == null) {
-            documentationComment = new ArrayList<>();
-        }
-        return documentationComment;
-    }
-
-    @JsonSetter
-    @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = CommentImpl.class)
-    public void setDocumentationComment(List<Comment> documentationComment) {
-        this.documentationComment = documentationComment;
-    }
-
-
-
     // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("effectiveName")
     private String effectiveName;
@@ -1531,32 +1505,6 @@ public void setOwnedSubclassification(Collection<Subclassification> ownedSubclas
 
 
 
-    // @info.archinnov.achilles.annotations.Transient
-    // @info.archinnov.achilles.annotations.Column("ownedTextualRepresentation")
-    private Collection<TextualRepresentation> ownedTextualRepresentation;
-
-    @JsonGetter
-    @JsonSerialize(contentUsing = DataSerializer.class)
-    // @javax.persistence.Transient
-    @ManyToAny(metaDef = "TextualRepresentationMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
-    @JoinTable(name = "ActionDefinition_ownedTextualRepresentation",
-            joinColumns = @JoinColumn(name = "classId"),
-            inverseJoinColumns = @JoinColumn(name = "attributeId"))
-    public Collection<TextualRepresentation> getOwnedTextualRepresentation() {
-        if (ownedTextualRepresentation == null) {
-            ownedTextualRepresentation = new ArrayList<>();
-        }
-        return ownedTextualRepresentation;
-    }
-
-    @JsonSetter
-    @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TextualRepresentationImpl.class)
-    public void setOwnedTextualRepresentation(Collection<TextualRepresentation> ownedTextualRepresentation) {
-        this.ownedTextualRepresentation = ownedTextualRepresentation;
-    }
-
-
-
     // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("ownedTransition")
     private Collection<TransitionUsage> ownedTransition;
@@ -1865,6 +1813,32 @@ public void setStep(Collection<Step> step) {
 
 
 
+    // @info.archinnov.achilles.annotations.Transient
+    // @info.archinnov.achilles.annotations.Column("textualRepresentation")
+    private List<TextualRepresentation> textualRepresentation;
+
+    @JsonGetter
+    @JsonSerialize(contentUsing = DataSerializer.class)
+    // @javax.persistence.Transient
+    @ManyToAny(metaDef = "TextualRepresentationMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+    @JoinTable(name = "ActionDefinition_textualRepresentation",
+            joinColumns = @JoinColumn(name = "classId"),
+            inverseJoinColumns = @JoinColumn(name = "attributeId"))
+    public List<TextualRepresentation> getTextualRepresentation() {
+        if (textualRepresentation == null) {
+            textualRepresentation = new ArrayList<>();
+        }
+        return textualRepresentation;
+    }
+
+    @JsonSetter
+    @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TextualRepresentationImpl.class)
+    public void setTextualRepresentation(List<TextualRepresentation> textualRepresentation) {
+        this.textualRepresentation = textualRepresentation;
+    }
+
+
+
     // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("usage")
     private List<Usage> usage;