Merge branch 'release/2022-11-rc2'

app/org/omg/sysml/lifecycle/impl/package-info.java

@@ -123,6 +123,8 @@
                         @MetaValue(value = "LiteralString", targetEntity = LiteralStringImpl.class),
                         @MetaValue(value = "LoopActionUsage", targetEntity = LoopActionUsageImpl.class),
                         @MetaValue(value = "Membership", targetEntity = MembershipImpl.class),
+                        @MetaValue(value = "MembershipExpose", targetEntity = MembershipExposeImpl.class),
+                        @MetaValue(value = "MembershipImport", targetEntity = MembershipImportImpl.class),
                         @MetaValue(value = "MergeNode", targetEntity = MergeNodeImpl.class),
                         @MetaValue(value = "Metaclass", targetEntity = MetaclassImpl.class),
                         @MetaValue(value = "MetadataAccessExpression", targetEntity = MetadataAccessExpressionImpl.class),
@@ -132,6 +134,8 @@
                         @MetaValue(value = "Multiplicity", targetEntity = MultiplicityImpl.class),
                         @MetaValue(value = "MultiplicityRange", targetEntity = MultiplicityRangeImpl.class),
                         @MetaValue(value = "Namespace", targetEntity = NamespaceImpl.class),
+                        @MetaValue(value = "NamespaceExpose", targetEntity = NamespaceExposeImpl.class),
+                        @MetaValue(value = "NamespaceImport", targetEntity = NamespaceImportImpl.class),
                         @MetaValue(value = "NullExpression", targetEntity = NullExpressionImpl.class),
                         @MetaValue(value = "ObjectiveMembership", targetEntity = ObjectiveMembershipImpl.class),
                         @MetaValue(value = "OccurrenceDefinition", targetEntity = OccurrenceDefinitionImpl.class),

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

@@ -27,15 +27,13 @@
 import java.util.Set;
 
 public interface Import extends Relationship, SysMLType {
-    Namespace getImportedNamespace();
-
     Namespace getImportOwningNamespace();
 
     VisibilityKind getVisibility();
 
-    String getImportedMemberName();
-
     Boolean getIsRecursive();
 
     Boolean getIsImportAll();
+
+    Element getImportedElement();
 }

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

