Skip to content

Commit a7d118b

Browse files
ivan-gomesivan-gomes
committed
Merge branch 'release/2021-11'
2 parents 0e58481 + 52ea366 commit a7d118b

401 files changed

Lines changed: 5349 additions & 5344 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app/org/omg/sysml/metamodel/BindingConnectorAsUsage.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@
2525
import java.util.List;
2626
import java.util.Set;
2727

28-
public interface BindingConnectorAsUsage extends ConnectorAsUsage, BindingConnector, SysMLType {
28+
public interface BindingConnectorAsUsage extends BindingConnector, ConnectorAsUsage, SysMLType {
2929

3030
}

‎app/org/omg/sysml/metamodel/ConnectorAsUsage.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@
2525
import java.util.List;
2626
import java.util.Set;
2727

28-
public interface ConnectorAsUsage extends Connector, Usage, SysMLType {
28+
public interface ConnectorAsUsage extends Usage, Connector, SysMLType {
2929

3030
}

‎app/org/omg/sysml/metamodel/IncludeUseCaseUsage.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@
2525
import java.util.List;
2626
import java.util.Set;
2727

28-
public interface IncludeUseCaseUsage extends PerformActionUsage, UseCaseUsage, SysMLType {
28+
public interface IncludeUseCaseUsage extends UseCaseUsage, PerformActionUsage, SysMLType {
2929
UseCaseUsage getUseCaseIncluded();
3030
}

‎app/org/omg/sysml/metamodel/SuccessionAsUsage.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@
2525
import java.util.List;
2626
import java.util.Set;
2727

28-
public interface SuccessionAsUsage extends Succession, ConnectorAsUsage, SysMLType {
28+
public interface SuccessionAsUsage extends ConnectorAsUsage, Succession, SysMLType {
2929

3030
}

‎app/org/omg/sysml/metamodel/SuccessionFlowConnectionUsage.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@
2525
import java.util.List;
2626
import java.util.Set;
2727

28-
public interface SuccessionFlowConnectionUsage extends FlowConnectionUsage, SuccessionItemFlow, SysMLType {
28+
public interface SuccessionFlowConnectionUsage extends SuccessionItemFlow, FlowConnectionUsage, SysMLType {
2929

3030
}

‎app/org/omg/sysml/metamodel/Type.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@ public interface Type extends Namespace, SysMLType {
5858

5959
Multiplicity getMultiplicity();
6060

61-
Collection<? extends Type> getDisjointType();
62-
6361
List<? extends Feature> getDirectedFeature();
6462

6563
Collection<? extends Disjoining> getOwnedDisjoining();

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

Lines changed: 33 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -21,25 +21,45 @@
2121

2222
package org.omg.sysml.metamodel.impl;
2323

24-
import com.fasterxml.jackson.annotation.JsonGetter;
25-
import com.fasterxml.jackson.annotation.JsonSetter;
26-
import com.fasterxml.jackson.annotation.JsonTypeInfo;
27-
import com.fasterxml.jackson.annotation.JsonTypeName;
28-
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
29-
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
30-
import jackson.DataDeserializer;
31-
import jackson.DataSerializer;
24+
import org.omg.sysml.metamodel.*;
25+
26+
import org.omg.sysml.metamodel.Package;
27+
import org.omg.sysml.metamodel.Class;
28+
3229
import jackson.DataSerializer;
30+
import jackson.DataDeserializer;
31+
32+
import com.fasterxml.jackson.annotation.*;
33+
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
34+
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
35+
3336
import org.hibernate.annotations.Any;
34-
import org.hibernate.annotations.FetchMode;
3537
import org.hibernate.annotations.ManyToAny;
36-
import org.omg.sysml.metamodel.Class;
37-
import org.omg.sysml.metamodel.*;
38+
import org.hibernate.annotations.FetchMode;
39+
40+
// import info.archinnov.achilles.annotations.UDT;
41+
42+
import javax.persistence.Entity;
43+
import javax.persistence.Id;
44+
import javax.persistence.EnumType;
45+
import javax.persistence.ElementCollection;
46+
import javax.persistence.Inheritance;
47+
import javax.persistence.InheritanceType;
48+
import javax.persistence.PrimaryKeyJoinColumn;
49+
import javax.persistence.JoinColumn;
50+
import javax.persistence.JoinTable;
51+
import javax.persistence.Lob;
52+
import javax.persistence.FetchType;
53+
import javax.persistence.DiscriminatorValue;
54+
import javax.persistence.Table;
55+
import javax.persistence.SecondaryTable;
56+
import javax.persistence.CollectionTable;
3857

39-
import javax.persistence.*;
40-
import java.util.ArrayList;
4158
import java.util.Collection;
59+
import java.util.ArrayList;
4260
import java.util.List;
61+
import java.util.Set;
62+
import java.util.HashSet;
4363

4464
@Entity(name = "AcceptActionUsageImpl")
4565
@SecondaryTable(name = "AcceptActionUsage")
@@ -246,32 +266,6 @@ public void setDirection(FeatureDirectionKind direction) {
246266

247267

248268

249-
// @info.archinnov.achilles.annotations.Transient
250-
// @info.archinnov.achilles.annotations.Column("disjointType")
251-
private Collection<Type> disjointType;
252-
253-
@JsonGetter
254-
@JsonSerialize(contentUsing = DataSerializer.class)
255-
// @javax.persistence.Transient
256-
@ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
257-
@JoinTable(name = "AcceptActionUsage_disjointType",
258-
joinColumns = @JoinColumn(name = "classId"),
259-
inverseJoinColumns = @JoinColumn(name = "attributeId"))
260-
public Collection<Type> getDisjointType() {
261-
if (disjointType == null) {
262-
disjointType = new ArrayList<>();
263-
}
264-
return disjointType;
265-
}
266-
267-
@JsonSetter
268-
@JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class)
269-
public void setDisjointType(Collection<Type> disjointType) {
270-
this.disjointType = disjointType;
271-
}
272-
273-
274-
275269
// @info.archinnov.achilles.annotations.Transient
276270
// @info.archinnov.achilles.annotations.Column("documentation")
277271
private List<Documentation> documentation;

‎app/org/omg/sysml/metamodel/impl/ActionDefinitionImpl.java‎

Lines changed: 33 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,45 @@
2121

2222
package org.omg.sysml.metamodel.impl;
2323

24-
import com.fasterxml.jackson.annotation.JsonGetter;
25-
import com.fasterxml.jackson.annotation.JsonSetter;
26-
import com.fasterxml.jackson.annotation.JsonTypeInfo;
27-
import com.fasterxml.jackson.annotation.JsonTypeName;
28-
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
29-
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
30-
import jackson.DataDeserializer;
24+
import org.omg.sysml.metamodel.*;
25+
26+
import org.omg.sysml.metamodel.Package;
27+
import org.omg.sysml.metamodel.Class;
28+
3129
import jackson.DataSerializer;
30+
import jackson.DataDeserializer;
31+
32+
import com.fasterxml.jackson.annotation.*;
33+
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
34+
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
35+
3236
import org.hibernate.annotations.Any;
33-
import org.hibernate.annotations.FetchMode;
3437
import org.hibernate.annotations.ManyToAny;
35-
import org.omg.sysml.metamodel.*;
38+
import org.hibernate.annotations.FetchMode;
39+
40+
// import info.archinnov.achilles.annotations.UDT;
41+
42+
import javax.persistence.Entity;
43+
import javax.persistence.Id;
44+
import javax.persistence.EnumType;
45+
import javax.persistence.ElementCollection;
46+
import javax.persistence.Inheritance;
47+
import javax.persistence.InheritanceType;
48+
import javax.persistence.PrimaryKeyJoinColumn;
49+
import javax.persistence.JoinColumn;
50+
import javax.persistence.JoinTable;
51+
import javax.persistence.Lob;
52+
import javax.persistence.FetchType;
53+
import javax.persistence.DiscriminatorValue;
54+
import javax.persistence.Table;
55+
import javax.persistence.SecondaryTable;
56+
import javax.persistence.CollectionTable;
3657

37-
import javax.persistence.*;
38-
import java.util.ArrayList;
3958
import java.util.Collection;
59+
import java.util.ArrayList;
4060
import java.util.List;
61+
import java.util.Set;
62+
import java.util.HashSet;
4163

4264
@Entity(name = "ActionDefinitionImpl")
4365
@SecondaryTable(name = "ActionDefinition")
@@ -148,32 +170,6 @@ public void setDirectedUsage(List<Usage> directedUsage) {
148170

149171

150172

151-
// @info.archinnov.achilles.annotations.Transient
152-
// @info.archinnov.achilles.annotations.Column("disjointType")
153-
private Collection<Type> disjointType;
154-
155-
@JsonGetter
156-
@JsonSerialize(contentUsing = DataSerializer.class)
157-
// @javax.persistence.Transient
158-
@ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
159-
@JoinTable(name = "ActionDefinition_disjointType",
160-
joinColumns = @JoinColumn(name = "classId"),
161-
inverseJoinColumns = @JoinColumn(name = "attributeId"))
162-
public Collection<Type> getDisjointType() {
163-
if (disjointType == null) {
164-
disjointType = new ArrayList<>();
165-
}
166-
return disjointType;
167-
}
168-
169-
@JsonSetter
170-
@JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class)
171-
public void setDisjointType(Collection<Type> disjointType) {
172-
this.disjointType = disjointType;
173-
}
174-
175-
176-
177173
// @info.archinnov.achilles.annotations.Transient
178174
// @info.archinnov.achilles.annotations.Column("documentation")
179175
private List<Documentation> documentation;

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

Lines changed: 33 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,45 @@
2121

2222
package org.omg.sysml.metamodel.impl;
2323

24-
import com.fasterxml.jackson.annotation.JsonGetter;
25-
import com.fasterxml.jackson.annotation.JsonSetter;
26-
import com.fasterxml.jackson.annotation.JsonTypeInfo;
27-
import com.fasterxml.jackson.annotation.JsonTypeName;
28-
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
29-
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
30-
import jackson.DataDeserializer;
24+
import org.omg.sysml.metamodel.*;
25+
26+
import org.omg.sysml.metamodel.Package;
27+
import org.omg.sysml.metamodel.Class;
28+
3129
import jackson.DataSerializer;
30+
import jackson.DataDeserializer;
31+
32+
import com.fasterxml.jackson.annotation.*;
33+
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
34+
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
35+
3236
import org.hibernate.annotations.Any;
33-
import org.hibernate.annotations.FetchMode;
3437
import org.hibernate.annotations.ManyToAny;
35-
import org.omg.sysml.metamodel.Class;
36-
import org.omg.sysml.metamodel.*;
38+
import org.hibernate.annotations.FetchMode;
39+
40+
// import info.archinnov.achilles.annotations.UDT;
41+
42+
import javax.persistence.Entity;
43+
import javax.persistence.Id;
44+
import javax.persistence.EnumType;
45+
import javax.persistence.ElementCollection;
46+
import javax.persistence.Inheritance;
47+
import javax.persistence.InheritanceType;
48+
import javax.persistence.PrimaryKeyJoinColumn;
49+
import javax.persistence.JoinColumn;
50+
import javax.persistence.JoinTable;
51+
import javax.persistence.Lob;
52+
import javax.persistence.FetchType;
53+
import javax.persistence.DiscriminatorValue;
54+
import javax.persistence.Table;
55+
import javax.persistence.SecondaryTable;
56+
import javax.persistence.CollectionTable;
3757

38-
import javax.persistence.*;
39-
import java.util.ArrayList;
4058
import java.util.Collection;
59+
import java.util.ArrayList;
4160
import java.util.List;
61+
import java.util.Set;
62+
import java.util.HashSet;
4263

4364
@Entity(name = "ActionUsageImpl")
4465
@SecondaryTable(name = "ActionUsage")
@@ -245,32 +266,6 @@ public void setDirection(FeatureDirectionKind direction) {
245266

246267

247268

248-
// @info.archinnov.achilles.annotations.Transient
249-
// @info.archinnov.achilles.annotations.Column("disjointType")
250-
private Collection<Type> disjointType;
251-
252-
@JsonGetter
253-
@JsonSerialize(contentUsing = DataSerializer.class)
254-
// @javax.persistence.Transient
255-
@ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
256-
@JoinTable(name = "ActionUsage_disjointType",
257-
joinColumns = @JoinColumn(name = "classId"),
258-
inverseJoinColumns = @JoinColumn(name = "attributeId"))
259-
public Collection<Type> getDisjointType() {
260-
if (disjointType == null) {
261-
disjointType = new ArrayList<>();
262-
}
263-
return disjointType;
264-
}
265-
266-
@JsonSetter
267-
@JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class)
268-
public void setDisjointType(Collection<Type> disjointType) {
269-
this.disjointType = disjointType;
270-
}
271-
272-
273-
274269
// @info.archinnov.achilles.annotations.Transient
275270
// @info.archinnov.achilles.annotations.Column("documentation")
276271
private List<Documentation> documentation;

‎app/org/omg/sysml/metamodel/impl/ActorMembershipImpl.java‎

Lines changed: 33 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,45 @@
2121

2222
package org.omg.sysml.metamodel.impl;
2323

24-
import com.fasterxml.jackson.annotation.JsonGetter;
25-
import com.fasterxml.jackson.annotation.JsonSetter;
26-
import com.fasterxml.jackson.annotation.JsonTypeInfo;
27-
import com.fasterxml.jackson.annotation.JsonTypeName;
28-
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
29-
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
30-
import jackson.DataDeserializer;
24+
import org.omg.sysml.metamodel.*;
25+
26+
import org.omg.sysml.metamodel.Package;
27+
import org.omg.sysml.metamodel.Class;
28+
3129
import jackson.DataSerializer;
30+
import jackson.DataDeserializer;
31+
32+
import com.fasterxml.jackson.annotation.*;
33+
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
34+
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
35+
3236
import org.hibernate.annotations.Any;
33-
import org.hibernate.annotations.FetchMode;
3437
import org.hibernate.annotations.ManyToAny;
35-
import org.omg.sysml.metamodel.*;
38+
import org.hibernate.annotations.FetchMode;
39+
40+
// import info.archinnov.achilles.annotations.UDT;
41+
42+
import javax.persistence.Entity;
43+
import javax.persistence.Id;
44+
import javax.persistence.EnumType;
45+
import javax.persistence.ElementCollection;
46+
import javax.persistence.Inheritance;
47+
import javax.persistence.InheritanceType;
48+
import javax.persistence.PrimaryKeyJoinColumn;
49+
import javax.persistence.JoinColumn;
50+
import javax.persistence.JoinTable;
51+
import javax.persistence.Lob;
52+
import javax.persistence.FetchType;
53+
import javax.persistence.DiscriminatorValue;
54+
import javax.persistence.Table;
55+
import javax.persistence.SecondaryTable;
56+
import javax.persistence.CollectionTable;
3657

37-
import javax.persistence.*;
38-
import java.util.ArrayList;
3958
import java.util.Collection;
59+
import java.util.ArrayList;
4060
import java.util.List;
61+
import java.util.Set;
62+
import java.util.HashSet;
4163

4264
@Entity(name = "ActorMembershipImpl")
4365
@SecondaryTable(name = "ActorMembership")

0 commit comments

Comments
 (0)