Merge branch 'release/2020-12-rc1'

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

@@ -0,0 +1,32 @@
+/*
+ * 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 AnnotatingFeature extends AnnotatingElement, Feature, MofObject {
+    DataType getMetadataType();
+
+    Collection<? extends MetadataFeature> getOwnedMetadata();
+}

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

@@ -77,4 +77,6 @@ public interface Definition extends Classifier, MofObject {
     Collection<? extends RenderingUsage> getOwnedRendering();
 
     Collection<? extends VerificationCaseUsage> getOwnedVerificationCase();
+
+    Collection<? extends EnumerationUsage> getOwnedEnumeration();
 }

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

@@ -32,7 +32,7 @@ public interface Element extends MofObject {
 
     java.util.UUID getIdentifier();
 
-    Package getOwningNamespace();
+    Namespace getOwningNamespace();
 
     String getName();
 

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

@@ -0,0 +1,32 @@
+/*
+ * 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 ElementFilter extends Relationship, MofObject {
+    MetadataCondition getCondition();
+
+    Package getFilteredPackage();
+}

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

@@ -0,0 +1,32 @@
+/*
+ * 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 EnumerationDefinition extends AttributeDefinition, MofObject {
+    Collection<? extends EnumerationUsage> getEnumeratedValue();
+
+    Boolean getIsVariation();
+}

app/org/omg/sysml/metamodel/EnumerationUsage.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 EnumerationUsage extends AttributeUsage, MofObject {
+    EnumerationDefinition getEnumerationDefinition();
+}

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

@@ -26,5 +26,5 @@
 import java.util.Set;
 
 public interface Expose extends Import, MofObject {
-    ModelQuery getModelQuery();
+
 }

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

@@ -26,9 +26,11 @@
 import java.util.Set;
 
 public interface Import extends Relationship, MofObject {
-    Package getImportedPackage();
+    Namespace getImportedNamespace();
 
-    Package getImportOwningPackage();
+    Namespace getImportOwningNamespace();
 
     VisibilityKind getVisibility();
+
+    Boolean getIsRecursive();
 }

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

@@ -25,6 +25,6 @@
 import java.util.List;
 import java.util.Set;
 
-public interface LiteralExpression extends Expression, MofObject {
+public interface LiteralExpression extends MetadataExpression, MofObject {
 
 }

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

@@ -34,5 +34,5 @@ public interface Membership extends Relationship, MofObject {
 
     Element getOwnedMemberElement();
 
-    Package getMembershipOwningPackage();
+    Namespace getMembershipOwningNamespace();
 }

app/org/omg/sysml/metamodel/MetadataCondition.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 MetadataCondition extends MetadataExpression, MofObject {
+    Feature getAnnotationParameter();
+}

app/org/omg/sysml/metamodel/ModelQuery.java → app/org/omg/sysml/metamodel/MetadataExpression.java

@@ -25,6 +25,6 @@
 import java.util.List;
 import java.util.Set;
 
-public interface ModelQuery extends Element, MofObject {
+public interface MetadataExpression extends Expression, MofObject {
 
 }

app/org/omg/sysml/metamodel/MetadataFeature.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 MetadataFeature extends Feature, MofObject {
+    MetadataFeatureValue getMetadataFeatureValue();
+}

app/org/omg/sysml/metamodel/MetadataFeatureValue.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 MetadataFeatureValue extends FeatureValue, MofObject {
+    MetadataExpression getMetadataValue();
+}

app/org/omg/sysml/metamodel/MetadataOperationExpression.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 MetadataOperationExpression extends InvocationExpression, MetadataExpression, MofObject {
+    List<? extends MetadataExpression> getArgument();
+}

app/org/omg/sysml/metamodel/MetadataReferenceExpression.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 MetadataReferenceExpression extends FeatureReferenceExpression, MetadataExpression, MofObject {
+    MetadataFeature getReferent();
+}