Skip to content

Commit 26dbe5b

Browse files
ivan-gomesivan-gomes
committed
Merge branch 'release/2024-01'
2 parents 2487e7c + e9dd940 commit 26dbe5b

File tree

135 files changed

+861721
-863081
lines changed

Some content is hidden

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

135 files changed

+861721
-863081
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@
2727
import java.util.Set;
2828

2929
public interface AnnotatingElement extends Element, SysMLType {
30-
List<? extends Annotation> getAnnotation();
31-
3230
List<? extends Element> getAnnotatedElement();
31+
32+
Collection<? extends Annotation> getOwnedAnnotatingRelationship();
33+
34+
List<? extends Annotation> getAnnotation();
3335
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,6 @@ public interface Annotation extends Relationship, SysMLType {
3232
Element getAnnotatedElement();
3333

3434
Element getOwningAnnotatedElement();
35+
36+
AnnotatingElement getOwningAnnotatingElement();
3537
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ public interface Connector extends Feature, Relationship, SysMLType {
3131

3232
List<? extends Association> getAssociation();
3333

34-
Boolean getIsDirected();
35-
3634
List<? extends Feature> getConnectorEnd();
3735

3836
Feature getSourceFeature();

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -765,22 +765,6 @@ public void setIsDerived(Boolean isDerived) {
765765

766766

767767

768-
// @info.archinnov.achilles.annotations.Column("isDirected")
769-
private Boolean isDirected;
770-
771-
@JsonGetter
772-
@javax.persistence.Column(name = "isDirected", table = "AllocationUsage")
773-
public Boolean getIsDirected() {
774-
return isDirected;
775-
}
776-
777-
@JsonSetter
778-
public void setIsDirected(Boolean isDirected) {
779-
this.isDirected = isDirected;
780-
}
781-
782-
783-
784768
// @info.archinnov.achilles.annotations.Column("isEnd")
785769
private Boolean isEnd;
786770

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

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,32 @@ public void setName(String name) {
275275

276276

277277

278+
// @info.archinnov.achilles.annotations.Transient
279+
// @info.archinnov.achilles.annotations.Column("ownedAnnotatingRelationship")
280+
private Collection<Annotation> ownedAnnotatingRelationship;
281+
282+
@JsonGetter
283+
@JsonSerialize(contentUsing = DataSerializer.class)
284+
// @javax.persistence.Transient
285+
@ManyToAny(metaDef = "AnnotationMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY)
286+
@JoinTable(name = "AnnotatingElement_ownedAnnotatingRelationship",
287+
joinColumns = @JoinColumn(name = "class_id"),
288+
inverseJoinColumns = @JoinColumn(name = "attribute_id"))
289+
public Collection<Annotation> getOwnedAnnotatingRelationship() {
290+
if (ownedAnnotatingRelationship == null) {
291+
ownedAnnotatingRelationship = new ArrayList<>();
292+
}
293+
return ownedAnnotatingRelationship;
294+
}
295+
296+
@JsonSetter
297+
@JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = AnnotationImpl.class)
298+
public void setOwnedAnnotatingRelationship(Collection<Annotation> ownedAnnotatingRelationship) {
299+
this.ownedAnnotatingRelationship = ownedAnnotatingRelationship;
300+
}
301+
302+
303+
278304
// @info.archinnov.achilles.annotations.Transient
279305
// @info.archinnov.achilles.annotations.Column("ownedAnnotation")
280306
private List<Annotation> ownedAnnotation;

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -421,6 +421,27 @@ public void setOwningAnnotatedElement(Element owningAnnotatedElement) {
421421

422422

423423

424+
// @info.archinnov.achilles.annotations.Transient
425+
// @info.archinnov.achilles.annotations.Column("owningAnnotatingElement")
426+
private AnnotatingElement owningAnnotatingElement;
427+
428+
@JsonGetter
429+
@JsonSerialize(using = DataSerializer.class)
430+
// @javax.persistence.Transient
431+
@Any(metaDef = "AnnotatingElementMetaDef", metaColumn = @javax.persistence.Column(name = "owningAnnotatingElement_type"), fetch = FetchType.LAZY)
432+
@JoinColumn(name = "owningAnnotatingElement_id", table = "Annotation")
433+
public AnnotatingElement getOwningAnnotatingElement() {
434+
return owningAnnotatingElement;
435+
}
436+
437+
@JsonSetter
438+
@JsonDeserialize(using = DataDeserializer.class, as = AnnotatingElementImpl.class)
439+
public void setOwningAnnotatingElement(AnnotatingElement owningAnnotatingElement) {
440+
this.owningAnnotatingElement = owningAnnotatingElement;
441+
}
442+
443+
444+
424445
// @info.archinnov.achilles.annotations.Transient
425446
// @info.archinnov.achilles.annotations.Column("owningMembership")
426447
private OwningMembership owningMembership;

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -692,22 +692,6 @@ public void setIsDerived(Boolean isDerived) {
692692

693693

694694

695-
// @info.archinnov.achilles.annotations.Column("isDirected")
696-
private Boolean isDirected;
697-
698-
@JsonGetter
699-
@javax.persistence.Column(name = "isDirected", table = "BindingConnectorAsUsage")
700-
public Boolean getIsDirected() {
701-
return isDirected;
702-
}
703-
704-
@JsonSetter
705-
public void setIsDirected(Boolean isDirected) {
706-
this.isDirected = isDirected;
707-
}
708-
709-
710-
711695
// @info.archinnov.achilles.annotations.Column("isEnd")
712696
private Boolean isEnd;
713697

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -640,22 +640,6 @@ public void setIsDerived(Boolean isDerived) {
640640

641641

642642

643-
// @info.archinnov.achilles.annotations.Column("isDirected")
644-
private Boolean isDirected;
645-
646-
@JsonGetter
647-
@javax.persistence.Column(name = "isDirected", table = "BindingConnector")
648-
public Boolean getIsDirected() {
649-
return isDirected;
650-
}
651-
652-
@JsonSetter
653-
public void setIsDirected(Boolean isDirected) {
654-
this.isDirected = isDirected;
655-
}
656-
657-
658-
659643
// @info.archinnov.achilles.annotations.Column("isEnd")
660644
private Boolean isEnd;
661645

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

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,32 @@ public void setName(String name) {
311311

312312

313313

314+
// @info.archinnov.achilles.annotations.Transient
315+
// @info.archinnov.achilles.annotations.Column("ownedAnnotatingRelationship")
316+
private Collection<Annotation> ownedAnnotatingRelationship;
317+
318+
@JsonGetter
319+
@JsonSerialize(contentUsing = DataSerializer.class)
320+
// @javax.persistence.Transient
321+
@ManyToAny(metaDef = "AnnotationMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY)
322+
@JoinTable(name = "Comment_ownedAnnotatingRelationship",
323+
joinColumns = @JoinColumn(name = "class_id"),
324+
inverseJoinColumns = @JoinColumn(name = "attribute_id"))
325+
public Collection<Annotation> getOwnedAnnotatingRelationship() {
326+
if (ownedAnnotatingRelationship == null) {
327+
ownedAnnotatingRelationship = new ArrayList<>();
328+
}
329+
return ownedAnnotatingRelationship;
330+
}
331+
332+
@JsonSetter
333+
@JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = AnnotationImpl.class)
334+
public void setOwnedAnnotatingRelationship(Collection<Annotation> ownedAnnotatingRelationship) {
335+
this.ownedAnnotatingRelationship = ownedAnnotatingRelationship;
336+
}
337+
338+
339+
314340
// @info.archinnov.achilles.annotations.Transient
315341
// @info.archinnov.achilles.annotations.Column("ownedAnnotation")
316342
private List<Annotation> ownedAnnotation;

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -739,22 +739,6 @@ public void setIsDerived(Boolean isDerived) {
739739

740740

741741

742-
// @info.archinnov.achilles.annotations.Column("isDirected")
743-
private Boolean isDirected;
744-
745-
@JsonGetter
746-
@javax.persistence.Column(name = "isDirected", table = "ConnectionUsage")
747-
public Boolean getIsDirected() {
748-
return isDirected;
749-
}
750-
751-
@JsonSetter
752-
public void setIsDirected(Boolean isDirected) {
753-
this.isDirected = isDirected;
754-
}
755-
756-
757-
758742
// @info.archinnov.achilles.annotations.Column("isEnd")
759743
private Boolean isEnd;
760744

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -692,22 +692,6 @@ public void setIsDerived(Boolean isDerived) {
692692

693693

694694

695-
// @info.archinnov.achilles.annotations.Column("isDirected")
696-
private Boolean isDirected;
697-
698-
@JsonGetter
699-
@javax.persistence.Column(name = "isDirected", table = "ConnectorAsUsage")
700-
public Boolean getIsDirected() {
701-
return isDirected;
702-
}
703-
704-
@JsonSetter
705-
public void setIsDirected(Boolean isDirected) {
706-
this.isDirected = isDirected;
707-
}
708-
709-
710-
711695
// @info.archinnov.achilles.annotations.Column("isEnd")
712696
private Boolean isEnd;
713697

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -640,22 +640,6 @@ public void setIsDerived(Boolean isDerived) {
640640

641641

642642

643-
// @info.archinnov.achilles.annotations.Column("isDirected")
644-
private Boolean isDirected;
645-
646-
@JsonGetter
647-
@javax.persistence.Column(name = "isDirected", table = "Connector")
648-
public Boolean getIsDirected() {
649-
return isDirected;
650-
}
651-
652-
@JsonSetter
653-
public void setIsDirected(Boolean isDirected) {
654-
this.isDirected = isDirected;
655-
}
656-
657-
658-
659643
// @info.archinnov.achilles.annotations.Column("isEnd")
660644
private Boolean isEnd;
661645

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

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,32 @@ public void setName(String name) {
332332

333333

334334

335+
// @info.archinnov.achilles.annotations.Transient
336+
// @info.archinnov.achilles.annotations.Column("ownedAnnotatingRelationship")
337+
private Collection<Annotation> ownedAnnotatingRelationship;
338+
339+
@JsonGetter
340+
@JsonSerialize(contentUsing = DataSerializer.class)
341+
// @javax.persistence.Transient
342+
@ManyToAny(metaDef = "AnnotationMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY)
343+
@JoinTable(name = "Documentation_ownedAnnotatingRelationship",
344+
joinColumns = @JoinColumn(name = "class_id"),
345+
inverseJoinColumns = @JoinColumn(name = "attribute_id"))
346+
public Collection<Annotation> getOwnedAnnotatingRelationship() {
347+
if (ownedAnnotatingRelationship == null) {
348+
ownedAnnotatingRelationship = new ArrayList<>();
349+
}
350+
return ownedAnnotatingRelationship;
351+
}
352+
353+
@JsonSetter
354+
@JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = AnnotationImpl.class)
355+
public void setOwnedAnnotatingRelationship(Collection<Annotation> ownedAnnotatingRelationship) {
356+
this.ownedAnnotatingRelationship = ownedAnnotatingRelationship;
357+
}
358+
359+
360+
335361
// @info.archinnov.achilles.annotations.Transient
336362
// @info.archinnov.achilles.annotations.Column("ownedAnnotation")
337363
private List<Annotation> ownedAnnotation;

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -843,22 +843,6 @@ public void setIsDerived(Boolean isDerived) {
843843

844844

845845

846-
// @info.archinnov.achilles.annotations.Column("isDirected")
847-
private Boolean isDirected;
848-
849-
@JsonGetter
850-
@javax.persistence.Column(name = "isDirected", table = "FlowConnectionUsage")
851-
public Boolean getIsDirected() {
852-
return isDirected;
853-
}
854-
855-
@JsonSetter
856-
public void setIsDirected(Boolean isDirected) {
857-
this.isDirected = isDirected;
858-
}
859-
860-
861-
862846
// @info.archinnov.achilles.annotations.Column("isEnd")
863847
private Boolean isEnd;
864848

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -765,22 +765,6 @@ public void setIsDerived(Boolean isDerived) {
765765

766766

767767

768-
// @info.archinnov.achilles.annotations.Column("isDirected")
769-
private Boolean isDirected;
770-
771-
@JsonGetter
772-
@javax.persistence.Column(name = "isDirected", table = "InterfaceUsage")
773-
public Boolean getIsDirected() {
774-
return isDirected;
775-
}
776-
777-
@JsonSetter
778-
public void setIsDirected(Boolean isDirected) {
779-
this.isDirected = isDirected;
780-
}
781-
782-
783-
784768
// @info.archinnov.achilles.annotations.Column("isEnd")
785769
private Boolean isEnd;
786770

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -692,22 +692,6 @@ public void setIsDerived(Boolean isDerived) {
692692

693693

694694

695-
// @info.archinnov.achilles.annotations.Column("isDirected")
696-
private Boolean isDirected;
697-
698-
@JsonGetter
699-
@javax.persistence.Column(name = "isDirected", table = "ItemFlow")
700-
public Boolean getIsDirected() {
701-
return isDirected;
702-
}
703-
704-
@JsonSetter
705-
public void setIsDirected(Boolean isDirected) {
706-
this.isDirected = isDirected;
707-
}
708-
709-
710-
711695
// @info.archinnov.achilles.annotations.Column("isEnd")
712696
private Boolean isEnd;
713697

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

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -908,6 +908,32 @@ public void setOutput(List<Feature> output) {
908908

909909

910910

911+
// @info.archinnov.achilles.annotations.Transient
912+
// @info.archinnov.achilles.annotations.Column("ownedAnnotatingRelationship")
913+
private Collection<Annotation> ownedAnnotatingRelationship;
914+
915+
@JsonGetter
916+
@JsonSerialize(contentUsing = DataSerializer.class)
917+
// @javax.persistence.Transient
918+
@ManyToAny(metaDef = "AnnotationMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY)
919+
@JoinTable(name = "MetadataFeature_ownedAnnotatingRelationship",
920+
joinColumns = @JoinColumn(name = "class_id"),
921+
inverseJoinColumns = @JoinColumn(name = "attribute_id"))
922+
public Collection<Annotation> getOwnedAnnotatingRelationship() {
923+
if (ownedAnnotatingRelationship == null) {
924+
ownedAnnotatingRelationship = new ArrayList<>();
925+
}
926+
return ownedAnnotatingRelationship;
927+
}
928+
929+
@JsonSetter
930+
@JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = AnnotationImpl.class)
931+
public void setOwnedAnnotatingRelationship(Collection<Annotation> ownedAnnotatingRelationship) {
932+
this.ownedAnnotatingRelationship = ownedAnnotatingRelationship;
933+
}
934+
935+
936+
911937
// @info.archinnov.achilles.annotations.Transient
912938
// @info.archinnov.achilles.annotations.Column("ownedAnnotation")
913939
private List<Annotation> ownedAnnotation;

0 commit comments

Comments
 (0)