diff --git a/app/org/omg/sysml/metamodel/AtomicInteraction.java b/app/org/omg/sysml/metamodel/AtomicInteraction.java deleted file mode 100644 index 7c43ee10..00000000 --- a/app/org/omg/sysml/metamodel/AtomicInteraction.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.omg.sysml.metamodel; - -import java.util.Collection; -import java.util.List; -import java.util.Set; - -public interface AtomicInteraction extends MofObject { - Collection getItemType(); -} \ No newline at end of file diff --git a/app/org/omg/sysml/metamodel/StateActionKind.java b/app/org/omg/sysml/metamodel/StateActionKind.java deleted file mode 100644 index 1bbd7420..00000000 --- a/app/org/omg/sysml/metamodel/StateActionKind.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.omg.sysml.metamodel; - -public enum StateActionKind { - ENTRY, - DO, - EXIT -} \ No newline at end of file diff --git a/app/org/omg/sysml/metamodel/StateActionMembership.java b/app/org/omg/sysml/metamodel/StateActionMembership.java deleted file mode 100644 index b7093cd9..00000000 --- a/app/org/omg/sysml/metamodel/StateActionMembership.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.omg.sysml.metamodel; - -import java.util.Collection; -import java.util.List; -import java.util.Set; - -public interface StateActionMembership extends FeatureMembership, MofObject { - StateActionKind getKind(); -} \ No newline at end of file diff --git a/app/org/omg/sysml/metamodel/impl/AtomicInteractionImpl.java b/app/org/omg/sysml/metamodel/impl/AtomicInteractionImpl.java deleted file mode 100644 index 5a94b461..00000000 --- a/app/org/omg/sysml/metamodel/impl/AtomicInteractionImpl.java +++ /dev/null @@ -1,75 +0,0 @@ -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 = "AtomicInteractionImpl") -@SecondaryTable(name = "AtomicInteraction") -@org.hibernate.annotations.Table(appliesTo = "AtomicInteraction", fetch = FetchMode.SELECT, optional = false) -// @info.archinnov.achilles.annotations.Table(table = "AtomicInteraction") -@DiscriminatorValue(value = "AtomicInteraction") -@JsonTypeName(value = "AtomicInteraction") -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME) -public class AtomicInteractionImpl extends MofObjectImpl implements AtomicInteraction { - // @info.archinnov.achilles.annotations.Column("itemType") - private Collection itemType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - @ManyToAny(metaDef = "ClassifierMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "AtomicInteraction_itemType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getItemType() { - if (itemType == null) { - itemType = new ArrayList<>(); - } - return itemType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = ClassifierImpl.class) - public void setItemType(Collection itemType) { - this.itemType = itemType; - } - - - -} diff --git a/app/org/omg/sysml/metamodel/impl/StateActionMembershipImpl.java b/app/org/omg/sysml/metamodel/impl/StateActionMembershipImpl.java deleted file mode 100644 index 828d9472..00000000 --- a/app/org/omg/sysml/metamodel/impl/StateActionMembershipImpl.java +++ /dev/null @@ -1,623 +0,0 @@ -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 = "StateActionMembershipImpl") -@SecondaryTable(name = "StateActionMembership") -@org.hibernate.annotations.Table(appliesTo = "StateActionMembership", fetch = FetchMode.SELECT, optional = false) -// @info.archinnov.achilles.annotations.Table(table = "StateActionMembership") -@DiscriminatorValue(value = "StateActionMembership") -@JsonTypeName(value = "StateActionMembership") -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME) -public class StateActionMembershipImpl extends MofObjectImpl implements StateActionMembership { - // @info.archinnov.achilles.annotations.Column("kind") - // @info.archinnov.achilles.annotations.Enumerated(info.archinnov.achilles.annotations.Enumerated.Encoding.NAME) - private StateActionKind kind; - - @JsonGetter - @javax.persistence.Enumerated(EnumType.STRING) - @javax.persistence.Column(name = "kind", table = "StateActionMembership") - public StateActionKind getKind() { - return kind; - } - - @JsonSetter - public void setKind(StateActionKind kind) { - this.kind = kind; - } - - - - // @info.archinnov.achilles.annotations.Column("owningType") - private Type owningType; - - @JsonGetter - @JsonSerialize(using = MofObjectSerializer.class) - @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "owningTypeType"), fetch = FetchType.LAZY) - @JoinColumn(name = "owningTypeId", table = "StateActionMembership") - 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.Column("isDerived") - private Boolean isDerived; - - @JsonGetter - @javax.persistence.Column(name = "isDerived", table = "StateActionMembership") - public Boolean getIsDerived() { - return isDerived; - } - - @JsonSetter - public void setIsDerived(Boolean isDerived) { - this.isDerived = isDerived; - } - - - - // @info.archinnov.achilles.annotations.Column("isReadOnly") - private Boolean isReadOnly; - - @JsonGetter - @javax.persistence.Column(name = "isReadOnly", table = "StateActionMembership") - public Boolean getIsReadOnly() { - return isReadOnly; - } - - @JsonSetter - public void setIsReadOnly(Boolean isReadOnly) { - this.isReadOnly = isReadOnly; - } - - - - // @info.archinnov.achilles.annotations.Column("memberFeature") - private Feature memberFeature; - - @JsonGetter - @JsonSerialize(using = MofObjectSerializer.class) - @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "memberFeatureType"), fetch = FetchType.LAZY) - @JoinColumn(name = "memberFeatureId", table = "StateActionMembership") - public Feature getMemberFeature() { - return memberFeature; - } - - @JsonSetter - @JsonDeserialize(using = MofObjectDeserializer.class, as = FeatureImpl.class) - public void setMemberFeature(Feature memberFeature) { - this.memberFeature = memberFeature; - } - - - - // @info.archinnov.achilles.annotations.Column("ownedMemberFeature") - private Feature ownedMemberFeature; - - @JsonGetter - @JsonSerialize(using = MofObjectSerializer.class) - @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "ownedMemberFeatureType"), fetch = FetchType.LAZY) - @JoinColumn(name = "ownedMemberFeatureId", table = "StateActionMembership") - public Feature getOwnedMemberFeature() { - return ownedMemberFeature; - } - - @JsonSetter - @JsonDeserialize(using = MofObjectDeserializer.class, as = FeatureImpl.class) - public void setOwnedMemberFeature(Feature ownedMemberFeature) { - this.ownedMemberFeature = ownedMemberFeature; - } - - - - // @info.archinnov.achilles.annotations.Column("isComposite") - private Boolean isComposite; - - @JsonGetter - @javax.persistence.Column(name = "isComposite", table = "StateActionMembership") - public Boolean getIsComposite() { - return isComposite; - } - - @JsonSetter - public void setIsComposite(Boolean isComposite) { - this.isComposite = isComposite; - } - - - - // @info.archinnov.achilles.annotations.Column("isPortion") - private Boolean isPortion; - - @JsonGetter - @javax.persistence.Column(name = "isPortion", table = "StateActionMembership") - public Boolean getIsPortion() { - return isPortion; - } - - @JsonSetter - public void setIsPortion(Boolean isPortion) { - this.isPortion = isPortion; - } - - - - // @info.archinnov.achilles.annotations.Column("isPort") - private Boolean isPort; - - @JsonGetter - @javax.persistence.Column(name = "isPort", table = "StateActionMembership") - public Boolean getIsPort() { - return isPort; - } - - @JsonSetter - public void setIsPort(Boolean isPort) { - this.isPort = isPort; - } - - - - // @info.archinnov.achilles.annotations.Column("direction") - // @info.archinnov.achilles.annotations.Enumerated(info.archinnov.achilles.annotations.Enumerated.Encoding.NAME) - private FeatureDirectionKind direction; - - @JsonGetter - @javax.persistence.Enumerated(EnumType.STRING) - @javax.persistence.Column(name = "direction", table = "StateActionMembership") - public FeatureDirectionKind getDirection() { - return direction; - } - - @JsonSetter - public void setDirection(FeatureDirectionKind direction) { - this.direction = direction; - } - - - - // @info.archinnov.achilles.annotations.Column("memberName") - private String memberName; - - @JsonGetter - @Lob - @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType") - @javax.persistence.Column(name = "memberName", table = "StateActionMembership") - public String getMemberName() { - return memberName; - } - - @JsonSetter - public void setMemberName(String memberName) { - this.memberName = memberName; - } - - - - // @info.archinnov.achilles.annotations.Column("visibility") - // @info.archinnov.achilles.annotations.Enumerated(info.archinnov.achilles.annotations.Enumerated.Encoding.NAME) - private VisibilityKind visibility; - - @JsonGetter - @javax.persistence.Enumerated(EnumType.STRING) - @javax.persistence.Column(name = "visibility", table = "StateActionMembership") - public VisibilityKind getVisibility() { - return visibility; - } - - @JsonSetter - public void setVisibility(VisibilityKind visibility) { - this.visibility = visibility; - } - - - - // @info.archinnov.achilles.annotations.Column("aliases") - private Collection aliases; - - @JsonGetter - @Lob - @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType") - @ElementCollection(targetClass = String.class) - @CollectionTable(name = "StateActionMembership_aliases", - joinColumns = @JoinColumn(name = "StateActionMembershipId")) - public Collection getAliases() { - if (aliases == null) { - aliases = new ArrayList<>(); - } - return aliases; - } - - @JsonSetter - public void setAliases(Collection aliases) { - this.aliases = aliases; - } - - - - // @info.archinnov.achilles.annotations.Column("memberElement") - private Element memberElement; - - @JsonGetter - @JsonSerialize(using = MofObjectSerializer.class) - @Any(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "memberElementType"), fetch = FetchType.LAZY) - @JoinColumn(name = "memberElementId", table = "StateActionMembership") - public Element getMemberElement() { - return memberElement; - } - - @JsonSetter - @JsonDeserialize(using = MofObjectDeserializer.class, as = ElementImpl.class) - public void setMemberElement(Element memberElement) { - this.memberElement = memberElement; - } - - - - // @info.archinnov.achilles.annotations.Column("ownedMemberElement") - private Element ownedMemberElement; - - @JsonGetter - @JsonSerialize(using = MofObjectSerializer.class) - @Any(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "ownedMemberElementType"), fetch = FetchType.LAZY) - @JoinColumn(name = "ownedMemberElementId", table = "StateActionMembership") - public Element getOwnedMemberElement() { - return ownedMemberElement; - } - - @JsonSetter - @JsonDeserialize(using = MofObjectDeserializer.class, as = ElementImpl.class) - public void setOwnedMemberElement(Element ownedMemberElement) { - this.ownedMemberElement = ownedMemberElement; - } - - - - // @info.archinnov.achilles.annotations.Column("membershipOwningPackage") - private Package membershipOwningPackage; - - @JsonGetter - @JsonSerialize(using = MofObjectSerializer.class) - @Any(metaDef = "PackageMetaDef", metaColumn = @javax.persistence.Column(name = "membershipOwningPackageType"), fetch = FetchType.LAZY) - @JoinColumn(name = "membershipOwningPackageId", table = "StateActionMembership") - public Package getMembershipOwningPackage() { - return membershipOwningPackage; - } - - @JsonSetter - @JsonDeserialize(using = MofObjectDeserializer.class, as = PackageImpl.class) - public void setMembershipOwningPackage(Package membershipOwningPackage) { - this.membershipOwningPackage = membershipOwningPackage; - } - - - - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("relatedElement") - private Collection relatedElement; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "StateActionMembership_relatedElement", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getRelatedElement() { - if (relatedElement == null) { - relatedElement = new ArrayList<>(); - } - return relatedElement; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = ElementImpl.class) - public void setRelatedElement(Collection relatedElement) { - this.relatedElement = relatedElement; - } - - - - // @info.archinnov.achilles.annotations.Column("target") - private Collection target; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "StateActionMembership_target", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getTarget() { - if (target == null) { - target = new ArrayList<>(); - } - return target; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = ElementImpl.class) - public void setTarget(Collection target) { - this.target = target; - } - - - - // @info.archinnov.achilles.annotations.Column("source") - private Collection source; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "StateActionMembership_source", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getSource() { - if (source == null) { - source = new ArrayList<>(); - } - return source; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = ElementImpl.class) - public void setSource(Collection source) { - this.source = source; - } - - - - // @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 = "StateActionMembership") - 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("ownedRelatedElement") - private Collection ownedRelatedElement; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "StateActionMembership_ownedRelatedElement", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedRelatedElement() { - if (ownedRelatedElement == null) { - ownedRelatedElement = new ArrayList<>(); - } - return ownedRelatedElement; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = ElementImpl.class) - public void setOwnedRelatedElement(Collection ownedRelatedElement) { - this.ownedRelatedElement = ownedRelatedElement; - } - - - - // @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 = "StateActionMembership") - 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.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 = "StateActionMembership") - 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.Column("identifier") - private java.util.UUID identifier; - - @JsonGetter - @javax.persistence.Column(name = "identifier", table = "StateActionMembership") - 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("owningNamespace") - private Package 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 = "StateActionMembership") - public Package getOwningNamespace() { - return owningNamespace; - } - - @JsonSetter - @JsonDeserialize(using = MofObjectDeserializer.class, as = PackageImpl.class) - public void setOwningNamespace(Package owningNamespace) { - this.owningNamespace = owningNamespace; - } - - - - // @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 = "StateActionMembership") - public String getName() { - return name; - } - - @JsonSetter - public void setName(String name) { - this.name = name; - } - - - - // @info.archinnov.achilles.annotations.Column("ownedRelationship") - private Collection ownedRelationship; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - @ManyToAny(metaDef = "RelationshipMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "StateActionMembership_ownedRelationship", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedRelationship() { - if (ownedRelationship == null) { - ownedRelationship = new ArrayList<>(); - } - return ownedRelationship; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = RelationshipImpl.class) - public void setOwnedRelationship(Collection ownedRelationship) { - this.ownedRelationship = ownedRelationship; - } - - - - // @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 = "StateActionMembership") - 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.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 = "StateActionMembership_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; - } - - - -} diff --git a/build.sbt b/build.sbt index f44c4541..826a817d 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,7 @@ name := """SysML-v2-API-Services""" organization := "org.omg" -version := "2020-03-p1" +version := "2020-04" javacOptions ++= Seq("-source", "11", "-target", "11", "-Xlint") diff --git a/conf/META-INF/persistence.xml b/conf/META-INF/persistence.xml index 808113dd..5f39c7b6 100644 --- a/conf/META-INF/persistence.xml +++ b/conf/META-INF/persistence.xml @@ -13,7 +13,6 @@ org.omg.sysml.metamodel.impl.AssertConstraintUsageImpl org.omg.sysml.metamodel.impl.AssociationBlockImpl org.omg.sysml.metamodel.impl.AssociationImpl - org.omg.sysml.metamodel.impl.AtomicInteractionImpl org.omg.sysml.metamodel.impl.BehaviorImpl org.omg.sysml.metamodel.impl.BindingConnectorImpl org.omg.sysml.metamodel.impl.BlockExpressionImpl @@ -102,7 +101,6 @@ org.omg.sysml.metamodel.impl.SequenceConstructionExpressionImpl org.omg.sysml.metamodel.impl.SnapshotFeatureImpl org.omg.sysml.metamodel.impl.SourceEndImpl - org.omg.sysml.metamodel.impl.StateActionMembershipImpl org.omg.sysml.metamodel.impl.StateDefinitionImpl org.omg.sysml.metamodel.impl.StateSubactionMembershipImpl org.omg.sysml.metamodel.impl.StateUsageImpl diff --git a/generated/org/omg/sysml/metamodel/impl/AtomicInteractionImpl_.java b/generated/org/omg/sysml/metamodel/impl/AtomicInteractionImpl_.java deleted file mode 100644 index 7fa5204a..00000000 --- a/generated/org/omg/sysml/metamodel/impl/AtomicInteractionImpl_.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.omg.sysml.metamodel.impl; - -import javax.annotation.processing.Generated; -import javax.persistence.metamodel.CollectionAttribute; -import javax.persistence.metamodel.StaticMetamodel; -import org.omg.sysml.metamodel.Classifier; - -@Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") -@StaticMetamodel(AtomicInteractionImpl.class) -public abstract class AtomicInteractionImpl_ extends org.omg.sysml.metamodel.impl.MofObjectImpl_ { - - public static volatile CollectionAttribute itemType; - - public static final String ITEM_TYPE = "itemType"; - -} - diff --git a/generated/org/omg/sysml/metamodel/impl/StateActionMembershipImpl_.java b/generated/org/omg/sysml/metamodel/impl/StateActionMembershipImpl_.java deleted file mode 100644 index b8d1e4ae..00000000 --- a/generated/org/omg/sysml/metamodel/impl/StateActionMembershipImpl_.java +++ /dev/null @@ -1,57 +0,0 @@ -package org.omg.sysml.metamodel.impl; - -import java.util.UUID; -import javax.annotation.processing.Generated; -import javax.persistence.metamodel.CollectionAttribute; -import javax.persistence.metamodel.SingularAttribute; -import javax.persistence.metamodel.StaticMetamodel; -import org.omg.sysml.metamodel.Element; -import org.omg.sysml.metamodel.FeatureDirectionKind; -import org.omg.sysml.metamodel.Relationship; -import org.omg.sysml.metamodel.StateActionKind; -import org.omg.sysml.metamodel.VisibilityKind; - -@Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") -@StaticMetamodel(StateActionMembershipImpl.class) -public abstract class StateActionMembershipImpl_ extends org.omg.sysml.metamodel.impl.MofObjectImpl_ { - - public static volatile SingularAttribute identifier; - public static volatile SingularAttribute isDerived; - public static volatile CollectionAttribute ownedElement; - public static volatile CollectionAttribute aliases; - public static volatile SingularAttribute visibility; - public static volatile SingularAttribute kind; - public static volatile CollectionAttribute ownedRelationship; - public static volatile SingularAttribute memberName; - public static volatile CollectionAttribute source; - public static volatile CollectionAttribute ownedRelatedElement; - public static volatile SingularAttribute isPortion; - public static volatile SingularAttribute isPort; - public static volatile CollectionAttribute target; - public static volatile SingularAttribute isReadOnly; - public static volatile SingularAttribute isComposite; - public static volatile CollectionAttribute relatedElement; - public static volatile SingularAttribute name; - public static volatile SingularAttribute direction; - - public static final String IDENTIFIER = "identifier"; - public static final String IS_DERIVED = "isDerived"; - public static final String OWNED_ELEMENT = "ownedElement"; - public static final String ALIASES = "aliases"; - public static final String VISIBILITY = "visibility"; - public static final String KIND = "kind"; - public static final String OWNED_RELATIONSHIP = "ownedRelationship"; - public static final String MEMBER_NAME = "memberName"; - public static final String SOURCE = "source"; - public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; - public static final String IS_PORTION = "isPortion"; - public static final String IS_PORT = "isPort"; - public static final String TARGET = "target"; - public static final String IS_READ_ONLY = "isReadOnly"; - public static final String IS_COMPOSITE = "isComposite"; - public static final String RELATED_ELEMENT = "relatedElement"; - public static final String NAME = "name"; - public static final String DIRECTION = "direction"; - -} -