Skip to content

Commit 85c6bb9

Browse files
ivan-gomesivan-gomes
committed
Merge branch 'release/2022-12'
2 parents 4961e98 + f21c867 commit 85c6bb9

703 files changed

Lines changed: 790952 additions & 761379 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/dao/impl/jpa/JpaDataDao.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ protected static <D extends Data> D resolve(D data, Class<D> clazz) {
7575
protected static List<Class<?>> SUPPORTED_PRIMITIVE_CONSTRAINT_CLASSES = Arrays.asList(
7676
Number.class,
7777
Boolean.class,
78-
String.class
78+
String.class,
79+
UUID.class
7980
);
8081

8182
@SuppressWarnings({"unchecked", "rawtypes"})
@@ -232,6 +233,10 @@ else if (constraint instanceof PrimitiveConstraint) {
232233
Object actualValue;
233234
Object constrainedValue;
234235
switch (primitiveConstraint.getProperty()) {
236+
case "@id":
237+
actualValue = data.getId();
238+
constrainedValue = JavaBeanHelper.convert(primitiveConstraint.getValue(), UUID.class);
239+
break;
235240
case "@type":
236241
try {
237242
Class<?> clazz = data instanceof HibernateProxy ?

‎app/javabean/JavaBeanHelper.java‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,12 @@
2424
import java.beans.*;
2525
import java.lang.reflect.InvocationTargetException;
2626
import java.lang.reflect.Method;
27-
import java.util.Arrays;
28-
import java.util.HashMap;
29-
import java.util.Map;
30-
import java.util.Objects;
27+
import java.util.*;
3128
import java.util.function.Function;
3229
import java.util.stream.Collectors;
3330

3431
public class JavaBeanHelper {
32+
3533
public static Map<String, PropertyDescriptor> getBeanProperties(Object bean) {
3634
try {
3735
return Arrays.stream(Introspector.getBeanInfo(bean.getClass(), Object.class).getPropertyDescriptors())
@@ -66,7 +64,16 @@ public static Map<Method, Method> getBeanGettersSetters(Object bean) {
6664
@SuppressWarnings("unchecked")
6765
public static <C> C convert(String text, Class<C> targetType) {
6866
PropertyEditor editor = PropertyEditorManager.findEditor(targetType);
67+
if (editor == null) {
68+
if (UUID.class.equals(targetType)) {
69+
PropertyEditorManager.registerEditor(UUID.class, UuidPropertyEditor.class);
70+
editor = PropertyEditorManager.findEditor(UUID.class);
71+
} else {
72+
return null;
73+
}
74+
}
6975
editor.setAsText(text);
7076
return (C) editor.getValue();
7177
}
78+
7279
}

‎app/javabean/UuidPropertyEditor.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package javabean;
2+
3+
import java.beans.PropertyEditorSupport;
4+
import java.util.UUID;
5+
6+
public class UuidPropertyEditor extends PropertyEditorSupport {
7+
8+
@Override
9+
public void setAsText(String text) throws IllegalArgumentException {
10+
setValue(UUID.fromString(text));
11+
}
12+
}

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,14 @@ public interface Element extends SysMLType {
4949

5050
List<? extends String> getAliasIds();
5151

52+
String getDeclaredShortName();
53+
54+
String getDeclaredName();
55+
5256
String getShortName();
5357

5458
String getName();
5559

56-
String getEffectiveName();
57-
5860
String getQualifiedName();
5961

6062
Boolean getIsImpliedIncluded();

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,6 @@
2828

2929
public interface EventOccurrenceUsage extends OccurrenceUsage, SysMLType {
3030
OccurrenceUsage getEventOccurrence();
31+
32+
Boolean getIsReference();
3133
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@
2727
import java.util.Set;
2828

2929
public interface LifeClass extends Class, SysMLType {
30-
30+
Boolean getIsSufficient();
3131
}

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

Lines changed: 40 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,42 @@ public void setChainingFeature(List<Feature> chainingFeature) {
171171

172172

173173

174+
// @info.archinnov.achilles.annotations.Column("declaredName")
175+
private String declaredName;
176+
177+
@JsonGetter
178+
@Lob
179+
@org.hibernate.annotations.Type(type = "org.hibernate.type.TextType")
180+
@javax.persistence.Column(name = "declaredName", table = "AcceptActionUsage")
181+
public String getDeclaredName() {
182+
return declaredName;
183+
}
184+
185+
@JsonSetter
186+
public void setDeclaredName(String declaredName) {
187+
this.declaredName = declaredName;
188+
}
189+
190+
191+
192+
// @info.archinnov.achilles.annotations.Column("declaredShortName")
193+
private String declaredShortName;
194+
195+
@JsonGetter
196+
@Lob
197+
@org.hibernate.annotations.Type(type = "org.hibernate.type.TextType")
198+
@javax.persistence.Column(name = "declaredShortName", table = "AcceptActionUsage")
199+
public String getDeclaredShortName() {
200+
return declaredShortName;
201+
}
202+
203+
@JsonSetter
204+
public void setDeclaredShortName(String declaredShortName) {
205+
this.declaredShortName = declaredShortName;
206+
}
207+
208+
209+
174210
// @info.archinnov.achilles.annotations.Transient
175211
// @info.archinnov.achilles.annotations.Column("definition")
176212
private List<Classifier> definition;
@@ -319,26 +355,6 @@ public void setDocumentation(List<Documentation> documentation) {
319355

320356

321357

322-
// @info.archinnov.achilles.annotations.Transient
323-
// @info.archinnov.achilles.annotations.Column("effectiveName")
324-
private String effectiveName;
325-
326-
@JsonGetter
327-
@Lob
328-
@org.hibernate.annotations.Type(type = "org.hibernate.type.TextType")
329-
// @javax.persistence.Transient
330-
@javax.persistence.Column(name = "effectiveName", table = "AcceptActionUsage")
331-
public String getEffectiveName() {
332-
return effectiveName;
333-
}
334-
335-
@JsonSetter
336-
public void setEffectiveName(String effectiveName) {
337-
this.effectiveName = effectiveName;
338-
}
339-
340-
341-
342358
// @info.archinnov.achilles.annotations.Column("elementId")
343359
private java.util.UUID elementId;
344360

@@ -950,12 +966,14 @@ public void setMultiplicity(Multiplicity multiplicity) {
950966

951967

952968

969+
// @info.archinnov.achilles.annotations.Transient
953970
// @info.archinnov.achilles.annotations.Column("name")
954971
private String name;
955972

956973
@JsonGetter
957974
@Lob
958975
@org.hibernate.annotations.Type(type = "org.hibernate.type.TextType")
976+
// @javax.persistence.Transient
959977
@javax.persistence.Column(name = "name", table = "AcceptActionUsage")
960978
public String getName() {
961979
return name;
@@ -2596,12 +2614,14 @@ public void setReceiverArgument(Expression receiverArgument) {
25962614

25972615

25982616

2617+
// @info.archinnov.achilles.annotations.Transient
25992618
// @info.archinnov.achilles.annotations.Column("shortName")
26002619
private String shortName;
26012620

26022621
@JsonGetter
26032622
@Lob
26042623
@org.hibernate.annotations.Type(type = "org.hibernate.type.TextType")
2624+
// @javax.persistence.Transient
26052625
@javax.persistence.Column(name = "shortName", table = "AcceptActionUsage")
26062626
public String getShortName() {
26072627
return shortName;

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

Lines changed: 40 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,42 @@ public void setAliasIds(List<String> aliasIds) {
119119

120120

121121

122+
// @info.archinnov.achilles.annotations.Column("declaredName")
123+
private String declaredName;
124+
125+
@JsonGetter
126+
@Lob
127+
@org.hibernate.annotations.Type(type = "org.hibernate.type.TextType")
128+
@javax.persistence.Column(name = "declaredName", table = "ActionDefinition")
129+
public String getDeclaredName() {
130+
return declaredName;
131+
}
132+
133+
@JsonSetter
134+
public void setDeclaredName(String declaredName) {
135+
this.declaredName = declaredName;
136+
}
137+
138+
139+
140+
// @info.archinnov.achilles.annotations.Column("declaredShortName")
141+
private String declaredShortName;
142+
143+
@JsonGetter
144+
@Lob
145+
@org.hibernate.annotations.Type(type = "org.hibernate.type.TextType")
146+
@javax.persistence.Column(name = "declaredShortName", table = "ActionDefinition")
147+
public String getDeclaredShortName() {
148+
return declaredShortName;
149+
}
150+
151+
@JsonSetter
152+
public void setDeclaredShortName(String declaredShortName) {
153+
this.declaredShortName = declaredShortName;
154+
}
155+
156+
157+
122158
// @info.archinnov.achilles.annotations.Transient
123159
// @info.archinnov.achilles.annotations.Column("differencingType")
124160
private List<Type> differencingType;
@@ -223,26 +259,6 @@ public void setDocumentation(List<Documentation> documentation) {
223259

224260

225261

226-
// @info.archinnov.achilles.annotations.Transient
227-
// @info.archinnov.achilles.annotations.Column("effectiveName")
228-
private String effectiveName;
229-
230-
@JsonGetter
231-
@Lob
232-
@org.hibernate.annotations.Type(type = "org.hibernate.type.TextType")
233-
// @javax.persistence.Transient
234-
@javax.persistence.Column(name = "effectiveName", table = "ActionDefinition")
235-
public String getEffectiveName() {
236-
return effectiveName;
237-
}
238-
239-
@JsonSetter
240-
public void setEffectiveName(String effectiveName) {
241-
this.effectiveName = effectiveName;
242-
}
243-
244-
245-
246262
// @info.archinnov.achilles.annotations.Column("elementId")
247263
private java.util.UUID elementId;
248264

@@ -677,12 +693,14 @@ public void setMultiplicity(Multiplicity multiplicity) {
677693

678694

679695

696+
// @info.archinnov.achilles.annotations.Transient
680697
// @info.archinnov.achilles.annotations.Column("name")
681698
private String name;
682699

683700
@JsonGetter
684701
@Lob
685702
@org.hibernate.annotations.Type(type = "org.hibernate.type.TextType")
703+
// @javax.persistence.Transient
686704
@javax.persistence.Column(name = "name", table = "ActionDefinition")
687705
public String getName() {
688706
return name;
@@ -1960,12 +1978,14 @@ public void setQualifiedName(String qualifiedName) {
19601978

19611979

19621980

1981+
// @info.archinnov.achilles.annotations.Transient
19631982
// @info.archinnov.achilles.annotations.Column("shortName")
19641983
private String shortName;
19651984

19661985
@JsonGetter
19671986
@Lob
19681987
@org.hibernate.annotations.Type(type = "org.hibernate.type.TextType")
1988+
// @javax.persistence.Transient
19691989
@javax.persistence.Column(name = "shortName", table = "ActionDefinition")
19701990
public String getShortName() {
19711991
return shortName;

0 commit comments

Comments
 (0)