@@ -0,0 +1,31 @@
+/*
+ * SysML v2 REST/HTTP Pilot Implementation
+ * Copyright (C) 2020 InterCAX LLC
+ * Copyright (C) 2020 California Institute of Technology ("Caltech")
+ * Copyright (C) 2021-2022 Twingineer LLC
+ *
+ * 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 MembershipExpose extends Expose, MembershipImport, SysMLType {
+
+}

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

@@ -0,0 +1,31 @@
+/*
+ * SysML v2 REST/HTTP Pilot Implementation
+ * Copyright (C) 2020 InterCAX LLC
+ * Copyright (C) 2020 California Institute of Technology ("Caltech")
+ * Copyright (C) 2021-2022 Twingineer LLC
+ *
+ * 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 MembershipImport extends Import, SysMLType {
+    Membership getImportedMembership();
+}

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

@@ -0,0 +1,31 @@
+/*
+ * SysML v2 REST/HTTP Pilot Implementation
+ * Copyright (C) 2020 InterCAX LLC
+ * Copyright (C) 2020 California Institute of Technology ("Caltech")
+ * Copyright (C) 2021-2022 Twingineer LLC
+ *
+ * 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 NamespaceExpose extends Expose, NamespaceImport, SysMLType {
+
+}

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

@@ -0,0 +1,31 @@
+/*
+ * SysML v2 REST/HTTP Pilot Implementation
+ * Copyright (C) 2020 InterCAX LLC
+ * Copyright (C) 2020 California Institute of Technology ("Caltech")
+ * Copyright (C) 2021-2022 Twingineer LLC
+ *
+ * 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 NamespaceImport extends Import, SysMLType {
+    Namespace getImportedNamespace();
+}

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

@@ -31,11 +31,9 @@ public interface ViewUsage extends PartUsage, SysMLType {
 
     List<? extends ViewpointUsage> getSatisfiedViewpoint();
 
-    List<? extends Namespace> getExposedNamespace();
+    List<? extends Element> getExposedElement();
 
     RenderingUsage getViewRendering();
 
     List<? extends Expression> getViewCondition();
-
-    List<? extends Element> getViewedElement();
 }

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

@@ -69,7 +69,7 @@
 @DiscriminatorValue(value = "Expose")
 @JsonTypeName(value = "Expose")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME)
-public class ExposeImpl extends SysMLTypeImpl implements Expose {
+public abstract class ExposeImpl extends SysMLTypeImpl implements Expose {
     // @info.archinnov.achilles.annotations.Column("aliasIds")
     private List<String> aliasIds;
 
@@ -176,39 +176,23 @@ public void setImportOwningNamespace(Namespace importOwningNamespace) {
 
 
 
-    // @info.archinnov.achilles.annotations.Column("importedMemberName")
-    private String importedMemberName;
-
-    @JsonGetter
-    @Lob
-    @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType")
-    @javax.persistence.Column(name = "importedMemberName", table = "Expose")
-    public String getImportedMemberName() {
-        return importedMemberName;
-    }
-
-    @JsonSetter
-    public void setImportedMemberName(String importedMemberName) {
-        this.importedMemberName = importedMemberName;
-    }
-
-
-
-    // @info.archinnov.achilles.annotations.Column("importedNamespace")
-    private Namespace importedNamespace;
+    // @info.archinnov.achilles.annotations.Transient
+    // @info.archinnov.achilles.annotations.Column("importedElement")
+    private Element importedElement;
 
     @JsonGetter
     @JsonSerialize(using = DataSerializer.class)
-    @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "importedNamespace_type"), fetch = FetchType.LAZY)
-    @JoinColumn(name = "importedNamespace_id", table = "Expose")
-    public Namespace getImportedNamespace() {
-        return importedNamespace;
+    // @javax.persistence.Transient
+    @Any(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "importedElement_type"), fetch = FetchType.LAZY)
+    @JoinColumn(name = "importedElement_id", table = "Expose")
+    public Element getImportedElement() {
+        return importedElement;
     }
 
     @JsonSetter
-    @JsonDeserialize(using = DataDeserializer.class, as = NamespaceImpl.class)
-    public void setImportedNamespace(Namespace importedNamespace) {
-        this.importedNamespace = importedNamespace;
+    @JsonDeserialize(using = DataDeserializer.class, as = ElementImpl.class)
+    public void setImportedElement(Element importedElement) {
+        this.importedElement = importedElement;
     }
 
 

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

@@ -69,7 +69,7 @@
 @DiscriminatorValue(value = "Import")
 @JsonTypeName(value = "Import")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME)
-public class ImportImpl extends SysMLTypeImpl implements Import {
+public abstract class ImportImpl extends SysMLTypeImpl implements Import {
     // @info.archinnov.achilles.annotations.Column("aliasIds")
     private List<String> aliasIds;
 
@@ -176,39 +176,23 @@ public void setImportOwningNamespace(Namespace importOwningNamespace) {
 
 
 
-    // @info.archinnov.achilles.annotations.Column("importedMemberName")
-    private String importedMemberName;
-
-    @JsonGetter
-    @Lob
-    @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType")
-    @javax.persistence.Column(name = "importedMemberName", table = "Import")
-    public String getImportedMemberName() {
-        return importedMemberName;
-    }
-
-    @JsonSetter
-    public void setImportedMemberName(String importedMemberName) {
-        this.importedMemberName = importedMemberName;
-    }
-
-
-
-    // @info.archinnov.achilles.annotations.Column("importedNamespace")
-    private Namespace importedNamespace;
+    // @info.archinnov.achilles.annotations.Transient
+    // @info.archinnov.achilles.annotations.Column("importedElement")
+    private Element importedElement;
 
     @JsonGetter
     @JsonSerialize(using = DataSerializer.class)
-    @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "importedNamespace_type"), fetch = FetchType.LAZY)
-    @JoinColumn(name = "importedNamespace_id", table = "Import")
-    public Namespace getImportedNamespace() {
-        return importedNamespace;
+    // @javax.persistence.Transient
+    @Any(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "importedElement_type"), fetch = FetchType.LAZY)
+    @JoinColumn(name = "importedElement_id", table = "Import")
+    public Element getImportedElement() {
+        return importedElement;
     }
 
     @JsonSetter
-    @JsonDeserialize(using = DataDeserializer.class, as = NamespaceImpl.class)
-    public void setImportedNamespace(Namespace importedNamespace) {
-        this.importedNamespace = importedNamespace;
+    @JsonDeserialize(using = DataDeserializer.class, as = ElementImpl.class)
+    public void setImportedElement(Element importedElement) {
+        this.importedElement = importedElement;
     }