diff --git a/app/org/omg/sysml/metamodel/AnnotatingFeature.java b/app/org/omg/sysml/metamodel/AnnotatingFeature.java
new file mode 100644
index 00000000..2026e04d
--- /dev/null
+++ b/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 .
+ *
+ * @license 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();
+}
\ No newline at end of file
diff --git a/app/org/omg/sysml/metamodel/Definition.java b/app/org/omg/sysml/metamodel/Definition.java
index 9d6213f7..92c232c9 100644
--- a/app/org/omg/sysml/metamodel/Definition.java
+++ b/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();
}
\ No newline at end of file
diff --git a/app/org/omg/sysml/metamodel/Element.java b/app/org/omg/sysml/metamodel/Element.java
index 7d9c421e..cb02bb1c 100644
--- a/app/org/omg/sysml/metamodel/Element.java
+++ b/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();
diff --git a/app/org/omg/sysml/metamodel/ElementFilter.java b/app/org/omg/sysml/metamodel/ElementFilter.java
new file mode 100644
index 00000000..5c25f522
--- /dev/null
+++ b/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 .
+ *
+ * @license 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();
+}
\ No newline at end of file
diff --git a/app/org/omg/sysml/metamodel/EnumerationDefinition.java b/app/org/omg/sysml/metamodel/EnumerationDefinition.java
new file mode 100644
index 00000000..9186692b
--- /dev/null
+++ b/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 .
+ *
+ * @license 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();
+}
\ No newline at end of file
diff --git a/app/org/omg/sysml/metamodel/EnumerationUsage.java b/app/org/omg/sysml/metamodel/EnumerationUsage.java
new file mode 100644
index 00000000..b9d5fb52
--- /dev/null
+++ b/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 .
+ *
+ * @license 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();
+}
\ No newline at end of file
diff --git a/app/org/omg/sysml/metamodel/Expose.java b/app/org/omg/sysml/metamodel/Expose.java
index 586c14a7..11fc3e9b 100644
--- a/app/org/omg/sysml/metamodel/Expose.java
+++ b/app/org/omg/sysml/metamodel/Expose.java
@@ -26,5 +26,5 @@
import java.util.Set;
public interface Expose extends Import, MofObject {
- ModelQuery getModelQuery();
+
}
\ No newline at end of file
diff --git a/app/org/omg/sysml/metamodel/Import.java b/app/org/omg/sysml/metamodel/Import.java
index aeb7f8c1..e2a6162a 100644
--- a/app/org/omg/sysml/metamodel/Import.java
+++ b/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();
}
\ No newline at end of file
diff --git a/app/org/omg/sysml/metamodel/LiteralExpression.java b/app/org/omg/sysml/metamodel/LiteralExpression.java
index 9072d86f..eb624455 100644
--- a/app/org/omg/sysml/metamodel/LiteralExpression.java
+++ b/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 {
}
\ No newline at end of file
diff --git a/app/org/omg/sysml/metamodel/Membership.java b/app/org/omg/sysml/metamodel/Membership.java
index fcc22569..8c752876 100644
--- a/app/org/omg/sysml/metamodel/Membership.java
+++ b/app/org/omg/sysml/metamodel/Membership.java
@@ -34,5 +34,5 @@ public interface Membership extends Relationship, MofObject {
Element getOwnedMemberElement();
- Package getMembershipOwningPackage();
+ Namespace getMembershipOwningNamespace();
}
\ No newline at end of file
diff --git a/app/org/omg/sysml/metamodel/MetadataCondition.java b/app/org/omg/sysml/metamodel/MetadataCondition.java
new file mode 100644
index 00000000..b62320d8
--- /dev/null
+++ b/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 .
+ *
+ * @license 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();
+}
\ No newline at end of file
diff --git a/app/org/omg/sysml/metamodel/ModelQuery.java b/app/org/omg/sysml/metamodel/MetadataExpression.java
similarity index 93%
rename from app/org/omg/sysml/metamodel/ModelQuery.java
rename to app/org/omg/sysml/metamodel/MetadataExpression.java
index 2ba7129c..43024383 100644
--- a/app/org/omg/sysml/metamodel/ModelQuery.java
+++ b/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 {
}
\ No newline at end of file
diff --git a/app/org/omg/sysml/metamodel/MetadataFeature.java b/app/org/omg/sysml/metamodel/MetadataFeature.java
new file mode 100644
index 00000000..c4a1f151
--- /dev/null
+++ b/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 .
+ *
+ * @license 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();
+}
\ No newline at end of file
diff --git a/app/org/omg/sysml/metamodel/MetadataFeatureValue.java b/app/org/omg/sysml/metamodel/MetadataFeatureValue.java
new file mode 100644
index 00000000..f87e3085
--- /dev/null
+++ b/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 .
+ *
+ * @license 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();
+}
\ No newline at end of file
diff --git a/app/org/omg/sysml/metamodel/MetadataOperationExpression.java b/app/org/omg/sysml/metamodel/MetadataOperationExpression.java
new file mode 100644
index 00000000..dc51d842
--- /dev/null
+++ b/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 .
+ *
+ * @license 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();
+}
\ No newline at end of file
diff --git a/app/org/omg/sysml/metamodel/MetadataReferenceExpression.java b/app/org/omg/sysml/metamodel/MetadataReferenceExpression.java
new file mode 100644
index 00000000..f22d957b
--- /dev/null
+++ b/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 .
+ *
+ * @license 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();
+}
\ No newline at end of file
diff --git a/app/org/omg/sysml/metamodel/Namespace.java b/app/org/omg/sysml/metamodel/Namespace.java
new file mode 100644
index 00000000..c7927e58
--- /dev/null
+++ b/app/org/omg/sysml/metamodel/Namespace.java
@@ -0,0 +1,40 @@
+/*
+ * 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 .
+ *
+ * @license LGPL-3.0-or-later
+ */
+
+package org.omg.sysml.metamodel;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+public interface Namespace extends Element, MofObject {
+ List extends Membership> getMembership();
+
+ List extends Import> getOwnedImport();
+
+ List extends Element> getMember();
+
+ List extends Element> getOwnedMember();
+
+ List extends Membership> getOwnedMembership();
+
+ List extends Membership> getImportedMembership();
+}
\ No newline at end of file
diff --git a/app/org/omg/sysml/metamodel/NullExpression.java b/app/org/omg/sysml/metamodel/NullExpression.java
index 68eea1e3..d1bdd180 100644
--- a/app/org/omg/sysml/metamodel/NullExpression.java
+++ b/app/org/omg/sysml/metamodel/NullExpression.java
@@ -25,6 +25,6 @@
import java.util.List;
import java.util.Set;
-public interface NullExpression extends Expression, MofObject {
+public interface NullExpression extends MetadataExpression, MofObject {
}
\ No newline at end of file
diff --git a/app/org/omg/sysml/metamodel/Package.java b/app/org/omg/sysml/metamodel/Package.java
index 4c205675..b122efd5 100644
--- a/app/org/omg/sysml/metamodel/Package.java
+++ b/app/org/omg/sysml/metamodel/Package.java
@@ -25,16 +25,8 @@
import java.util.List;
import java.util.Set;
-public interface Package extends Element, MofObject {
- List extends Membership> getMembership();
+public interface Package extends Namespace, MofObject {
+ Collection extends MetadataCondition> getFilterCondition();
- List extends Import> getOwnedImport();
-
- List extends Element> getMember();
-
- List extends Element> getOwnedMember();
-
- List extends Membership> getOwnedMembership();
-
- List extends Membership> getImportedMembership();
+ Collection extends ElementFilter> getFilter();
}
\ No newline at end of file
diff --git a/app/org/omg/sysml/metamodel/Type.java b/app/org/omg/sysml/metamodel/Type.java
index 8f373407..4c46b958 100644
--- a/app/org/omg/sysml/metamodel/Type.java
+++ b/app/org/omg/sysml/metamodel/Type.java
@@ -25,7 +25,7 @@
import java.util.List;
import java.util.Set;
-public interface Type extends Package, MofObject {
+public interface Type extends Namespace, MofObject {
List extends Generalization> getOwnedGeneralization();
List extends FeatureMembership> getOwnedFeatureMembership();
diff --git a/app/org/omg/sysml/metamodel/Usage.java b/app/org/omg/sysml/metamodel/Usage.java
index 73f6dd92..929c23eb 100644
--- a/app/org/omg/sysml/metamodel/Usage.java
+++ b/app/org/omg/sysml/metamodel/Usage.java
@@ -81,4 +81,6 @@ public interface Usage extends Feature, MofObject {
Collection extends RenderingUsage> getNestedRendering();
Collection extends VerificationCaseUsage> getNestedVerificationCase();
+
+ Collection extends EnumerationUsage> getNestedEnumeration();
}
\ No newline at end of file
diff --git a/app/org/omg/sysml/metamodel/ViewDefinition.java b/app/org/omg/sysml/metamodel/ViewDefinition.java
index 1423c5b9..174dcdbb 100644
--- a/app/org/omg/sysml/metamodel/ViewDefinition.java
+++ b/app/org/omg/sysml/metamodel/ViewDefinition.java
@@ -30,7 +30,7 @@ public interface ViewDefinition extends PartDefinition, MofObject {
Collection extends ViewpointUsage> getSatisfiedViewpoint();
- ModelQuery getModelQuery();
-
RenderingUsage getRendering();
+
+ Collection extends MetadataCondition> getViewCondition();
}
\ No newline at end of file
diff --git a/app/org/omg/sysml/metamodel/ViewUsage.java b/app/org/omg/sysml/metamodel/ViewUsage.java
index 2c0e13fb..7c883aa6 100644
--- a/app/org/omg/sysml/metamodel/ViewUsage.java
+++ b/app/org/omg/sysml/metamodel/ViewUsage.java
@@ -30,7 +30,11 @@ public interface ViewUsage extends PartUsage, MofObject {
Collection extends ViewpointUsage> getSatisfiedViewpoint();
- Collection extends Package> getExposedPackage();
+ Collection extends Namespace> getExposedNamespace();
RenderingUsage getRendering();
+
+ Collection extends MetadataCondition> getViewCondition();
+
+ Collection extends Element> getViewedElement();
}
\ No newline at end of file
diff --git a/app/org/omg/sysml/metamodel/impl/AcceptActionUsageImpl.java b/app/org/omg/sysml/metamodel/impl/AcceptActionUsageImpl.java
index c93d5328..17b46b4d 100644
--- a/app/org/omg/sysml/metamodel/impl/AcceptActionUsageImpl.java
+++ b/app/org/omg/sysml/metamodel/impl/AcceptActionUsageImpl.java
@@ -931,6 +931,32 @@ public void setNestedConstraint(Collection nestedConstraint) {
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("nestedEnumeration")
+ private Collection nestedEnumeration;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "EnumerationUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "AcceptActionUsage_nestedEnumeration",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public Collection getNestedEnumeration() {
+ if (nestedEnumeration == null) {
+ nestedEnumeration = new ArrayList<>();
+ }
+ return nestedEnumeration;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = EnumerationUsageImpl.class)
+ public void setNestedEnumeration(Collection nestedEnumeration) {
+ this.nestedEnumeration = nestedEnumeration;
+ }
+
+
+
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("nestedIndividual")
private Collection nestedIndividual;
@@ -1804,20 +1830,20 @@ public void setOwningMembership(Membership owningMembership) {
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("owningNamespace")
- private Package owningNamespace;
+ private Namespace owningNamespace;
@JsonGetter
@JsonSerialize(using = MofObjectSerializer.class)
// @javax.persistence.Transient
- @Any(metaDef = "PackageMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
+ @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
@JoinColumn(name = "owningNamespaceId", table = "AcceptActionUsage")
- public Package getOwningNamespace() {
+ public Namespace getOwningNamespace() {
return owningNamespace;
}
@JsonSetter
- @JsonDeserialize(using = MofObjectDeserializer.class, as = PackageImpl.class)
- public void setOwningNamespace(Package owningNamespace) {
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = NamespaceImpl.class)
+ public void setOwningNamespace(Namespace owningNamespace) {
this.owningNamespace = owningNamespace;
}
diff --git a/app/org/omg/sysml/metamodel/impl/ActionDefinitionImpl.java b/app/org/omg/sysml/metamodel/impl/ActionDefinitionImpl.java
index ff43fb5a..750f4dd3 100644
--- a/app/org/omg/sysml/metamodel/impl/ActionDefinitionImpl.java
+++ b/app/org/omg/sysml/metamodel/impl/ActionDefinitionImpl.java
@@ -874,6 +874,32 @@ public void setOwnedEndFeature(Collection ownedEndFeature) {
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("ownedEnumeration")
+ private Collection ownedEnumeration;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "EnumerationUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "ActionDefinition_ownedEnumeration",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public Collection getOwnedEnumeration() {
+ if (ownedEnumeration == null) {
+ ownedEnumeration = new ArrayList<>();
+ }
+ return ownedEnumeration;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = EnumerationUsageImpl.class)
+ public void setOwnedEnumeration(Collection ownedEnumeration) {
+ this.ownedEnumeration = ownedEnumeration;
+ }
+
+
+
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("ownedFeature")
private Collection ownedFeature;
@@ -1506,20 +1532,20 @@ public void setOwningMembership(Membership owningMembership) {
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("owningNamespace")
- private Package owningNamespace;
+ private Namespace owningNamespace;
@JsonGetter
@JsonSerialize(using = MofObjectSerializer.class)
// @javax.persistence.Transient
- @Any(metaDef = "PackageMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
+ @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
@JoinColumn(name = "owningNamespaceId", table = "ActionDefinition")
- public Package getOwningNamespace() {
+ public Namespace getOwningNamespace() {
return owningNamespace;
}
@JsonSetter
- @JsonDeserialize(using = MofObjectDeserializer.class, as = PackageImpl.class)
- public void setOwningNamespace(Package owningNamespace) {
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = NamespaceImpl.class)
+ public void setOwningNamespace(Namespace owningNamespace) {
this.owningNamespace = owningNamespace;
}
diff --git a/app/org/omg/sysml/metamodel/impl/ActionUsageImpl.java b/app/org/omg/sysml/metamodel/impl/ActionUsageImpl.java
index cafd0e08..09b98986 100644
--- a/app/org/omg/sysml/metamodel/impl/ActionUsageImpl.java
+++ b/app/org/omg/sysml/metamodel/impl/ActionUsageImpl.java
@@ -910,6 +910,32 @@ public void setNestedConstraint(Collection nestedConstraint) {
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("nestedEnumeration")
+ private Collection nestedEnumeration;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "EnumerationUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "ActionUsage_nestedEnumeration",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public Collection getNestedEnumeration() {
+ if (nestedEnumeration == null) {
+ nestedEnumeration = new ArrayList<>();
+ }
+ return nestedEnumeration;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = EnumerationUsageImpl.class)
+ public void setNestedEnumeration(Collection nestedEnumeration) {
+ this.nestedEnumeration = nestedEnumeration;
+ }
+
+
+
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("nestedIndividual")
private Collection nestedIndividual;
@@ -1783,20 +1809,20 @@ public void setOwningMembership(Membership owningMembership) {
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("owningNamespace")
- private Package owningNamespace;
+ private Namespace owningNamespace;
@JsonGetter
@JsonSerialize(using = MofObjectSerializer.class)
// @javax.persistence.Transient
- @Any(metaDef = "PackageMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
+ @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
@JoinColumn(name = "owningNamespaceId", table = "ActionUsage")
- public Package getOwningNamespace() {
+ public Namespace getOwningNamespace() {
return owningNamespace;
}
@JsonSetter
- @JsonDeserialize(using = MofObjectDeserializer.class, as = PackageImpl.class)
- public void setOwningNamespace(Package owningNamespace) {
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = NamespaceImpl.class)
+ public void setOwningNamespace(Namespace owningNamespace) {
this.owningNamespace = owningNamespace;
}
diff --git a/app/org/omg/sysml/metamodel/impl/AnalysisCaseDefinitionImpl.java b/app/org/omg/sysml/metamodel/impl/AnalysisCaseDefinitionImpl.java
index 6790a6de..ae7b71fd 100644
--- a/app/org/omg/sysml/metamodel/impl/AnalysisCaseDefinitionImpl.java
+++ b/app/org/omg/sysml/metamodel/impl/AnalysisCaseDefinitionImpl.java
@@ -973,6 +973,32 @@ public void setOwnedEndFeature(Collection ownedEndFeature) {
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("ownedEnumeration")
+ private Collection ownedEnumeration;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "EnumerationUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "AnalysisCaseDefinition_ownedEnumeration",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public Collection getOwnedEnumeration() {
+ if (ownedEnumeration == null) {
+ ownedEnumeration = new ArrayList<>();
+ }
+ return ownedEnumeration;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = EnumerationUsageImpl.class)
+ public void setOwnedEnumeration(Collection ownedEnumeration) {
+ this.ownedEnumeration = ownedEnumeration;
+ }
+
+
+
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("ownedFeature")
private Collection ownedFeature;
@@ -1605,20 +1631,20 @@ public void setOwningMembership(Membership owningMembership) {
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("owningNamespace")
- private Package owningNamespace;
+ private Namespace owningNamespace;
@JsonGetter
@JsonSerialize(using = MofObjectSerializer.class)
// @javax.persistence.Transient
- @Any(metaDef = "PackageMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
+ @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
@JoinColumn(name = "owningNamespaceId", table = "AnalysisCaseDefinition")
- public Package getOwningNamespace() {
+ public Namespace getOwningNamespace() {
return owningNamespace;
}
@JsonSetter
- @JsonDeserialize(using = MofObjectDeserializer.class, as = PackageImpl.class)
- public void setOwningNamespace(Package owningNamespace) {
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = NamespaceImpl.class)
+ public void setOwningNamespace(Namespace owningNamespace) {
this.owningNamespace = owningNamespace;
}
diff --git a/app/org/omg/sysml/metamodel/impl/AnalysisCaseUsageImpl.java b/app/org/omg/sysml/metamodel/impl/AnalysisCaseUsageImpl.java
index 2b37ab3e..810e182c 100644
--- a/app/org/omg/sysml/metamodel/impl/AnalysisCaseUsageImpl.java
+++ b/app/org/omg/sysml/metamodel/impl/AnalysisCaseUsageImpl.java
@@ -1020,6 +1020,32 @@ public void setNestedConstraint(Collection nestedConstraint) {
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("nestedEnumeration")
+ private Collection nestedEnumeration;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "EnumerationUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "AnalysisCaseUsage_nestedEnumeration",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public Collection getNestedEnumeration() {
+ if (nestedEnumeration == null) {
+ nestedEnumeration = new ArrayList<>();
+ }
+ return nestedEnumeration;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = EnumerationUsageImpl.class)
+ public void setNestedEnumeration(Collection nestedEnumeration) {
+ this.nestedEnumeration = nestedEnumeration;
+ }
+
+
+
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("nestedIndividual")
private Collection nestedIndividual;
@@ -1914,20 +1940,20 @@ public void setOwningMembership(Membership owningMembership) {
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("owningNamespace")
- private Package owningNamespace;
+ private Namespace owningNamespace;
@JsonGetter
@JsonSerialize(using = MofObjectSerializer.class)
// @javax.persistence.Transient
- @Any(metaDef = "PackageMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
+ @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
@JoinColumn(name = "owningNamespaceId", table = "AnalysisCaseUsage")
- public Package getOwningNamespace() {
+ public Namespace getOwningNamespace() {
return owningNamespace;
}
@JsonSetter
- @JsonDeserialize(using = MofObjectDeserializer.class, as = PackageImpl.class)
- public void setOwningNamespace(Package owningNamespace) {
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = NamespaceImpl.class)
+ public void setOwningNamespace(Namespace owningNamespace) {
this.owningNamespace = owningNamespace;
}
diff --git a/app/org/omg/sysml/metamodel/impl/AnnotatingElementImpl.java b/app/org/omg/sysml/metamodel/impl/AnnotatingElementImpl.java
index b4e24fb0..3ed6f099 100644
--- a/app/org/omg/sysml/metamodel/impl/AnnotatingElementImpl.java
+++ b/app/org/omg/sysml/metamodel/impl/AnnotatingElementImpl.java
@@ -388,20 +388,20 @@ public void setOwningMembership(Membership owningMembership) {
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("owningNamespace")
- private Package owningNamespace;
+ private Namespace owningNamespace;
@JsonGetter
@JsonSerialize(using = MofObjectSerializer.class)
// @javax.persistence.Transient
- @Any(metaDef = "PackageMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
+ @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
@JoinColumn(name = "owningNamespaceId", table = "AnnotatingElement")
- public Package getOwningNamespace() {
+ public Namespace getOwningNamespace() {
return owningNamespace;
}
@JsonSetter
- @JsonDeserialize(using = MofObjectDeserializer.class, as = PackageImpl.class)
- public void setOwningNamespace(Package owningNamespace) {
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = NamespaceImpl.class)
+ public void setOwningNamespace(Namespace owningNamespace) {
this.owningNamespace = owningNamespace;
}
diff --git a/app/org/omg/sysml/metamodel/impl/AnnotatingFeatureImpl.java b/app/org/omg/sysml/metamodel/impl/AnnotatingFeatureImpl.java
new file mode 100644
index 00000000..0fd01a09
--- /dev/null
+++ b/app/org/omg/sysml/metamodel/impl/AnnotatingFeatureImpl.java
@@ -0,0 +1,1307 @@
+/*
+ * 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 .
+ *
+ * @license LGPL-3.0-or-later
+ */
+
+package org.omg.sysml.metamodel.impl;
+
+import org.omg.sysml.metamodel.*;
+
+import org.omg.sysml.metamodel.Package;
+import org.omg.sysml.metamodel.Class;
+
+import jackson.MofObjectSerializer;
+import jackson.MofObjectDeserializer;
+
+import com.fasterxml.jackson.annotation.*;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+
+import org.hibernate.annotations.Any;
+import org.hibernate.annotations.ManyToAny;
+import org.hibernate.annotations.FetchMode;
+
+// import info.archinnov.achilles.annotations.UDT;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.EnumType;
+import javax.persistence.ElementCollection;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.PrimaryKeyJoinColumn;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.Lob;
+import javax.persistence.FetchType;
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Table;
+import javax.persistence.SecondaryTable;
+import javax.persistence.CollectionTable;
+
+import java.util.Collection;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.HashSet;
+
+@Entity(name = "AnnotatingFeatureImpl")
+@SecondaryTable(name = "AnnotatingFeature")
+@org.hibernate.annotations.Table(appliesTo = "AnnotatingFeature", fetch = FetchMode.SELECT, optional = false)
+// @info.archinnov.achilles.annotations.Table(table = "AnnotatingFeature")
+@DiscriminatorValue(value = "AnnotatingFeature")
+@JsonTypeName(value = "AnnotatingFeature")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME)
+public class AnnotatingFeatureImpl extends MofObjectImpl implements AnnotatingFeature {
+ // @info.archinnov.achilles.annotations.Column("aliasId")
+ private Collection aliasId;
+
+ @JsonGetter
+ @Lob
+ @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType")
+ @ElementCollection(targetClass = String.class)
+ @CollectionTable(name = "AnnotatingFeature_aliasId",
+ joinColumns = @JoinColumn(name = "AnnotatingFeatureId"))
+ public Collection getAliasId() {
+ if (aliasId == null) {
+ aliasId = new ArrayList<>();
+ }
+ return aliasId;
+ }
+
+ @JsonSetter
+ public void setAliasId(Collection aliasId) {
+ this.aliasId = aliasId;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("annotatedElement")
+ private Collection annotatedElement;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "AnnotatingFeature_annotatedElement",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public Collection getAnnotatedElement() {
+ if (annotatedElement == null) {
+ annotatedElement = new ArrayList<>();
+ }
+ return annotatedElement;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = ElementImpl.class)
+ public void setAnnotatedElement(Collection annotatedElement) {
+ this.annotatedElement = annotatedElement;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Column("annotation")
+ private Collection annotation;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ @ManyToAny(metaDef = "AnnotationMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "AnnotatingFeature_annotation",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public Collection getAnnotation() {
+ if (annotation == null) {
+ annotation = new ArrayList<>();
+ }
+ return annotation;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = AnnotationImpl.class)
+ public void setAnnotation(Collection annotation) {
+ this.annotation = annotation;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Column("documentation")
+ private Collection documentation;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ @ManyToAny(metaDef = "DocumentationMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "AnnotatingFeature_documentation",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public Collection getDocumentation() {
+ if (documentation == null) {
+ documentation = new ArrayList<>();
+ }
+ return documentation;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = DocumentationImpl.class)
+ public void setDocumentation(Collection documentation) {
+ this.documentation = documentation;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("documentationComment")
+ private Collection documentationComment;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "CommentMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "AnnotatingFeature_documentationComment",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public Collection getDocumentationComment() {
+ if (documentationComment == null) {
+ documentationComment = new ArrayList<>();
+ }
+ return documentationComment;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = CommentImpl.class)
+ public void setDocumentationComment(Collection documentationComment) {
+ this.documentationComment = documentationComment;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("endFeature")
+ private Collection endFeature;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "AnnotatingFeature_endFeature",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public Collection getEndFeature() {
+ if (endFeature == null) {
+ endFeature = new ArrayList<>();
+ }
+ return endFeature;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = FeatureImpl.class)
+ public void setEndFeature(Collection endFeature) {
+ this.endFeature = endFeature;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("endOwningType")
+ private Type endOwningType;
+
+ @JsonGetter
+ @JsonSerialize(using = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "endOwningTypeType"), fetch = FetchType.LAZY)
+ @JoinColumn(name = "endOwningTypeId", table = "AnnotatingFeature")
+ public Type getEndOwningType() {
+ return endOwningType;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = TypeImpl.class)
+ public void setEndOwningType(Type endOwningType) {
+ this.endOwningType = endOwningType;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("feature")
+ private Collection feature;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "AnnotatingFeature_feature",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public Collection getFeature() {
+ if (feature == null) {
+ feature = new ArrayList<>();
+ }
+ return feature;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = FeatureImpl.class)
+ public void setFeature(Collection feature) {
+ this.feature = feature;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("featureMembership")
+ private List featureMembership;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "AnnotatingFeature_featureMembership",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public List getFeatureMembership() {
+ if (featureMembership == null) {
+ featureMembership = new ArrayList<>();
+ }
+ return featureMembership;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = FeatureMembershipImpl.class)
+ public void setFeatureMembership(List featureMembership) {
+ this.featureMembership = featureMembership;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("featuringType")
+ private Collection featuringType;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "AnnotatingFeature_featuringType",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public Collection getFeaturingType() {
+ if (featuringType == null) {
+ featuringType = new ArrayList<>();
+ }
+ return featuringType;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class)
+ public void setFeaturingType(Collection featuringType) {
+ this.featuringType = featuringType;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Column("humanId")
+ private String humanId;
+
+ @JsonGetter
+ @Lob
+ @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType")
+ @javax.persistence.Column(name = "humanId", table = "AnnotatingFeature")
+ public String getHumanId() {
+ return humanId;
+ }
+
+ @JsonSetter
+ public void setHumanId(String humanId) {
+ this.humanId = humanId;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Column("identifier")
+ private java.util.UUID identifier;
+
+ @JsonGetter
+ @javax.persistence.Column(name = "identifier", table = "AnnotatingFeature")
+ public java.util.UUID getIdentifier() {
+ return identifier;
+ }
+
+ @JsonSetter
+ public void setIdentifier(java.util.UUID identifier) {
+ this.identifier = identifier;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("importedMembership")
+ private List importedMembership;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "MembershipMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "AnnotatingFeature_importedMembership",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public List getImportedMembership() {
+ if (importedMembership == null) {
+ importedMembership = new ArrayList<>();
+ }
+ return importedMembership;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = MembershipImpl.class)
+ public void setImportedMembership(List importedMembership) {
+ this.importedMembership = importedMembership;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("inheritedFeature")
+ private Collection inheritedFeature;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "AnnotatingFeature_inheritedFeature",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public Collection getInheritedFeature() {
+ if (inheritedFeature == null) {
+ inheritedFeature = new ArrayList<>();
+ }
+ return inheritedFeature;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = FeatureImpl.class)
+ public void setInheritedFeature(Collection inheritedFeature) {
+ this.inheritedFeature = inheritedFeature;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("inheritedMembership")
+ private List inheritedMembership;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "MembershipMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "AnnotatingFeature_inheritedMembership",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public List getInheritedMembership() {
+ if (inheritedMembership == null) {
+ inheritedMembership = new ArrayList<>();
+ }
+ return inheritedMembership;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = MembershipImpl.class)
+ public void setInheritedMembership(List inheritedMembership) {
+ this.inheritedMembership = inheritedMembership;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("input")
+ private Collection input;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "AnnotatingFeature_input",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public Collection getInput() {
+ if (input == null) {
+ input = new ArrayList<>();
+ }
+ return input;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = FeatureImpl.class)
+ public void setInput(Collection input) {
+ this.input = input;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Column("isAbstract")
+ private Boolean isAbstract;
+
+ @JsonGetter
+ @javax.persistence.Column(name = "isAbstract", table = "AnnotatingFeature")
+ public Boolean getIsAbstract() {
+ return isAbstract;
+ }
+
+ @JsonSetter
+ public void setIsAbstract(Boolean isAbstract) {
+ this.isAbstract = isAbstract;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("isComposite")
+ private Boolean isComposite;
+
+ @JsonGetter
+ // @javax.persistence.Transient
+ @javax.persistence.Column(name = "isComposite", table = "AnnotatingFeature")
+ public Boolean getIsComposite() {
+ return isComposite;
+ }
+
+ @JsonSetter
+ public void setIsComposite(Boolean isComposite) {
+ this.isComposite = isComposite;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("isConjugated")
+ private Boolean isConjugated;
+
+ @JsonGetter
+ // @javax.persistence.Transient
+ @javax.persistence.Column(name = "isConjugated", table = "AnnotatingFeature")
+ public Boolean getIsConjugated() {
+ return isConjugated;
+ }
+
+ @JsonSetter
+ public void setIsConjugated(Boolean isConjugated) {
+ this.isConjugated = isConjugated;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("isEnd")
+ private Boolean isEnd;
+
+ @JsonGetter
+ // @javax.persistence.Transient
+ @javax.persistence.Column(name = "isEnd", table = "AnnotatingFeature")
+ public Boolean getIsEnd() {
+ return isEnd;
+ }
+
+ @JsonSetter
+ public void setIsEnd(Boolean isEnd) {
+ this.isEnd = isEnd;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("isNonunique")
+ private Boolean isNonunique;
+
+ @JsonGetter
+ // @javax.persistence.Transient
+ @javax.persistence.Column(name = "isNonunique", table = "AnnotatingFeature")
+ public Boolean getIsNonunique() {
+ return isNonunique;
+ }
+
+ @JsonSetter
+ public void setIsNonunique(Boolean isNonunique) {
+ this.isNonunique = isNonunique;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Column("isOrdered")
+ private Boolean isOrdered;
+
+ @JsonGetter
+ @javax.persistence.Column(name = "isOrdered", table = "AnnotatingFeature")
+ public Boolean getIsOrdered() {
+ return isOrdered;
+ }
+
+ @JsonSetter
+ public void setIsOrdered(Boolean isOrdered) {
+ this.isOrdered = isOrdered;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Column("isSufficient")
+ private Boolean isSufficient;
+
+ @JsonGetter
+ @javax.persistence.Column(name = "isSufficient", table = "AnnotatingFeature")
+ public Boolean getIsSufficient() {
+ return isSufficient;
+ }
+
+ @JsonSetter
+ public void setIsSufficient(Boolean isSufficient) {
+ this.isSufficient = isSufficient;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Column("isUnique")
+ private Boolean isUnique;
+
+ @JsonGetter
+ @javax.persistence.Column(name = "isUnique", table = "AnnotatingFeature")
+ public Boolean getIsUnique() {
+ return isUnique;
+ }
+
+ @JsonSetter
+ public void setIsUnique(Boolean isUnique) {
+ this.isUnique = isUnique;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("member")
+ private List member;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "AnnotatingFeature_member",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public List getMember() {
+ if (member == null) {
+ member = new ArrayList<>();
+ }
+ return member;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = ElementImpl.class)
+ public void setMember(List member) {
+ this.member = member;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("membership")
+ private List membership;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "MembershipMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "AnnotatingFeature_membership",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public List getMembership() {
+ if (membership == null) {
+ membership = new ArrayList<>();
+ }
+ return membership;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = MembershipImpl.class)
+ public void setMembership(List membership) {
+ this.membership = membership;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("metadataType")
+ private DataType metadataType;
+
+ @JsonGetter
+ @JsonSerialize(using = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @Any(metaDef = "DataTypeMetaDef", metaColumn = @javax.persistence.Column(name = "metadataTypeType"), fetch = FetchType.LAZY)
+ @JoinColumn(name = "metadataTypeId", table = "AnnotatingFeature")
+ public DataType getMetadataType() {
+ return metadataType;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = DataTypeImpl.class)
+ public void setMetadataType(DataType metadataType) {
+ this.metadataType = metadataType;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("multiplicity")
+ private Multiplicity multiplicity;
+
+ @JsonGetter
+ @JsonSerialize(using = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @Any(metaDef = "MultiplicityMetaDef", metaColumn = @javax.persistence.Column(name = "multiplicityType"), fetch = FetchType.LAZY)
+ @JoinColumn(name = "multiplicityId", table = "AnnotatingFeature")
+ public Multiplicity getMultiplicity() {
+ return multiplicity;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = MultiplicityImpl.class)
+ public void setMultiplicity(Multiplicity multiplicity) {
+ this.multiplicity = multiplicity;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("name")
+ private String name;
+
+ @JsonGetter
+ @Lob
+ @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType")
+ // @javax.persistence.Transient
+ @javax.persistence.Column(name = "name", table = "AnnotatingFeature")
+ public String getName() {
+ return name;
+ }
+
+ @JsonSetter
+ public void setName(String name) {
+ this.name = name;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("output")
+ private Collection output;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "AnnotatingFeature_output",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public Collection getOutput() {
+ if (output == null) {
+ output = new ArrayList<>();
+ }
+ return output;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = FeatureImpl.class)
+ public void setOutput(Collection output) {
+ this.output = output;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Column("ownedAnnotation")
+ private Collection ownedAnnotation;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ @ManyToAny(metaDef = "AnnotationMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "AnnotatingFeature_ownedAnnotation",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public Collection getOwnedAnnotation() {
+ if (ownedAnnotation == null) {
+ ownedAnnotation = new ArrayList<>();
+ }
+ return ownedAnnotation;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = AnnotationImpl.class)
+ public void setOwnedAnnotation(Collection ownedAnnotation) {
+ this.ownedAnnotation = ownedAnnotation;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("ownedConjugator")
+ private Conjugation ownedConjugator;
+
+ @JsonGetter
+ @JsonSerialize(using = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @Any(metaDef = "ConjugationMetaDef", metaColumn = @javax.persistence.Column(name = "ownedConjugatorType"), fetch = FetchType.LAZY)
+ @JoinColumn(name = "ownedConjugatorId", table = "AnnotatingFeature")
+ public Conjugation getOwnedConjugator() {
+ return ownedConjugator;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = ConjugationImpl.class)
+ public void setOwnedConjugator(Conjugation ownedConjugator) {
+ this.ownedConjugator = ownedConjugator;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("ownedElement")
+ private Collection ownedElement;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "AnnotatingFeature_ownedElement",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public Collection getOwnedElement() {
+ if (ownedElement == null) {
+ ownedElement = new ArrayList<>();
+ }
+ return ownedElement;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = ElementImpl.class)
+ public void setOwnedElement(Collection ownedElement) {
+ this.ownedElement = ownedElement;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("ownedEndFeature")
+ private Collection ownedEndFeature;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "AnnotatingFeature_ownedEndFeature",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public Collection getOwnedEndFeature() {
+ if (ownedEndFeature == null) {
+ ownedEndFeature = new ArrayList<>();
+ }
+ return ownedEndFeature;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = FeatureImpl.class)
+ public void setOwnedEndFeature(Collection ownedEndFeature) {
+ this.ownedEndFeature = ownedEndFeature;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("ownedFeature")
+ private Collection ownedFeature;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "AnnotatingFeature_ownedFeature",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public Collection getOwnedFeature() {
+ if (ownedFeature == null) {
+ ownedFeature = new ArrayList<>();
+ }
+ return ownedFeature;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = FeatureImpl.class)
+ public void setOwnedFeature(Collection ownedFeature) {
+ this.ownedFeature = ownedFeature;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Column("ownedFeatureMembership")
+ private List ownedFeatureMembership;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ @ManyToAny(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "AnnotatingFeature_ownedFeatureMembership",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public List getOwnedFeatureMembership() {
+ if (ownedFeatureMembership == null) {
+ ownedFeatureMembership = new ArrayList<>();
+ }
+ return ownedFeatureMembership;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = FeatureMembershipImpl.class)
+ public void setOwnedFeatureMembership(List ownedFeatureMembership) {
+ this.ownedFeatureMembership = ownedFeatureMembership;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("ownedGeneralization")
+ private List ownedGeneralization;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "GeneralizationMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "AnnotatingFeature_ownedGeneralization",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public List getOwnedGeneralization() {
+ if (ownedGeneralization == null) {
+ ownedGeneralization = new ArrayList<>();
+ }
+ return ownedGeneralization;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = GeneralizationImpl.class)
+ public void setOwnedGeneralization(List ownedGeneralization) {
+ this.ownedGeneralization = ownedGeneralization;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Column("ownedImport")
+ private List ownedImport;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ @ManyToAny(metaDef = "ImportMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "AnnotatingFeature_ownedImport",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public List getOwnedImport() {
+ if (ownedImport == null) {
+ ownedImport = new ArrayList<>();
+ }
+ return ownedImport;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = ImportImpl.class)
+ public void setOwnedImport(List ownedImport) {
+ this.ownedImport = ownedImport;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("ownedMember")
+ private List ownedMember;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "AnnotatingFeature_ownedMember",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public List getOwnedMember() {
+ if (ownedMember == null) {
+ ownedMember = new ArrayList<>();
+ }
+ return ownedMember;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = ElementImpl.class)
+ public void setOwnedMember(List ownedMember) {
+ this.ownedMember = ownedMember;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Column("ownedMembership")
+ private List ownedMembership;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ @ManyToAny(metaDef = "MembershipMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "AnnotatingFeature_ownedMembership",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public List getOwnedMembership() {
+ if (ownedMembership == null) {
+ ownedMembership = new ArrayList<>();
+ }
+ return ownedMembership;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = MembershipImpl.class)
+ public void setOwnedMembership(List ownedMembership) {
+ this.ownedMembership = ownedMembership;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("ownedMetadata")
+ private Collection ownedMetadata;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "MetadataFeatureMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "AnnotatingFeature_ownedMetadata",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public Collection getOwnedMetadata() {
+ if (ownedMetadata == null) {
+ ownedMetadata = new ArrayList<>();
+ }
+ return ownedMetadata;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = MetadataFeatureImpl.class)
+ public void setOwnedMetadata(Collection ownedMetadata) {
+ this.ownedMetadata = ownedMetadata;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("ownedRedefinition")
+ private Collection ownedRedefinition;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "RedefinitionMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "AnnotatingFeature_ownedRedefinition",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public Collection getOwnedRedefinition() {
+ if (ownedRedefinition == null) {
+ ownedRedefinition = new ArrayList<>();
+ }
+ return ownedRedefinition;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = RedefinitionImpl.class)
+ public void setOwnedRedefinition(Collection ownedRedefinition) {
+ this.ownedRedefinition = ownedRedefinition;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Column("ownedRelationship")
+ private List ownedRelationship;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ @ManyToAny(metaDef = "RelationshipMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "AnnotatingFeature_ownedRelationship",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public List getOwnedRelationship() {
+ if (ownedRelationship == null) {
+ ownedRelationship = new ArrayList<>();
+ }
+ return ownedRelationship;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = RelationshipImpl.class)
+ public void setOwnedRelationship(List ownedRelationship) {
+ this.ownedRelationship = ownedRelationship;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("ownedSubsetting")
+ private Collection ownedSubsetting;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "SubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "AnnotatingFeature_ownedSubsetting",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public Collection getOwnedSubsetting() {
+ if (ownedSubsetting == null) {
+ ownedSubsetting = new ArrayList<>();
+ }
+ return ownedSubsetting;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = SubsettingImpl.class)
+ public void setOwnedSubsetting(Collection ownedSubsetting) {
+ this.ownedSubsetting = ownedSubsetting;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("ownedTextualRepresentation")
+ private Collection ownedTextualRepresentation;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "TextualRepresentationMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "AnnotatingFeature_ownedTextualRepresentation",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public Collection getOwnedTextualRepresentation() {
+ if (ownedTextualRepresentation == null) {
+ ownedTextualRepresentation = new ArrayList<>();
+ }
+ return ownedTextualRepresentation;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TextualRepresentationImpl.class)
+ public void setOwnedTextualRepresentation(Collection ownedTextualRepresentation) {
+ this.ownedTextualRepresentation = ownedTextualRepresentation;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing")
+ private Collection ownedTypeFeaturing;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "AnnotatingFeature_ownedTypeFeaturing",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public Collection getOwnedTypeFeaturing() {
+ if (ownedTypeFeaturing == null) {
+ ownedTypeFeaturing = new ArrayList<>();
+ }
+ return ownedTypeFeaturing;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class)
+ public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) {
+ this.ownedTypeFeaturing = ownedTypeFeaturing;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("ownedTyping")
+ private Collection ownedTyping;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "FeatureTypingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "AnnotatingFeature_ownedTyping",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public Collection getOwnedTyping() {
+ if (ownedTyping == null) {
+ ownedTyping = new ArrayList<>();
+ }
+ return ownedTyping;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = FeatureTypingImpl.class)
+ public void setOwnedTyping(Collection ownedTyping) {
+ this.ownedTyping = ownedTyping;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("owner")
+ private Element owner;
+
+ @JsonGetter
+ @JsonSerialize(using = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @Any(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "ownerType"), fetch = FetchType.LAZY)
+ @JoinColumn(name = "ownerId", table = "AnnotatingFeature")
+ public Element getOwner() {
+ return owner;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = ElementImpl.class)
+ public void setOwner(Element owner) {
+ this.owner = owner;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Column("owningFeatureMembership")
+ private FeatureMembership owningFeatureMembership;
+
+ @JsonGetter
+ @JsonSerialize(using = MofObjectSerializer.class)
+ @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembershipType"), fetch = FetchType.LAZY)
+ @JoinColumn(name = "owningFeatureMembershipId", table = "AnnotatingFeature")
+ public FeatureMembership getOwningFeatureMembership() {
+ return owningFeatureMembership;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = FeatureMembershipImpl.class)
+ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership) {
+ this.owningFeatureMembership = owningFeatureMembership;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Column("owningMembership")
+ private Membership owningMembership;
+
+ @JsonGetter
+ @JsonSerialize(using = MofObjectSerializer.class)
+ @Any(metaDef = "MembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembershipType"), fetch = FetchType.LAZY)
+ @JoinColumn(name = "owningMembershipId", table = "AnnotatingFeature")
+ public Membership getOwningMembership() {
+ return owningMembership;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = MembershipImpl.class)
+ public void setOwningMembership(Membership owningMembership) {
+ this.owningMembership = owningMembership;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("owningNamespace")
+ private Namespace owningNamespace;
+
+ @JsonGetter
+ @JsonSerialize(using = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
+ @JoinColumn(name = "owningNamespaceId", table = "AnnotatingFeature")
+ public Namespace getOwningNamespace() {
+ return owningNamespace;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = NamespaceImpl.class)
+ public void setOwningNamespace(Namespace owningNamespace) {
+ this.owningNamespace = owningNamespace;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Column("owningRelationship")
+ private Relationship owningRelationship;
+
+ @JsonGetter
+ @JsonSerialize(using = MofObjectSerializer.class)
+ @Any(metaDef = "RelationshipMetaDef", metaColumn = @javax.persistence.Column(name = "owningRelationshipType"), fetch = FetchType.LAZY)
+ @JoinColumn(name = "owningRelationshipId", table = "AnnotatingFeature")
+ public Relationship getOwningRelationship() {
+ return owningRelationship;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = RelationshipImpl.class)
+ public void setOwningRelationship(Relationship owningRelationship) {
+ this.owningRelationship = owningRelationship;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("owningType")
+ private Type owningType;
+
+ @JsonGetter
+ @JsonSerialize(using = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "owningTypeType"), fetch = FetchType.LAZY)
+ @JoinColumn(name = "owningTypeId", table = "AnnotatingFeature")
+ public Type getOwningType() {
+ return owningType;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = TypeImpl.class)
+ public void setOwningType(Type owningType) {
+ this.owningType = owningType;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("type")
+ private Collection type;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "AnnotatingFeature_type",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public Collection getType() {
+ if (type == null) {
+ type = new ArrayList<>();
+ }
+ return type;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class)
+ public void setType(Collection type) {
+ this.type = type;
+ }
+
+
+
+}
diff --git a/app/org/omg/sysml/metamodel/impl/AnnotationImpl.java b/app/org/omg/sysml/metamodel/impl/AnnotationImpl.java
index df726813..5928a677 100644
--- a/app/org/omg/sysml/metamodel/impl/AnnotationImpl.java
+++ b/app/org/omg/sysml/metamodel/impl/AnnotationImpl.java
@@ -419,20 +419,20 @@ public void setOwningMembership(Membership owningMembership) {
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("owningNamespace")
- private Package owningNamespace;
+ private Namespace owningNamespace;
@JsonGetter
@JsonSerialize(using = MofObjectSerializer.class)
// @javax.persistence.Transient
- @Any(metaDef = "PackageMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
+ @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
@JoinColumn(name = "owningNamespaceId", table = "Annotation")
- public Package getOwningNamespace() {
+ public Namespace getOwningNamespace() {
return owningNamespace;
}
@JsonSetter
- @JsonDeserialize(using = MofObjectDeserializer.class, as = PackageImpl.class)
- public void setOwningNamespace(Package owningNamespace) {
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = NamespaceImpl.class)
+ public void setOwningNamespace(Namespace owningNamespace) {
this.owningNamespace = owningNamespace;
}
diff --git a/app/org/omg/sysml/metamodel/impl/AssertConstraintUsageImpl.java b/app/org/omg/sysml/metamodel/impl/AssertConstraintUsageImpl.java
index b0a16622..f8860ca7 100644
--- a/app/org/omg/sysml/metamodel/impl/AssertConstraintUsageImpl.java
+++ b/app/org/omg/sysml/metamodel/impl/AssertConstraintUsageImpl.java
@@ -968,6 +968,32 @@ public void setNestedConstraint(Collection nestedConstraint) {
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("nestedEnumeration")
+ private Collection nestedEnumeration;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "EnumerationUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "AssertConstraintUsage_nestedEnumeration",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public Collection getNestedEnumeration() {
+ if (nestedEnumeration == null) {
+ nestedEnumeration = new ArrayList<>();
+ }
+ return nestedEnumeration;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = EnumerationUsageImpl.class)
+ public void setNestedEnumeration(Collection nestedEnumeration) {
+ this.nestedEnumeration = nestedEnumeration;
+ }
+
+
+
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("nestedIndividual")
private Collection nestedIndividual;
@@ -1841,20 +1867,20 @@ public void setOwningMembership(Membership owningMembership) {
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("owningNamespace")
- private Package owningNamespace;
+ private Namespace owningNamespace;
@JsonGetter
@JsonSerialize(using = MofObjectSerializer.class)
// @javax.persistence.Transient
- @Any(metaDef = "PackageMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
+ @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
@JoinColumn(name = "owningNamespaceId", table = "AssertConstraintUsage")
- public Package getOwningNamespace() {
+ public Namespace getOwningNamespace() {
return owningNamespace;
}
@JsonSetter
- @JsonDeserialize(using = MofObjectDeserializer.class, as = PackageImpl.class)
- public void setOwningNamespace(Package owningNamespace) {
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = NamespaceImpl.class)
+ public void setOwningNamespace(Namespace owningNamespace) {
this.owningNamespace = owningNamespace;
}
diff --git a/app/org/omg/sysml/metamodel/impl/AssociationImpl.java b/app/org/omg/sysml/metamodel/impl/AssociationImpl.java
index b1d409f4..3cf2dc32 100644
--- a/app/org/omg/sysml/metamodel/impl/AssociationImpl.java
+++ b/app/org/omg/sysml/metamodel/impl/AssociationImpl.java
@@ -942,20 +942,20 @@ public void setOwningMembership(Membership owningMembership) {
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("owningNamespace")
- private Package owningNamespace;
+ private Namespace owningNamespace;
@JsonGetter
@JsonSerialize(using = MofObjectSerializer.class)
// @javax.persistence.Transient
- @Any(metaDef = "PackageMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
+ @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
@JoinColumn(name = "owningNamespaceId", table = "Association")
- public Package getOwningNamespace() {
+ public Namespace getOwningNamespace() {
return owningNamespace;
}
@JsonSetter
- @JsonDeserialize(using = MofObjectDeserializer.class, as = PackageImpl.class)
- public void setOwningNamespace(Package owningNamespace) {
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = NamespaceImpl.class)
+ public void setOwningNamespace(Namespace owningNamespace) {
this.owningNamespace = owningNamespace;
}
diff --git a/app/org/omg/sysml/metamodel/impl/AttributeDefinitionImpl.java b/app/org/omg/sysml/metamodel/impl/AttributeDefinitionImpl.java
index 42239aa2..414443b8 100644
--- a/app/org/omg/sysml/metamodel/impl/AttributeDefinitionImpl.java
+++ b/app/org/omg/sysml/metamodel/impl/AttributeDefinitionImpl.java
@@ -848,6 +848,32 @@ public void setOwnedEndFeature(Collection ownedEndFeature) {
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("ownedEnumeration")
+ private Collection ownedEnumeration;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "EnumerationUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "AttributeDefinition_ownedEnumeration",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public Collection getOwnedEnumeration() {
+ if (ownedEnumeration == null) {
+ ownedEnumeration = new ArrayList<>();
+ }
+ return ownedEnumeration;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = EnumerationUsageImpl.class)
+ public void setOwnedEnumeration(Collection ownedEnumeration) {
+ this.ownedEnumeration = ownedEnumeration;
+ }
+
+
+
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("ownedFeature")
private Collection ownedFeature;
@@ -1480,20 +1506,20 @@ public void setOwningMembership(Membership owningMembership) {
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("owningNamespace")
- private Package owningNamespace;
+ private Namespace owningNamespace;
@JsonGetter
@JsonSerialize(using = MofObjectSerializer.class)
// @javax.persistence.Transient
- @Any(metaDef = "PackageMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
+ @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
@JoinColumn(name = "owningNamespaceId", table = "AttributeDefinition")
- public Package getOwningNamespace() {
+ public Namespace getOwningNamespace() {
return owningNamespace;
}
@JsonSetter
- @JsonDeserialize(using = MofObjectDeserializer.class, as = PackageImpl.class)
- public void setOwningNamespace(Package owningNamespace) {
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = NamespaceImpl.class)
+ public void setOwningNamespace(Namespace owningNamespace) {
this.owningNamespace = owningNamespace;
}
diff --git a/app/org/omg/sysml/metamodel/impl/AttributeUsageImpl.java b/app/org/omg/sysml/metamodel/impl/AttributeUsageImpl.java
index 2f3c1f62..69e46e8b 100644
--- a/app/org/omg/sysml/metamodel/impl/AttributeUsageImpl.java
+++ b/app/org/omg/sysml/metamodel/impl/AttributeUsageImpl.java
@@ -884,6 +884,32 @@ public void setNestedConstraint(Collection nestedConstraint) {
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("nestedEnumeration")
+ private Collection nestedEnumeration;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "EnumerationUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "AttributeUsage_nestedEnumeration",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public Collection getNestedEnumeration() {
+ if (nestedEnumeration == null) {
+ nestedEnumeration = new ArrayList<>();
+ }
+ return nestedEnumeration;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = EnumerationUsageImpl.class)
+ public void setNestedEnumeration(Collection nestedEnumeration) {
+ this.nestedEnumeration = nestedEnumeration;
+ }
+
+
+
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("nestedIndividual")
private Collection nestedIndividual;
@@ -1757,20 +1783,20 @@ public void setOwningMembership(Membership owningMembership) {
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("owningNamespace")
- private Package owningNamespace;
+ private Namespace owningNamespace;
@JsonGetter
@JsonSerialize(using = MofObjectSerializer.class)
// @javax.persistence.Transient
- @Any(metaDef = "PackageMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
+ @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
@JoinColumn(name = "owningNamespaceId", table = "AttributeUsage")
- public Package getOwningNamespace() {
+ public Namespace getOwningNamespace() {
return owningNamespace;
}
@JsonSetter
- @JsonDeserialize(using = MofObjectDeserializer.class, as = PackageImpl.class)
- public void setOwningNamespace(Package owningNamespace) {
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = NamespaceImpl.class)
+ public void setOwningNamespace(Namespace owningNamespace) {
this.owningNamespace = owningNamespace;
}
diff --git a/app/org/omg/sysml/metamodel/impl/BehaviorImpl.java b/app/org/omg/sysml/metamodel/impl/BehaviorImpl.java
index 8a53a544..459d2444 100644
--- a/app/org/omg/sysml/metamodel/impl/BehaviorImpl.java
+++ b/app/org/omg/sysml/metamodel/impl/BehaviorImpl.java
@@ -892,20 +892,20 @@ public void setOwningMembership(Membership owningMembership) {
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("owningNamespace")
- private Package owningNamespace;
+ private Namespace owningNamespace;
@JsonGetter
@JsonSerialize(using = MofObjectSerializer.class)
// @javax.persistence.Transient
- @Any(metaDef = "PackageMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
+ @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
@JoinColumn(name = "owningNamespaceId", table = "Behavior")
- public Package getOwningNamespace() {
+ public Namespace getOwningNamespace() {
return owningNamespace;
}
@JsonSetter
- @JsonDeserialize(using = MofObjectDeserializer.class, as = PackageImpl.class)
- public void setOwningNamespace(Package owningNamespace) {
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = NamespaceImpl.class)
+ public void setOwningNamespace(Namespace owningNamespace) {
this.owningNamespace = owningNamespace;
}
diff --git a/app/org/omg/sysml/metamodel/impl/BindingConnectorImpl.java b/app/org/omg/sysml/metamodel/impl/BindingConnectorImpl.java
index acec3d72..ebaaa6db 100644
--- a/app/org/omg/sysml/metamodel/impl/BindingConnectorImpl.java
+++ b/app/org/omg/sysml/metamodel/impl/BindingConnectorImpl.java
@@ -1214,20 +1214,20 @@ public void setOwningMembership(Membership owningMembership) {
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("owningNamespace")
- private Package owningNamespace;
+ private Namespace owningNamespace;
@JsonGetter
@JsonSerialize(using = MofObjectSerializer.class)
// @javax.persistence.Transient
- @Any(metaDef = "PackageMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
+ @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
@JoinColumn(name = "owningNamespaceId", table = "BindingConnector")
- public Package getOwningNamespace() {
+ public Namespace getOwningNamespace() {
return owningNamespace;
}
@JsonSetter
- @JsonDeserialize(using = MofObjectDeserializer.class, as = PackageImpl.class)
- public void setOwningNamespace(Package owningNamespace) {
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = NamespaceImpl.class)
+ public void setOwningNamespace(Namespace owningNamespace) {
this.owningNamespace = owningNamespace;
}
diff --git a/app/org/omg/sysml/metamodel/impl/BlockExpressionImpl.java b/app/org/omg/sysml/metamodel/impl/BlockExpressionImpl.java
index 3ed08b9e..0fb91f39 100644
--- a/app/org/omg/sysml/metamodel/impl/BlockExpressionImpl.java
+++ b/app/org/omg/sysml/metamodel/impl/BlockExpressionImpl.java
@@ -1169,20 +1169,20 @@ public void setOwningMembership(Membership owningMembership) {
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("owningNamespace")
- private Package owningNamespace;
+ private Namespace owningNamespace;
@JsonGetter
@JsonSerialize(using = MofObjectSerializer.class)
// @javax.persistence.Transient
- @Any(metaDef = "PackageMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
+ @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
@JoinColumn(name = "owningNamespaceId", table = "BlockExpression")
- public Package getOwningNamespace() {
+ public Namespace getOwningNamespace() {
return owningNamespace;
}
@JsonSetter
- @JsonDeserialize(using = MofObjectDeserializer.class, as = PackageImpl.class)
- public void setOwningNamespace(Package owningNamespace) {
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = NamespaceImpl.class)
+ public void setOwningNamespace(Namespace owningNamespace) {
this.owningNamespace = owningNamespace;
}
diff --git a/app/org/omg/sysml/metamodel/impl/BooleanExpressionImpl.java b/app/org/omg/sysml/metamodel/impl/BooleanExpressionImpl.java
index 4f9615dd..a20743e0 100644
--- a/app/org/omg/sysml/metamodel/impl/BooleanExpressionImpl.java
+++ b/app/org/omg/sysml/metamodel/impl/BooleanExpressionImpl.java
@@ -1169,20 +1169,20 @@ public void setOwningMembership(Membership owningMembership) {
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("owningNamespace")
- private Package owningNamespace;
+ private Namespace owningNamespace;
@JsonGetter
@JsonSerialize(using = MofObjectSerializer.class)
// @javax.persistence.Transient
- @Any(metaDef = "PackageMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
+ @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
@JoinColumn(name = "owningNamespaceId", table = "BooleanExpression")
- public Package getOwningNamespace() {
+ public Namespace getOwningNamespace() {
return owningNamespace;
}
@JsonSetter
- @JsonDeserialize(using = MofObjectDeserializer.class, as = PackageImpl.class)
- public void setOwningNamespace(Package owningNamespace) {
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = NamespaceImpl.class)
+ public void setOwningNamespace(Namespace owningNamespace) {
this.owningNamespace = owningNamespace;
}
diff --git a/app/org/omg/sysml/metamodel/impl/CalculationDefinitionImpl.java b/app/org/omg/sysml/metamodel/impl/CalculationDefinitionImpl.java
index fcdcd9b7..95ad4919 100644
--- a/app/org/omg/sysml/metamodel/impl/CalculationDefinitionImpl.java
+++ b/app/org/omg/sysml/metamodel/impl/CalculationDefinitionImpl.java
@@ -926,6 +926,32 @@ public void setOwnedEndFeature(Collection ownedEndFeature) {
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("ownedEnumeration")
+ private Collection ownedEnumeration;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "EnumerationUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "CalculationDefinition_ownedEnumeration",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public Collection getOwnedEnumeration() {
+ if (ownedEnumeration == null) {
+ ownedEnumeration = new ArrayList<>();
+ }
+ return ownedEnumeration;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = EnumerationUsageImpl.class)
+ public void setOwnedEnumeration(Collection ownedEnumeration) {
+ this.ownedEnumeration = ownedEnumeration;
+ }
+
+
+
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("ownedFeature")
private Collection ownedFeature;
@@ -1558,20 +1584,20 @@ public void setOwningMembership(Membership owningMembership) {
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("owningNamespace")
- private Package owningNamespace;
+ private Namespace owningNamespace;
@JsonGetter
@JsonSerialize(using = MofObjectSerializer.class)
// @javax.persistence.Transient
- @Any(metaDef = "PackageMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
+ @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
@JoinColumn(name = "owningNamespaceId", table = "CalculationDefinition")
- public Package getOwningNamespace() {
+ public Namespace getOwningNamespace() {
return owningNamespace;
}
@JsonSetter
- @JsonDeserialize(using = MofObjectDeserializer.class, as = PackageImpl.class)
- public void setOwningNamespace(Package owningNamespace) {
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = NamespaceImpl.class)
+ public void setOwningNamespace(Namespace owningNamespace) {
this.owningNamespace = owningNamespace;
}
diff --git a/app/org/omg/sysml/metamodel/impl/CalculationUsageImpl.java b/app/org/omg/sysml/metamodel/impl/CalculationUsageImpl.java
index f8980331..825af27b 100644
--- a/app/org/omg/sysml/metamodel/impl/CalculationUsageImpl.java
+++ b/app/org/omg/sysml/metamodel/impl/CalculationUsageImpl.java
@@ -952,6 +952,32 @@ public void setNestedConstraint(Collection nestedConstraint) {
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("nestedEnumeration")
+ private Collection nestedEnumeration;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "EnumerationUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "CalculationUsage_nestedEnumeration",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public Collection getNestedEnumeration() {
+ if (nestedEnumeration == null) {
+ nestedEnumeration = new ArrayList<>();
+ }
+ return nestedEnumeration;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = EnumerationUsageImpl.class)
+ public void setNestedEnumeration(Collection nestedEnumeration) {
+ this.nestedEnumeration = nestedEnumeration;
+ }
+
+
+
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("nestedIndividual")
private Collection nestedIndividual;
@@ -1825,20 +1851,20 @@ public void setOwningMembership(Membership owningMembership) {
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("owningNamespace")
- private Package owningNamespace;
+ private Namespace owningNamespace;
@JsonGetter
@JsonSerialize(using = MofObjectSerializer.class)
// @javax.persistence.Transient
- @Any(metaDef = "PackageMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
+ @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
@JoinColumn(name = "owningNamespaceId", table = "CalculationUsage")
- public Package getOwningNamespace() {
+ public Namespace getOwningNamespace() {
return owningNamespace;
}
@JsonSetter
- @JsonDeserialize(using = MofObjectDeserializer.class, as = PackageImpl.class)
- public void setOwningNamespace(Package owningNamespace) {
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = NamespaceImpl.class)
+ public void setOwningNamespace(Namespace owningNamespace) {
this.owningNamespace = owningNamespace;
}
diff --git a/app/org/omg/sysml/metamodel/impl/CaseDefinitionImpl.java b/app/org/omg/sysml/metamodel/impl/CaseDefinitionImpl.java
index 817368e7..c9957a2b 100644
--- a/app/org/omg/sysml/metamodel/impl/CaseDefinitionImpl.java
+++ b/app/org/omg/sysml/metamodel/impl/CaseDefinitionImpl.java
@@ -947,6 +947,32 @@ public void setOwnedEndFeature(Collection ownedEndFeature) {
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("ownedEnumeration")
+ private Collection ownedEnumeration;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "EnumerationUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "CaseDefinition_ownedEnumeration",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public Collection getOwnedEnumeration() {
+ if (ownedEnumeration == null) {
+ ownedEnumeration = new ArrayList<>();
+ }
+ return ownedEnumeration;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = EnumerationUsageImpl.class)
+ public void setOwnedEnumeration(Collection ownedEnumeration) {
+ this.ownedEnumeration = ownedEnumeration;
+ }
+
+
+
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("ownedFeature")
private Collection ownedFeature;
@@ -1579,20 +1605,20 @@ public void setOwningMembership(Membership owningMembership) {
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("owningNamespace")
- private Package owningNamespace;
+ private Namespace owningNamespace;
@JsonGetter
@JsonSerialize(using = MofObjectSerializer.class)
// @javax.persistence.Transient
- @Any(metaDef = "PackageMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
+ @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
@JoinColumn(name = "owningNamespaceId", table = "CaseDefinition")
- public Package getOwningNamespace() {
+ public Namespace getOwningNamespace() {
return owningNamespace;
}
@JsonSetter
- @JsonDeserialize(using = MofObjectDeserializer.class, as = PackageImpl.class)
- public void setOwningNamespace(Package owningNamespace) {
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = NamespaceImpl.class)
+ public void setOwningNamespace(Namespace owningNamespace) {
this.owningNamespace = owningNamespace;
}
diff --git a/app/org/omg/sysml/metamodel/impl/CaseUsageImpl.java b/app/org/omg/sysml/metamodel/impl/CaseUsageImpl.java
index f6ece838..cdfa0086 100644
--- a/app/org/omg/sysml/metamodel/impl/CaseUsageImpl.java
+++ b/app/org/omg/sysml/metamodel/impl/CaseUsageImpl.java
@@ -973,6 +973,32 @@ public void setNestedConstraint(Collection nestedConstraint) {
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("nestedEnumeration")
+ private Collection nestedEnumeration;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "EnumerationUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "CaseUsage_nestedEnumeration",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public Collection getNestedEnumeration() {
+ if (nestedEnumeration == null) {
+ nestedEnumeration = new ArrayList<>();
+ }
+ return nestedEnumeration;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = EnumerationUsageImpl.class)
+ public void setNestedEnumeration(Collection nestedEnumeration) {
+ this.nestedEnumeration = nestedEnumeration;
+ }
+
+
+
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("nestedIndividual")
private Collection nestedIndividual;
@@ -1867,20 +1893,20 @@ public void setOwningMembership(Membership owningMembership) {
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("owningNamespace")
- private Package owningNamespace;
+ private Namespace owningNamespace;
@JsonGetter
@JsonSerialize(using = MofObjectSerializer.class)
// @javax.persistence.Transient
- @Any(metaDef = "PackageMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
+ @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
@JoinColumn(name = "owningNamespaceId", table = "CaseUsage")
- public Package getOwningNamespace() {
+ public Namespace getOwningNamespace() {
return owningNamespace;
}
@JsonSetter
- @JsonDeserialize(using = MofObjectDeserializer.class, as = PackageImpl.class)
- public void setOwningNamespace(Package owningNamespace) {
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = NamespaceImpl.class)
+ public void setOwningNamespace(Namespace owningNamespace) {
this.owningNamespace = owningNamespace;
}
diff --git a/app/org/omg/sysml/metamodel/impl/ClassImpl.java b/app/org/omg/sysml/metamodel/impl/ClassImpl.java
index 4205f240..43bfcf6a 100644
--- a/app/org/omg/sysml/metamodel/impl/ClassImpl.java
+++ b/app/org/omg/sysml/metamodel/impl/ClassImpl.java
@@ -892,20 +892,20 @@ public void setOwningMembership(Membership owningMembership) {
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("owningNamespace")
- private Package owningNamespace;
+ private Namespace owningNamespace;
@JsonGetter
@JsonSerialize(using = MofObjectSerializer.class)
// @javax.persistence.Transient
- @Any(metaDef = "PackageMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
+ @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
@JoinColumn(name = "owningNamespaceId", table = "Class")
- public Package getOwningNamespace() {
+ public Namespace getOwningNamespace() {
return owningNamespace;
}
@JsonSetter
- @JsonDeserialize(using = MofObjectDeserializer.class, as = PackageImpl.class)
- public void setOwningNamespace(Package owningNamespace) {
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = NamespaceImpl.class)
+ public void setOwningNamespace(Namespace owningNamespace) {
this.owningNamespace = owningNamespace;
}
diff --git a/app/org/omg/sysml/metamodel/impl/ClassifierImpl.java b/app/org/omg/sysml/metamodel/impl/ClassifierImpl.java
index 1b2f850a..aee0ab36 100644
--- a/app/org/omg/sysml/metamodel/impl/ClassifierImpl.java
+++ b/app/org/omg/sysml/metamodel/impl/ClassifierImpl.java
@@ -892,20 +892,20 @@ public void setOwningMembership(Membership owningMembership) {
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("owningNamespace")
- private Package owningNamespace;
+ private Namespace owningNamespace;
@JsonGetter
@JsonSerialize(using = MofObjectSerializer.class)
// @javax.persistence.Transient
- @Any(metaDef = "PackageMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
+ @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
@JoinColumn(name = "owningNamespaceId", table = "Classifier")
- public Package getOwningNamespace() {
+ public Namespace getOwningNamespace() {
return owningNamespace;
}
@JsonSetter
- @JsonDeserialize(using = MofObjectDeserializer.class, as = PackageImpl.class)
- public void setOwningNamespace(Package owningNamespace) {
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = NamespaceImpl.class)
+ public void setOwningNamespace(Namespace owningNamespace) {
this.owningNamespace = owningNamespace;
}
diff --git a/app/org/omg/sysml/metamodel/impl/CommentImpl.java b/app/org/omg/sysml/metamodel/impl/CommentImpl.java
index b28333a6..24f31bc0 100644
--- a/app/org/omg/sysml/metamodel/impl/CommentImpl.java
+++ b/app/org/omg/sysml/metamodel/impl/CommentImpl.java
@@ -406,20 +406,20 @@ public void setOwningMembership(Membership owningMembership) {
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("owningNamespace")
- private Package owningNamespace;
+ private Namespace owningNamespace;
@JsonGetter
@JsonSerialize(using = MofObjectSerializer.class)
// @javax.persistence.Transient
- @Any(metaDef = "PackageMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
+ @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
@JoinColumn(name = "owningNamespaceId", table = "Comment")
- public Package getOwningNamespace() {
+ public Namespace getOwningNamespace() {
return owningNamespace;
}
@JsonSetter
- @JsonDeserialize(using = MofObjectDeserializer.class, as = PackageImpl.class)
- public void setOwningNamespace(Package owningNamespace) {
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = NamespaceImpl.class)
+ public void setOwningNamespace(Namespace owningNamespace) {
this.owningNamespace = owningNamespace;
}
diff --git a/app/org/omg/sysml/metamodel/impl/ConjugatedPortDefinitionImpl.java b/app/org/omg/sysml/metamodel/impl/ConjugatedPortDefinitionImpl.java
index 00627618..14890861 100644
--- a/app/org/omg/sysml/metamodel/impl/ConjugatedPortDefinitionImpl.java
+++ b/app/org/omg/sysml/metamodel/impl/ConjugatedPortDefinitionImpl.java
@@ -890,6 +890,32 @@ public void setOwnedEndFeature(Collection ownedEndFeature) {
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("ownedEnumeration")
+ private Collection ownedEnumeration;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "EnumerationUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "ConjugatedPortDefinition_ownedEnumeration",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public Collection getOwnedEnumeration() {
+ if (ownedEnumeration == null) {
+ ownedEnumeration = new ArrayList<>();
+ }
+ return ownedEnumeration;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = EnumerationUsageImpl.class)
+ public void setOwnedEnumeration(Collection ownedEnumeration) {
+ this.ownedEnumeration = ownedEnumeration;
+ }
+
+
+
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("ownedFeature")
private Collection ownedFeature;
@@ -1541,20 +1567,20 @@ public void setOwningMembership(Membership owningMembership) {
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("owningNamespace")
- private Package owningNamespace;
+ private Namespace owningNamespace;
@JsonGetter
@JsonSerialize(using = MofObjectSerializer.class)
// @javax.persistence.Transient
- @Any(metaDef = "PackageMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
+ @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
@JoinColumn(name = "owningNamespaceId", table = "ConjugatedPortDefinition")
- public Package getOwningNamespace() {
+ public Namespace getOwningNamespace() {
return owningNamespace;
}
@JsonSetter
- @JsonDeserialize(using = MofObjectDeserializer.class, as = PackageImpl.class)
- public void setOwningNamespace(Package owningNamespace) {
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = NamespaceImpl.class)
+ public void setOwningNamespace(Namespace owningNamespace) {
this.owningNamespace = owningNamespace;
}
diff --git a/app/org/omg/sysml/metamodel/impl/ConjugatedPortTypingImpl.java b/app/org/omg/sysml/metamodel/impl/ConjugatedPortTypingImpl.java
index baa7f20d..0e8a0c22 100644
--- a/app/org/omg/sysml/metamodel/impl/ConjugatedPortTypingImpl.java
+++ b/app/org/omg/sysml/metamodel/impl/ConjugatedPortTypingImpl.java
@@ -423,20 +423,20 @@ public void setOwningMembership(Membership owningMembership) {
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("owningNamespace")
- private Package owningNamespace;
+ private Namespace owningNamespace;
@JsonGetter
@JsonSerialize(using = MofObjectSerializer.class)
// @javax.persistence.Transient
- @Any(metaDef = "PackageMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
+ @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
@JoinColumn(name = "owningNamespaceId", table = "ConjugatedPortTyping")
- public Package getOwningNamespace() {
+ public Namespace getOwningNamespace() {
return owningNamespace;
}
@JsonSetter
- @JsonDeserialize(using = MofObjectDeserializer.class, as = PackageImpl.class)
- public void setOwningNamespace(Package owningNamespace) {
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = NamespaceImpl.class)
+ public void setOwningNamespace(Namespace owningNamespace) {
this.owningNamespace = owningNamespace;
}
diff --git a/app/org/omg/sysml/metamodel/impl/ConjugationImpl.java b/app/org/omg/sysml/metamodel/impl/ConjugationImpl.java
index 04f33278..97403a1b 100644
--- a/app/org/omg/sysml/metamodel/impl/ConjugationImpl.java
+++ b/app/org/omg/sysml/metamodel/impl/ConjugationImpl.java
@@ -400,20 +400,20 @@ public void setOwningMembership(Membership owningMembership) {
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("owningNamespace")
- private Package owningNamespace;
+ private Namespace owningNamespace;
@JsonGetter
@JsonSerialize(using = MofObjectSerializer.class)
// @javax.persistence.Transient
- @Any(metaDef = "PackageMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
+ @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
@JoinColumn(name = "owningNamespaceId", table = "Conjugation")
- public Package getOwningNamespace() {
+ public Namespace getOwningNamespace() {
return owningNamespace;
}
@JsonSetter
- @JsonDeserialize(using = MofObjectDeserializer.class, as = PackageImpl.class)
- public void setOwningNamespace(Package owningNamespace) {
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = NamespaceImpl.class)
+ public void setOwningNamespace(Namespace owningNamespace) {
this.owningNamespace = owningNamespace;
}
diff --git a/app/org/omg/sysml/metamodel/impl/ConnectionDefinitionImpl.java b/app/org/omg/sysml/metamodel/impl/ConnectionDefinitionImpl.java
index 8575d874..74c73b30 100644
--- a/app/org/omg/sysml/metamodel/impl/ConnectionDefinitionImpl.java
+++ b/app/org/omg/sysml/metamodel/impl/ConnectionDefinitionImpl.java
@@ -900,6 +900,32 @@ public void setOwnedEndFeature(Collection ownedEndFeature) {
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("ownedEnumeration")
+ private Collection ownedEnumeration;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "EnumerationUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "ConnectionDefinition_ownedEnumeration",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public Collection getOwnedEnumeration() {
+ if (ownedEnumeration == null) {
+ ownedEnumeration = new ArrayList<>();
+ }
+ return ownedEnumeration;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = EnumerationUsageImpl.class)
+ public void setOwnedEnumeration(Collection ownedEnumeration) {
+ this.ownedEnumeration = ownedEnumeration;
+ }
+
+
+
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("ownedFeature")
private Collection ownedFeature;
@@ -1556,20 +1582,20 @@ public void setOwningMembership(Membership owningMembership) {
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("owningNamespace")
- private Package owningNamespace;
+ private Namespace owningNamespace;
@JsonGetter
@JsonSerialize(using = MofObjectSerializer.class)
// @javax.persistence.Transient
- @Any(metaDef = "PackageMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
+ @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
@JoinColumn(name = "owningNamespaceId", table = "ConnectionDefinition")
- public Package getOwningNamespace() {
+ public Namespace getOwningNamespace() {
return owningNamespace;
}
@JsonSetter
- @JsonDeserialize(using = MofObjectDeserializer.class, as = PackageImpl.class)
- public void setOwningNamespace(Package owningNamespace) {
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = NamespaceImpl.class)
+ public void setOwningNamespace(Namespace owningNamespace) {
this.owningNamespace = owningNamespace;
}
diff --git a/app/org/omg/sysml/metamodel/impl/ConnectionUsageImpl.java b/app/org/omg/sysml/metamodel/impl/ConnectionUsageImpl.java
index 9192229b..2d4b2fa1 100644
--- a/app/org/omg/sysml/metamodel/impl/ConnectionUsageImpl.java
+++ b/app/org/omg/sysml/metamodel/impl/ConnectionUsageImpl.java
@@ -978,6 +978,32 @@ public void setNestedConstraint(Collection nestedConstraint) {
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("nestedEnumeration")
+ private Collection nestedEnumeration;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "EnumerationUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "ConnectionUsage_nestedEnumeration",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public Collection getNestedEnumeration() {
+ if (nestedEnumeration == null) {
+ nestedEnumeration = new ArrayList<>();
+ }
+ return nestedEnumeration;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = EnumerationUsageImpl.class)
+ public void setNestedEnumeration(Collection nestedEnumeration) {
+ this.nestedEnumeration = nestedEnumeration;
+ }
+
+
+
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("nestedIndividual")
private Collection nestedIndividual;
@@ -1875,20 +1901,20 @@ public void setOwningMembership(Membership owningMembership) {
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("owningNamespace")
- private Package owningNamespace;
+ private Namespace owningNamespace;
@JsonGetter
@JsonSerialize(using = MofObjectSerializer.class)
// @javax.persistence.Transient
- @Any(metaDef = "PackageMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
+ @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
@JoinColumn(name = "owningNamespaceId", table = "ConnectionUsage")
- public Package getOwningNamespace() {
+ public Namespace getOwningNamespace() {
return owningNamespace;
}
@JsonSetter
- @JsonDeserialize(using = MofObjectDeserializer.class, as = PackageImpl.class)
- public void setOwningNamespace(Package owningNamespace) {
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = NamespaceImpl.class)
+ public void setOwningNamespace(Namespace owningNamespace) {
this.owningNamespace = owningNamespace;
}
diff --git a/app/org/omg/sysml/metamodel/impl/ConnectorImpl.java b/app/org/omg/sysml/metamodel/impl/ConnectorImpl.java
index fed5b097..2a50dfff 100644
--- a/app/org/omg/sysml/metamodel/impl/ConnectorImpl.java
+++ b/app/org/omg/sysml/metamodel/impl/ConnectorImpl.java
@@ -1214,20 +1214,20 @@ public void setOwningMembership(Membership owningMembership) {
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("owningNamespace")
- private Package owningNamespace;
+ private Namespace owningNamespace;
@JsonGetter
@JsonSerialize(using = MofObjectSerializer.class)
// @javax.persistence.Transient
- @Any(metaDef = "PackageMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
+ @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
@JoinColumn(name = "owningNamespaceId", table = "Connector")
- public Package getOwningNamespace() {
+ public Namespace getOwningNamespace() {
return owningNamespace;
}
@JsonSetter
- @JsonDeserialize(using = MofObjectDeserializer.class, as = PackageImpl.class)
- public void setOwningNamespace(Package owningNamespace) {
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = NamespaceImpl.class)
+ public void setOwningNamespace(Namespace owningNamespace) {
this.owningNamespace = owningNamespace;
}
diff --git a/app/org/omg/sysml/metamodel/impl/ConstraintDefinitionImpl.java b/app/org/omg/sysml/metamodel/impl/ConstraintDefinitionImpl.java
index d542816a..cf8ff33e 100644
--- a/app/org/omg/sysml/metamodel/impl/ConstraintDefinitionImpl.java
+++ b/app/org/omg/sysml/metamodel/impl/ConstraintDefinitionImpl.java
@@ -874,6 +874,32 @@ public void setOwnedEndFeature(Collection ownedEndFeature) {
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("ownedEnumeration")
+ private Collection ownedEnumeration;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "EnumerationUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "ConstraintDefinition_ownedEnumeration",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public Collection getOwnedEnumeration() {
+ if (ownedEnumeration == null) {
+ ownedEnumeration = new ArrayList<>();
+ }
+ return ownedEnumeration;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = EnumerationUsageImpl.class)
+ public void setOwnedEnumeration(Collection ownedEnumeration) {
+ this.ownedEnumeration = ownedEnumeration;
+ }
+
+
+
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("ownedFeature")
private Collection ownedFeature;
@@ -1506,20 +1532,20 @@ public void setOwningMembership(Membership owningMembership) {
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("owningNamespace")
- private Package owningNamespace;
+ private Namespace owningNamespace;
@JsonGetter
@JsonSerialize(using = MofObjectSerializer.class)
// @javax.persistence.Transient
- @Any(metaDef = "PackageMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
+ @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
@JoinColumn(name = "owningNamespaceId", table = "ConstraintDefinition")
- public Package getOwningNamespace() {
+ public Namespace getOwningNamespace() {
return owningNamespace;
}
@JsonSetter
- @JsonDeserialize(using = MofObjectDeserializer.class, as = PackageImpl.class)
- public void setOwningNamespace(Package owningNamespace) {
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = NamespaceImpl.class)
+ public void setOwningNamespace(Namespace owningNamespace) {
this.owningNamespace = owningNamespace;
}
diff --git a/app/org/omg/sysml/metamodel/impl/ConstraintUsageImpl.java b/app/org/omg/sysml/metamodel/impl/ConstraintUsageImpl.java
index 026a2414..f7cdd7af 100644
--- a/app/org/omg/sysml/metamodel/impl/ConstraintUsageImpl.java
+++ b/app/org/omg/sysml/metamodel/impl/ConstraintUsageImpl.java
@@ -926,6 +926,32 @@ public void setNestedConstraint(Collection nestedConstraint) {
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("nestedEnumeration")
+ private Collection nestedEnumeration;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "EnumerationUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "ConstraintUsage_nestedEnumeration",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public Collection getNestedEnumeration() {
+ if (nestedEnumeration == null) {
+ nestedEnumeration = new ArrayList<>();
+ }
+ return nestedEnumeration;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = EnumerationUsageImpl.class)
+ public void setNestedEnumeration(Collection nestedEnumeration) {
+ this.nestedEnumeration = nestedEnumeration;
+ }
+
+
+
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("nestedIndividual")
private Collection nestedIndividual;
@@ -1799,20 +1825,20 @@ public void setOwningMembership(Membership owningMembership) {
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("owningNamespace")
- private Package owningNamespace;
+ private Namespace owningNamespace;
@JsonGetter
@JsonSerialize(using = MofObjectSerializer.class)
// @javax.persistence.Transient
- @Any(metaDef = "PackageMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
+ @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
@JoinColumn(name = "owningNamespaceId", table = "ConstraintUsage")
- public Package getOwningNamespace() {
+ public Namespace getOwningNamespace() {
return owningNamespace;
}
@JsonSetter
- @JsonDeserialize(using = MofObjectDeserializer.class, as = PackageImpl.class)
- public void setOwningNamespace(Package owningNamespace) {
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = NamespaceImpl.class)
+ public void setOwningNamespace(Namespace owningNamespace) {
this.owningNamespace = owningNamespace;
}
diff --git a/app/org/omg/sysml/metamodel/impl/ControlNodeImpl.java b/app/org/omg/sysml/metamodel/impl/ControlNodeImpl.java
index dfa88970..f63ea150 100644
--- a/app/org/omg/sysml/metamodel/impl/ControlNodeImpl.java
+++ b/app/org/omg/sysml/metamodel/impl/ControlNodeImpl.java
@@ -910,6 +910,32 @@ public void setNestedConstraint(Collection nestedConstraint) {
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("nestedEnumeration")
+ private Collection nestedEnumeration;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "EnumerationUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "ControlNode_nestedEnumeration",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public Collection getNestedEnumeration() {
+ if (nestedEnumeration == null) {
+ nestedEnumeration = new ArrayList<>();
+ }
+ return nestedEnumeration;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = EnumerationUsageImpl.class)
+ public void setNestedEnumeration(Collection nestedEnumeration) {
+ this.nestedEnumeration = nestedEnumeration;
+ }
+
+
+
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("nestedIndividual")
private Collection nestedIndividual;
@@ -1783,20 +1809,20 @@ public void setOwningMembership(Membership owningMembership) {
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("owningNamespace")
- private Package owningNamespace;
+ private Namespace owningNamespace;
@JsonGetter
@JsonSerialize(using = MofObjectSerializer.class)
// @javax.persistence.Transient
- @Any(metaDef = "PackageMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
+ @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
@JoinColumn(name = "owningNamespaceId", table = "ControlNode")
- public Package getOwningNamespace() {
+ public Namespace getOwningNamespace() {
return owningNamespace;
}
@JsonSetter
- @JsonDeserialize(using = MofObjectDeserializer.class, as = PackageImpl.class)
- public void setOwningNamespace(Package owningNamespace) {
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = NamespaceImpl.class)
+ public void setOwningNamespace(Namespace owningNamespace) {
this.owningNamespace = owningNamespace;
}
diff --git a/app/org/omg/sysml/metamodel/impl/DataTypeImpl.java b/app/org/omg/sysml/metamodel/impl/DataTypeImpl.java
index b0eb4dcb..98f2cc4d 100644
--- a/app/org/omg/sysml/metamodel/impl/DataTypeImpl.java
+++ b/app/org/omg/sysml/metamodel/impl/DataTypeImpl.java
@@ -892,20 +892,20 @@ public void setOwningMembership(Membership owningMembership) {
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("owningNamespace")
- private Package owningNamespace;
+ private Namespace owningNamespace;
@JsonGetter
@JsonSerialize(using = MofObjectSerializer.class)
// @javax.persistence.Transient
- @Any(metaDef = "PackageMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
+ @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
@JoinColumn(name = "owningNamespaceId", table = "DataType")
- public Package getOwningNamespace() {
+ public Namespace getOwningNamespace() {
return owningNamespace;
}
@JsonSetter
- @JsonDeserialize(using = MofObjectDeserializer.class, as = PackageImpl.class)
- public void setOwningNamespace(Package owningNamespace) {
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = NamespaceImpl.class)
+ public void setOwningNamespace(Namespace owningNamespace) {
this.owningNamespace = owningNamespace;
}
diff --git a/app/org/omg/sysml/metamodel/impl/DecisionNodeImpl.java b/app/org/omg/sysml/metamodel/impl/DecisionNodeImpl.java
index 6a4f101b..c012753d 100644
--- a/app/org/omg/sysml/metamodel/impl/DecisionNodeImpl.java
+++ b/app/org/omg/sysml/metamodel/impl/DecisionNodeImpl.java
@@ -910,6 +910,32 @@ public void setNestedConstraint(Collection nestedConstraint) {
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("nestedEnumeration")
+ private Collection nestedEnumeration;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "EnumerationUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "DecisionNode_nestedEnumeration",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public Collection getNestedEnumeration() {
+ if (nestedEnumeration == null) {
+ nestedEnumeration = new ArrayList<>();
+ }
+ return nestedEnumeration;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = EnumerationUsageImpl.class)
+ public void setNestedEnumeration(Collection nestedEnumeration) {
+ this.nestedEnumeration = nestedEnumeration;
+ }
+
+
+
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("nestedIndividual")
private Collection nestedIndividual;
@@ -1783,20 +1809,20 @@ public void setOwningMembership(Membership owningMembership) {
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("owningNamespace")
- private Package owningNamespace;
+ private Namespace owningNamespace;
@JsonGetter
@JsonSerialize(using = MofObjectSerializer.class)
// @javax.persistence.Transient
- @Any(metaDef = "PackageMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
+ @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
@JoinColumn(name = "owningNamespaceId", table = "DecisionNode")
- public Package getOwningNamespace() {
+ public Namespace getOwningNamespace() {
return owningNamespace;
}
@JsonSetter
- @JsonDeserialize(using = MofObjectDeserializer.class, as = PackageImpl.class)
- public void setOwningNamespace(Package owningNamespace) {
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = NamespaceImpl.class)
+ public void setOwningNamespace(Namespace owningNamespace) {
this.owningNamespace = owningNamespace;
}
diff --git a/app/org/omg/sysml/metamodel/impl/DefinitionImpl.java b/app/org/omg/sysml/metamodel/impl/DefinitionImpl.java
index 4af81d47..9eded3d6 100644
--- a/app/org/omg/sysml/metamodel/impl/DefinitionImpl.java
+++ b/app/org/omg/sysml/metamodel/impl/DefinitionImpl.java
@@ -848,6 +848,32 @@ public void setOwnedEndFeature(Collection ownedEndFeature) {
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("ownedEnumeration")
+ private Collection ownedEnumeration;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "EnumerationUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "Definition_ownedEnumeration",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public Collection getOwnedEnumeration() {
+ if (ownedEnumeration == null) {
+ ownedEnumeration = new ArrayList<>();
+ }
+ return ownedEnumeration;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = EnumerationUsageImpl.class)
+ public void setOwnedEnumeration(Collection ownedEnumeration) {
+ this.ownedEnumeration = ownedEnumeration;
+ }
+
+
+
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("ownedFeature")
private Collection ownedFeature;
@@ -1480,20 +1506,20 @@ public void setOwningMembership(Membership owningMembership) {
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("owningNamespace")
- private Package owningNamespace;
+ private Namespace owningNamespace;
@JsonGetter
@JsonSerialize(using = MofObjectSerializer.class)
// @javax.persistence.Transient
- @Any(metaDef = "PackageMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
+ @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
@JoinColumn(name = "owningNamespaceId", table = "Definition")
- public Package getOwningNamespace() {
+ public Namespace getOwningNamespace() {
return owningNamespace;
}
@JsonSetter
- @JsonDeserialize(using = MofObjectDeserializer.class, as = PackageImpl.class)
- public void setOwningNamespace(Package owningNamespace) {
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = NamespaceImpl.class)
+ public void setOwningNamespace(Namespace owningNamespace) {
this.owningNamespace = owningNamespace;
}
diff --git a/app/org/omg/sysml/metamodel/impl/DependencyImpl.java b/app/org/omg/sysml/metamodel/impl/DependencyImpl.java
index a89f4b1f..6e3c91f2 100644
--- a/app/org/omg/sysml/metamodel/impl/DependencyImpl.java
+++ b/app/org/omg/sysml/metamodel/impl/DependencyImpl.java
@@ -386,20 +386,20 @@ public void setOwningMembership(Membership owningMembership) {
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("owningNamespace")
- private Package owningNamespace;
+ private Namespace owningNamespace;
@JsonGetter
@JsonSerialize(using = MofObjectSerializer.class)
// @javax.persistence.Transient
- @Any(metaDef = "PackageMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
+ @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
@JoinColumn(name = "owningNamespaceId", table = "Dependency")
- public Package getOwningNamespace() {
+ public Namespace getOwningNamespace() {
return owningNamespace;
}
@JsonSetter
- @JsonDeserialize(using = MofObjectDeserializer.class, as = PackageImpl.class)
- public void setOwningNamespace(Package owningNamespace) {
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = NamespaceImpl.class)
+ public void setOwningNamespace(Namespace owningNamespace) {
this.owningNamespace = owningNamespace;
}
diff --git a/app/org/omg/sysml/metamodel/impl/DocumentationImpl.java b/app/org/omg/sysml/metamodel/impl/DocumentationImpl.java
index cf7e3fe9..72d9feb2 100644
--- a/app/org/omg/sysml/metamodel/impl/DocumentationImpl.java
+++ b/app/org/omg/sysml/metamodel/impl/DocumentationImpl.java
@@ -457,20 +457,20 @@ public void setOwningMembership(Membership owningMembership) {
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("owningNamespace")
- private Package owningNamespace;
+ private Namespace owningNamespace;
@JsonGetter
@JsonSerialize(using = MofObjectSerializer.class)
// @javax.persistence.Transient
- @Any(metaDef = "PackageMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
+ @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
@JoinColumn(name = "owningNamespaceId", table = "Documentation")
- public Package getOwningNamespace() {
+ public Namespace getOwningNamespace() {
return owningNamespace;
}
@JsonSetter
- @JsonDeserialize(using = MofObjectDeserializer.class, as = PackageImpl.class)
- public void setOwningNamespace(Package owningNamespace) {
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = NamespaceImpl.class)
+ public void setOwningNamespace(Namespace owningNamespace) {
this.owningNamespace = owningNamespace;
}
diff --git a/app/org/omg/sysml/metamodel/impl/ModelQueryImpl.java b/app/org/omg/sysml/metamodel/impl/ElementFilterImpl.java
similarity index 62%
rename from app/org/omg/sysml/metamodel/impl/ModelQueryImpl.java
rename to app/org/omg/sysml/metamodel/impl/ElementFilterImpl.java
index 662b35d8..cff4025b 100644
--- a/app/org/omg/sysml/metamodel/impl/ModelQueryImpl.java
+++ b/app/org/omg/sysml/metamodel/impl/ElementFilterImpl.java
@@ -61,14 +61,14 @@
import java.util.Set;
import java.util.HashSet;
-@Entity(name = "ModelQueryImpl")
-@SecondaryTable(name = "ModelQuery")
-@org.hibernate.annotations.Table(appliesTo = "ModelQuery", fetch = FetchMode.SELECT, optional = false)
-// @info.archinnov.achilles.annotations.Table(table = "ModelQuery")
-@DiscriminatorValue(value = "ModelQuery")
-@JsonTypeName(value = "ModelQuery")
+@Entity(name = "ElementFilterImpl")
+@SecondaryTable(name = "ElementFilter")
+@org.hibernate.annotations.Table(appliesTo = "ElementFilter", fetch = FetchMode.SELECT, optional = false)
+// @info.archinnov.achilles.annotations.Table(table = "ElementFilter")
+@DiscriminatorValue(value = "ElementFilter")
+@JsonTypeName(value = "ElementFilter")
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME)
-public class ModelQueryImpl extends MofObjectImpl implements ModelQuery {
+public class ElementFilterImpl extends MofObjectImpl implements ElementFilter {
// @info.archinnov.achilles.annotations.Column("aliasId")
private Collection aliasId;
@@ -76,8 +76,8 @@ public class ModelQueryImpl extends MofObjectImpl implements ModelQuery {
@Lob
@org.hibernate.annotations.Type(type = "org.hibernate.type.TextType")
@ElementCollection(targetClass = String.class)
- @CollectionTable(name = "ModelQuery_aliasId",
- joinColumns = @JoinColumn(name = "ModelQueryId"))
+ @CollectionTable(name = "ElementFilter_aliasId",
+ joinColumns = @JoinColumn(name = "ElementFilterId"))
public Collection getAliasId() {
if (aliasId == null) {
aliasId = new ArrayList<>();
@@ -92,13 +92,32 @@ public void setAliasId(Collection aliasId) {
+ // @info.archinnov.achilles.annotations.Column("condition")
+ private MetadataCondition condition;
+
+ @JsonGetter
+ @JsonSerialize(using = MofObjectSerializer.class)
+ @Any(metaDef = "MetadataConditionMetaDef", metaColumn = @javax.persistence.Column(name = "conditionType"), fetch = FetchType.LAZY)
+ @JoinColumn(name = "conditionId", table = "ElementFilter")
+ public MetadataCondition getCondition() {
+ return condition;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = MetadataConditionImpl.class)
+ public void setCondition(MetadataCondition condition) {
+ this.condition = condition;
+ }
+
+
+
// @info.archinnov.achilles.annotations.Column("documentation")
private Collection documentation;
@JsonGetter
@JsonSerialize(contentUsing = MofObjectSerializer.class)
@ManyToAny(metaDef = "DocumentationMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
- @JoinTable(name = "ModelQuery_documentation",
+ @JoinTable(name = "ElementFilter_documentation",
joinColumns = @JoinColumn(name = "classId"),
inverseJoinColumns = @JoinColumn(name = "attributeId"))
public Collection getDocumentation() {
@@ -124,7 +143,7 @@ public void setDocumentation(Collection documentation) {
@JsonSerialize(contentUsing = MofObjectSerializer.class)
// @javax.persistence.Transient
@ManyToAny(metaDef = "CommentMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
- @JoinTable(name = "ModelQuery_documentationComment",
+ @JoinTable(name = "ElementFilter_documentationComment",
joinColumns = @JoinColumn(name = "classId"),
inverseJoinColumns = @JoinColumn(name = "attributeId"))
public Collection getDocumentationComment() {
@@ -142,13 +161,32 @@ public void setDocumentationComment(Collection documentationComment) {
+ // @info.archinnov.achilles.annotations.Column("filteredPackage")
+ private Package filteredPackage;
+
+ @JsonGetter
+ @JsonSerialize(using = MofObjectSerializer.class)
+ @Any(metaDef = "PackageMetaDef", metaColumn = @javax.persistence.Column(name = "filteredPackageType"), fetch = FetchType.LAZY)
+ @JoinColumn(name = "filteredPackageId", table = "ElementFilter")
+ public Package getFilteredPackage() {
+ return filteredPackage;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = PackageImpl.class)
+ public void setFilteredPackage(Package filteredPackage) {
+ this.filteredPackage = filteredPackage;
+ }
+
+
+
// @info.archinnov.achilles.annotations.Column("humanId")
private String humanId;
@JsonGetter
@Lob
@org.hibernate.annotations.Type(type = "org.hibernate.type.TextType")
- @javax.persistence.Column(name = "humanId", table = "ModelQuery")
+ @javax.persistence.Column(name = "humanId", table = "ElementFilter")
public String getHumanId() {
return humanId;
}
@@ -164,7 +202,7 @@ public void setHumanId(String humanId) {
private java.util.UUID identifier;
@JsonGetter
- @javax.persistence.Column(name = "identifier", table = "ModelQuery")
+ @javax.persistence.Column(name = "identifier", table = "ElementFilter")
public java.util.UUID getIdentifier() {
return identifier;
}
@@ -184,7 +222,7 @@ public void setIdentifier(java.util.UUID identifier) {
@Lob
@org.hibernate.annotations.Type(type = "org.hibernate.type.TextType")
// @javax.persistence.Transient
- @javax.persistence.Column(name = "name", table = "ModelQuery")
+ @javax.persistence.Column(name = "name", table = "ElementFilter")
public String getName() {
return name;
}
@@ -202,7 +240,7 @@ public void setName(String name) {
@JsonGetter
@JsonSerialize(contentUsing = MofObjectSerializer.class)
@ManyToAny(metaDef = "AnnotationMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
- @JoinTable(name = "ModelQuery_ownedAnnotation",
+ @JoinTable(name = "ElementFilter_ownedAnnotation",
joinColumns = @JoinColumn(name = "classId"),
inverseJoinColumns = @JoinColumn(name = "attributeId"))
public Collection getOwnedAnnotation() {
@@ -228,7 +266,7 @@ public void setOwnedAnnotation(Collection ownedAnnotation) {
@JsonSerialize(contentUsing = MofObjectSerializer.class)
// @javax.persistence.Transient
@ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
- @JoinTable(name = "ModelQuery_ownedElement",
+ @JoinTable(name = "ElementFilter_ownedElement",
joinColumns = @JoinColumn(name = "classId"),
inverseJoinColumns = @JoinColumn(name = "attributeId"))
public Collection getOwnedElement() {
@@ -246,13 +284,37 @@ public void setOwnedElement(Collection ownedElement) {
+ // @info.archinnov.achilles.annotations.Column("ownedRelatedElement")
+ private List ownedRelatedElement;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "ElementFilter_ownedRelatedElement",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public List getOwnedRelatedElement() {
+ if (ownedRelatedElement == null) {
+ ownedRelatedElement = new ArrayList<>();
+ }
+ return ownedRelatedElement;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = ElementImpl.class)
+ public void setOwnedRelatedElement(List ownedRelatedElement) {
+ this.ownedRelatedElement = ownedRelatedElement;
+ }
+
+
+
// @info.archinnov.achilles.annotations.Column("ownedRelationship")
private List ownedRelationship;
@JsonGetter
@JsonSerialize(contentUsing = MofObjectSerializer.class)
@ManyToAny(metaDef = "RelationshipMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
- @JoinTable(name = "ModelQuery_ownedRelationship",
+ @JoinTable(name = "ElementFilter_ownedRelationship",
joinColumns = @JoinColumn(name = "classId"),
inverseJoinColumns = @JoinColumn(name = "attributeId"))
public List getOwnedRelationship() {
@@ -278,7 +340,7 @@ public void setOwnedRelationship(List ownedRelationship) {
@JsonSerialize(contentUsing = MofObjectSerializer.class)
// @javax.persistence.Transient
@ManyToAny(metaDef = "TextualRepresentationMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
- @JoinTable(name = "ModelQuery_ownedTextualRepresentation",
+ @JoinTable(name = "ElementFilter_ownedTextualRepresentation",
joinColumns = @JoinColumn(name = "classId"),
inverseJoinColumns = @JoinColumn(name = "attributeId"))
public Collection getOwnedTextualRepresentation() {
@@ -304,7 +366,7 @@ public void setOwnedTextualRepresentation(Collection owne
@JsonSerialize(using = MofObjectSerializer.class)
// @javax.persistence.Transient
@Any(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "ownerType"), fetch = FetchType.LAZY)
- @JoinColumn(name = "ownerId", table = "ModelQuery")
+ @JoinColumn(name = "ownerId", table = "ElementFilter")
public Element getOwner() {
return owner;
}
@@ -323,7 +385,7 @@ public void setOwner(Element owner) {
@JsonGetter
@JsonSerialize(using = MofObjectSerializer.class)
@Any(metaDef = "MembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembershipType"), fetch = FetchType.LAZY)
- @JoinColumn(name = "owningMembershipId", table = "ModelQuery")
+ @JoinColumn(name = "owningMembershipId", table = "ElementFilter")
public Membership getOwningMembership() {
return owningMembership;
}
@@ -338,32 +400,51 @@ public void setOwningMembership(Membership owningMembership) {
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("owningNamespace")
- private Package owningNamespace;
+ private Namespace owningNamespace;
@JsonGetter
@JsonSerialize(using = MofObjectSerializer.class)
// @javax.persistence.Transient
- @Any(metaDef = "PackageMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
- @JoinColumn(name = "owningNamespaceId", table = "ModelQuery")
- public Package getOwningNamespace() {
+ @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
+ @JoinColumn(name = "owningNamespaceId", table = "ElementFilter")
+ public Namespace getOwningNamespace() {
return owningNamespace;
}
@JsonSetter
- @JsonDeserialize(using = MofObjectDeserializer.class, as = PackageImpl.class)
- public void setOwningNamespace(Package owningNamespace) {
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = NamespaceImpl.class)
+ public void setOwningNamespace(Namespace owningNamespace) {
this.owningNamespace = owningNamespace;
}
+ // @info.archinnov.achilles.annotations.Column("owningRelatedElement")
+ private Element owningRelatedElement;
+
+ @JsonGetter
+ @JsonSerialize(using = MofObjectSerializer.class)
+ @Any(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "owningRelatedElementType"), fetch = FetchType.LAZY)
+ @JoinColumn(name = "owningRelatedElementId", table = "ElementFilter")
+ public Element getOwningRelatedElement() {
+ return owningRelatedElement;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = ElementImpl.class)
+ public void setOwningRelatedElement(Element owningRelatedElement) {
+ this.owningRelatedElement = owningRelatedElement;
+ }
+
+
+
// @info.archinnov.achilles.annotations.Column("owningRelationship")
private Relationship owningRelationship;
@JsonGetter
@JsonSerialize(using = MofObjectSerializer.class)
@Any(metaDef = "RelationshipMetaDef", metaColumn = @javax.persistence.Column(name = "owningRelationshipType"), fetch = FetchType.LAZY)
- @JoinColumn(name = "owningRelationshipId", table = "ModelQuery")
+ @JoinColumn(name = "owningRelationshipId", table = "ElementFilter")
public Relationship getOwningRelationship() {
return owningRelationship;
}
@@ -376,4 +457,78 @@ public void setOwningRelationship(Relationship owningRelationship) {
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("relatedElement")
+ private List relatedElement;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "ElementFilter_relatedElement",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public List getRelatedElement() {
+ if (relatedElement == null) {
+ relatedElement = new ArrayList<>();
+ }
+ return relatedElement;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = ElementImpl.class)
+ public void setRelatedElement(List relatedElement) {
+ this.relatedElement = relatedElement;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Column("source")
+ private List source;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "ElementFilter_source",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public List getSource() {
+ if (source == null) {
+ source = new ArrayList<>();
+ }
+ return source;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = ElementImpl.class)
+ public void setSource(List source) {
+ this.source = source;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Column("target")
+ private List target;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "ElementFilter_target",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public List getTarget() {
+ if (target == null) {
+ target = new ArrayList<>();
+ }
+ return target;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = ElementImpl.class)
+ public void setTarget(List target) {
+ this.target = target;
+ }
+
+
+
}
diff --git a/app/org/omg/sysml/metamodel/impl/ElementImpl.java b/app/org/omg/sysml/metamodel/impl/ElementImpl.java
index ddb14895..ecc05bfe 100644
--- a/app/org/omg/sysml/metamodel/impl/ElementImpl.java
+++ b/app/org/omg/sysml/metamodel/impl/ElementImpl.java
@@ -338,20 +338,20 @@ public void setOwningMembership(Membership owningMembership) {
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("owningNamespace")
- private Package owningNamespace;
+ private Namespace owningNamespace;
@JsonGetter
@JsonSerialize(using = MofObjectSerializer.class)
// @javax.persistence.Transient
- @Any(metaDef = "PackageMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
+ @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
@JoinColumn(name = "owningNamespaceId", table = "Element")
- public Package getOwningNamespace() {
+ public Namespace getOwningNamespace() {
return owningNamespace;
}
@JsonSetter
- @JsonDeserialize(using = MofObjectDeserializer.class, as = PackageImpl.class)
- public void setOwningNamespace(Package owningNamespace) {
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = NamespaceImpl.class)
+ public void setOwningNamespace(Namespace owningNamespace) {
this.owningNamespace = owningNamespace;
}
diff --git a/app/org/omg/sysml/metamodel/impl/EndFeatureMembershipImpl.java b/app/org/omg/sysml/metamodel/impl/EndFeatureMembershipImpl.java
index a1c99ed9..3ee6e8be 100644
--- a/app/org/omg/sysml/metamodel/impl/EndFeatureMembershipImpl.java
+++ b/app/org/omg/sysml/metamodel/impl/EndFeatureMembershipImpl.java
@@ -368,21 +368,21 @@ public void setMemberName(String memberName) {
- // @info.archinnov.achilles.annotations.Column("membershipOwningPackage")
- private Package membershipOwningPackage;
+ // @info.archinnov.achilles.annotations.Column("membershipOwningNamespace")
+ private Namespace membershipOwningNamespace;
@JsonGetter
@JsonSerialize(using = MofObjectSerializer.class)
- @Any(metaDef = "PackageMetaDef", metaColumn = @javax.persistence.Column(name = "membershipOwningPackageType"), fetch = FetchType.LAZY)
- @JoinColumn(name = "membershipOwningPackageId", table = "EndFeatureMembership")
- public Package getMembershipOwningPackage() {
- return membershipOwningPackage;
+ @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "membershipOwningNamespaceType"), fetch = FetchType.LAZY)
+ @JoinColumn(name = "membershipOwningNamespaceId", table = "EndFeatureMembership")
+ public Namespace getMembershipOwningNamespace() {
+ return membershipOwningNamespace;
}
@JsonSetter
- @JsonDeserialize(using = MofObjectDeserializer.class, as = PackageImpl.class)
- public void setMembershipOwningPackage(Package membershipOwningPackage) {
- this.membershipOwningPackage = membershipOwningPackage;
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = NamespaceImpl.class)
+ public void setMembershipOwningNamespace(Namespace membershipOwningNamespace) {
+ this.membershipOwningNamespace = membershipOwningNamespace;
}
@@ -632,20 +632,20 @@ public void setOwningMembership(Membership owningMembership) {
// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("owningNamespace")
- private Package owningNamespace;
+ private Namespace owningNamespace;
@JsonGetter
@JsonSerialize(using = MofObjectSerializer.class)
// @javax.persistence.Transient
- @Any(metaDef = "PackageMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
+ @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY)
@JoinColumn(name = "owningNamespaceId", table = "EndFeatureMembership")
- public Package getOwningNamespace() {
+ public Namespace getOwningNamespace() {
return owningNamespace;
}
@JsonSetter
- @JsonDeserialize(using = MofObjectDeserializer.class, as = PackageImpl.class)
- public void setOwningNamespace(Package owningNamespace) {
+ @JsonDeserialize(using = MofObjectDeserializer.class, as = NamespaceImpl.class)
+ public void setOwningNamespace(Namespace owningNamespace) {
this.owningNamespace = owningNamespace;
}
diff --git a/app/org/omg/sysml/metamodel/impl/EnumerationDefinitionImpl.java b/app/org/omg/sysml/metamodel/impl/EnumerationDefinitionImpl.java
new file mode 100644
index 00000000..0745b6f1
--- /dev/null
+++ b/app/org/omg/sysml/metamodel/impl/EnumerationDefinitionImpl.java
@@ -0,0 +1,1649 @@
+/*
+ * 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 .
+ *
+ * @license LGPL-3.0-or-later
+ */
+
+package org.omg.sysml.metamodel.impl;
+
+import org.omg.sysml.metamodel.*;
+
+import org.omg.sysml.metamodel.Package;
+import org.omg.sysml.metamodel.Class;
+
+import jackson.MofObjectSerializer;
+import jackson.MofObjectDeserializer;
+
+import com.fasterxml.jackson.annotation.*;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+
+import org.hibernate.annotations.Any;
+import org.hibernate.annotations.ManyToAny;
+import org.hibernate.annotations.FetchMode;
+
+// import info.archinnov.achilles.annotations.UDT;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.EnumType;
+import javax.persistence.ElementCollection;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.PrimaryKeyJoinColumn;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.Lob;
+import javax.persistence.FetchType;
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Table;
+import javax.persistence.SecondaryTable;
+import javax.persistence.CollectionTable;
+
+import java.util.Collection;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.HashSet;
+
+@Entity(name = "EnumerationDefinitionImpl")
+@SecondaryTable(name = "EnumerationDefinition")
+@org.hibernate.annotations.Table(appliesTo = "EnumerationDefinition", fetch = FetchMode.SELECT, optional = false)
+// @info.archinnov.achilles.annotations.Table(table = "EnumerationDefinition")
+@DiscriminatorValue(value = "EnumerationDefinition")
+@JsonTypeName(value = "EnumerationDefinition")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME)
+public class EnumerationDefinitionImpl extends MofObjectImpl implements EnumerationDefinition {
+ // @info.archinnov.achilles.annotations.Column("aliasId")
+ private Collection aliasId;
+
+ @JsonGetter
+ @Lob
+ @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType")
+ @ElementCollection(targetClass = String.class)
+ @CollectionTable(name = "EnumerationDefinition_aliasId",
+ joinColumns = @JoinColumn(name = "EnumerationDefinitionId"))
+ public Collection getAliasId() {
+ if (aliasId == null) {
+ aliasId = new ArrayList<>();
+ }
+ return aliasId;
+ }
+
+ @JsonSetter
+ public void setAliasId(Collection aliasId) {
+ this.aliasId = aliasId;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Column("documentation")
+ private Collection documentation;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ @ManyToAny(metaDef = "DocumentationMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "EnumerationDefinition_documentation",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public Collection getDocumentation() {
+ if (documentation == null) {
+ documentation = new ArrayList<>();
+ }
+ return documentation;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = DocumentationImpl.class)
+ public void setDocumentation(Collection documentation) {
+ this.documentation = documentation;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("documentationComment")
+ private Collection documentationComment;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "CommentMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "EnumerationDefinition_documentationComment",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public Collection getDocumentationComment() {
+ if (documentationComment == null) {
+ documentationComment = new ArrayList<>();
+ }
+ return documentationComment;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = CommentImpl.class)
+ public void setDocumentationComment(Collection documentationComment) {
+ this.documentationComment = documentationComment;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("endFeature")
+ private Collection endFeature;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "EnumerationDefinition_endFeature",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public Collection getEndFeature() {
+ if (endFeature == null) {
+ endFeature = new ArrayList<>();
+ }
+ return endFeature;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = FeatureImpl.class)
+ public void setEndFeature(Collection endFeature) {
+ this.endFeature = endFeature;
+ }
+
+
+
+ // @info.archinnov.achilles.annotations.Transient
+ // @info.archinnov.achilles.annotations.Column("enumeratedValue")
+ private Collection enumeratedValue;
+
+ @JsonGetter
+ @JsonSerialize(contentUsing = MofObjectSerializer.class)
+ // @javax.persistence.Transient
+ @ManyToAny(metaDef = "EnumerationUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+ @JoinTable(name = "EnumerationDefinition_enumeratedValue",
+ joinColumns = @JoinColumn(name = "classId"),
+ inverseJoinColumns = @JoinColumn(name = "attributeId"))
+ public Collection getEnumeratedValue() {
+ if (enumeratedValue == null) {
+ enumeratedValue = new ArrayList<>();
+ }
+ return enumeratedValue;
+ }
+
+ @JsonSetter
+ @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = EnumerationUsageImpl.class)
+ public void setEnumeratedValue(Collection