Merge branch 'release/2020-11-rc1'

# Conflicts:
#	README.md

README.md

@@ -19,7 +19,7 @@ This pilot implementation uses PostgreSQL as the backend database. The easiest w
 
 2. Use the `docker run` command to start a docker container from the downloaded image, as shown below. This will initialize PostgreSQL database in a Docker container and make it available at port 5432 on your local machine.
 
-`docker run --name sysml2-postgres -p 5432:5432 -e POSTGRES_PASSWORD=mysecretpassword -e POSTGRES_DB=sysml2 -d postgres`
+   ```docker run --name sysml2-postgres -p 5432:5432 -e POSTGRES_PASSWORD=mysecretpassword -e POSTGRES_DB=sysml2 -d postgres```
 
 3. Connect to the PostgreSQL database, running as a docker container, from any PostgreSQL client to verify. Use the following connection details. 
 - Host = localhost

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

@@ -28,8 +28,6 @@
 public interface Association extends Class, Relationship, MofObject {
     List<? extends Type> getRelatedType();
 
-    Connector getOwningConnector();
-
     Collection<? extends Feature> getAssociationEnd();
 
     Type getSourceType();

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

@@ -32,8 +32,6 @@ public interface Connector extends Feature, Relationship, MofObject {
 
     Boolean getIsDirected();
 
-    Collection<? extends Association> getOwnedAssociationType();
-
     Collection<? extends Feature> getConnectorEnd();
 
     Feature getSourceFeature();

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

@@ -26,8 +26,6 @@
 import java.util.Set;
 
 public interface Feature extends Type, MofObject {
-    Collection<? extends Type> getReferencedType();
-
     Type getOwningType();
 
     Boolean getIsUnique();
@@ -36,8 +34,6 @@ public interface Feature extends Type, MofObject {
 
     Collection<? extends Type> getType();
 
-    Collection<? extends Type> getOwnedType();
-
     Collection<? extends Redefinition> getOwnedRedefinition();
 
     Collection<? extends Subsetting> getOwnedSubsetting();
@@ -52,5 +48,9 @@ public interface Feature extends Type, MofObject {
 
     Collection<? extends FeatureTyping> getOwnedTyping();
 
+    Collection<? extends Type> getFeaturingType();
+
+    Collection<? extends TypeFeaturing> getOwnedTypeFeaturing();
+
     Boolean getIsNonunique();
 }

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

@@ -25,7 +25,7 @@
 import java.util.List;
 import java.util.Set;
 
-public interface FeatureMembership extends Membership, MofObject {
+public interface FeatureMembership extends Membership, TypeFeaturing, MofObject {
     Type getOwningType();
 
     Boolean getIsDerived();

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

@@ -25,10 +25,10 @@
 import java.util.List;
 import java.util.Set;
 
-public interface FeatureValue extends FeatureMembership, MofObject {
+public interface FeatureValue extends Membership, MofObject {
     Feature getFeatureWithValue();
 
-    BindingConnector getValueConnector();
-
     Expression getValue();
+
+    BindingConnector getValueConnector();
 }

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

@@ -0,0 +1,34 @@
+/*
+ * 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 RequirementVerificationMembership extends RequirementConstraintMembership, MofObject {
+    RequirementUsage getOwnedRequirement();
+
+    RequirementConstraintKind getKind();
+
+    RequirementUsage getVerifiedRequirement();
+}

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

@@ -0,0 +1,34 @@
+/*
+ * 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 TypeFeaturing extends Relationship, MofObject {
+    Feature getFeatureOfType();
+
+    Type getFeaturingType();
+
+    Feature getOwningFeatureOfType();
+}

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

@@ -26,5 +26,5 @@
 import java.util.Set;
 
 public interface VerificationCaseDefinition extends CaseDefinition, MofObject {
-
+    Collection<? extends RequirementUsage> getVerifiedRequirement();
 }

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

@@ -27,4 +27,6 @@
 
 public interface VerificationCaseUsage extends CaseUsage, MofObject {
     VerificationCaseDefinition getVerificationCaseDefinition();
+
+    Collection<? extends RequirementUsage> getVerifiedRequirement();
 }

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

@@ -314,6 +314,32 @@ public void setFeatureMembership(List<FeatureMembership> featureMembership) {
 
 
 
+    // @info.archinnov.achilles.annotations.Transient
+    // @info.archinnov.achilles.annotations.Column("featuringType")
+    private Collection<Type> featuringType;
+
+    @JsonGetter
+    @JsonSerialize(contentUsing = MofObjectSerializer.class)
+    // @javax.persistence.Transient
+    @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+    @JoinTable(name = "AcceptActionUsage_featuringType",
+            joinColumns = @JoinColumn(name = "classId"),
+            inverseJoinColumns = @JoinColumn(name = "attributeId"))
+    public Collection<Type> getFeaturingType() {
+        if (featuringType == null) {
+            featuringType = new ArrayList<>();
+        }
+        return featuringType;
+    }
+
+    @JsonSetter
+    @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class)
+    public void setFeaturingType(Collection<Type> featuringType) {
+        this.featuringType = featuringType;
+    }
+
+
+
     // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("flowFeature")
     private Collection<Usage> flowFeature;
@@ -1645,27 +1671,27 @@ public void setOwnedTextualRepresentation(Collection<TextualRepresentation> owne
 
 
     // @info.archinnov.achilles.annotations.Transient
-    // @info.archinnov.achilles.annotations.Column("ownedType")
-    private Collection<Type> ownedType;
+    // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing")
+    private Collection<TypeFeaturing> ownedTypeFeaturing;
 
     @JsonGetter
     @JsonSerialize(contentUsing = MofObjectSerializer.class)
     // @javax.persistence.Transient
-    @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
-    @JoinTable(name = "AcceptActionUsage_ownedType",
+    @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+    @JoinTable(name = "AcceptActionUsage_ownedTypeFeaturing",
             joinColumns = @JoinColumn(name = "classId"),
             inverseJoinColumns = @JoinColumn(name = "attributeId"))
-    public Collection<Type> getOwnedType() {
-        if (ownedType == null) {
-            ownedType = new ArrayList<>();
+    public Collection<TypeFeaturing> getOwnedTypeFeaturing() {
+        if (ownedTypeFeaturing == null) {
+            ownedTypeFeaturing = new ArrayList<>();
         }
-        return ownedType;
+        return ownedTypeFeaturing;
     }
 
     @JsonSetter
-    @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class)
-    public void setOwnedType(Collection<Type> ownedType) {
-        this.ownedType = ownedType;
+    @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class)
+    public void setOwnedTypeFeaturing(Collection<TypeFeaturing> ownedTypeFeaturing) {
+        this.ownedTypeFeaturing = ownedTypeFeaturing;
     }
 
 
@@ -1884,32 +1910,6 @@ public void setParameter(Collection<Feature> parameter) {
 
 
 
-    // @info.archinnov.achilles.annotations.Transient
-    // @info.archinnov.achilles.annotations.Column("referencedType")
-    private Collection<Type> referencedType;
-
-    @JsonGetter
-    @JsonSerialize(contentUsing = MofObjectSerializer.class)
-    // @javax.persistence.Transient
-    @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
-    @JoinTable(name = "AcceptActionUsage_referencedType",
-            joinColumns = @JoinColumn(name = "classId"),
-            inverseJoinColumns = @JoinColumn(name = "attributeId"))
-    public Collection<Type> getReferencedType() {
-        if (referencedType == null) {
-            referencedType = new ArrayList<>();
-        }
-        return referencedType;
-    }
-
-    @JsonSetter
-    @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class)
-    public void setReferencedType(Collection<Type> referencedType) {
-        this.referencedType = referencedType;
-    }
-
-
-
     // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("type")
     private Collection<Type> type;

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

@@ -293,6 +293,32 @@ public void setFeatureMembership(List<FeatureMembership> featureMembership) {
 
 
 
+    // @info.archinnov.achilles.annotations.Transient
+    // @info.archinnov.achilles.annotations.Column("featuringType")
+    private Collection<Type> featuringType;
+
+    @JsonGetter
+    @JsonSerialize(contentUsing = MofObjectSerializer.class)
+    // @javax.persistence.Transient
+    @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+    @JoinTable(name = "ActionUsage_featuringType",
+            joinColumns = @JoinColumn(name = "classId"),
+            inverseJoinColumns = @JoinColumn(name = "attributeId"))
+    public Collection<Type> getFeaturingType() {
+        if (featuringType == null) {
+            featuringType = new ArrayList<>();
+        }
+        return featuringType;
+    }
+
+    @JsonSetter
+    @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class)
+    public void setFeaturingType(Collection<Type> featuringType) {
+        this.featuringType = featuringType;
+    }
+
+
+
     // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("flowFeature")
     private Collection<Usage> flowFeature;
@@ -1624,27 +1650,27 @@ public void setOwnedTextualRepresentation(Collection<TextualRepresentation> owne
 
 
     // @info.archinnov.achilles.annotations.Transient
-    // @info.archinnov.achilles.annotations.Column("ownedType")
-    private Collection<Type> ownedType;
+    // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing")
+    private Collection<TypeFeaturing> ownedTypeFeaturing;
 
     @JsonGetter
     @JsonSerialize(contentUsing = MofObjectSerializer.class)
     // @javax.persistence.Transient
-    @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
-    @JoinTable(name = "ActionUsage_ownedType",
+    @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+    @JoinTable(name = "ActionUsage_ownedTypeFeaturing",
             joinColumns = @JoinColumn(name = "classId"),
             inverseJoinColumns = @JoinColumn(name = "attributeId"))
-    public Collection<Type> getOwnedType() {
-        if (ownedType == null) {
-            ownedType = new ArrayList<>();
+    public Collection<TypeFeaturing> getOwnedTypeFeaturing() {
+        if (ownedTypeFeaturing == null) {
+            ownedTypeFeaturing = new ArrayList<>();
         }
-        return ownedType;
+        return ownedTypeFeaturing;
     }
 
     @JsonSetter
-    @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class)
-    public void setOwnedType(Collection<Type> ownedType) {
-        this.ownedType = ownedType;
+    @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class)
+    public void setOwnedTypeFeaturing(Collection<TypeFeaturing> ownedTypeFeaturing) {
+        this.ownedTypeFeaturing = ownedTypeFeaturing;
     }
 
 
@@ -1863,32 +1889,6 @@ public void setParameter(Collection<Feature> parameter) {
 
 
 
-    // @info.archinnov.achilles.annotations.Transient
-    // @info.archinnov.achilles.annotations.Column("referencedType")
-    private Collection<Type> referencedType;
-
-    @JsonGetter
-    @JsonSerialize(contentUsing = MofObjectSerializer.class)
-    // @javax.persistence.Transient
-    @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
-    @JoinTable(name = "ActionUsage_referencedType",
-            joinColumns = @JoinColumn(name = "classId"),
-            inverseJoinColumns = @JoinColumn(name = "attributeId"))
-    public Collection<Type> getReferencedType() {
-        if (referencedType == null) {
-            referencedType = new ArrayList<>();
-        }
-        return referencedType;
-    }
-
-    @JsonSetter
-    @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class)
-    public void setReferencedType(Collection<Type> referencedType) {
-        this.referencedType = referencedType;
-    }
-
-
-
     // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("type")
     private Collection<Type> type;