Merge branch 'release/2022-12'

Systems-Modeling · Jan 19, 2023 · 85c6bb9 · 85c6bb9
2 parents 4961e98 + f21c867
commit 85c6bb9
Show file tree

Hide file tree

Showing 703 changed files with 790,952 additions and 761,379 deletions.
diff --git a/app/dao/impl/jpa/JpaDataDao.java b/app/dao/impl/jpa/JpaDataDao.java
@@ -75,7 +75,8 @@ protected static <D extends Data> D resolve(D data, Class<D> clazz) {
     protected static List<Class<?>> SUPPORTED_PRIMITIVE_CONSTRAINT_CLASSES = Arrays.asList(
             Number.class,
             Boolean.class,
-            String.class
+            String.class,
+            UUID.class
     );
 
     @SuppressWarnings({"unchecked", "rawtypes"})
@@ -232,6 +233,10 @@ else if (constraint instanceof PrimitiveConstraint) {
                 Object actualValue;
                 Object constrainedValue;
                 switch (primitiveConstraint.getProperty()) {
+                    case "@id":
+                        actualValue = data.getId();
+                        constrainedValue = JavaBeanHelper.convert(primitiveConstraint.getValue(), UUID.class);
+                        break;
                     case "@type":
                         try {
                             Class<?> clazz = data instanceof HibernateProxy ?

diff --git a/app/javabean/JavaBeanHelper.java b/app/javabean/JavaBeanHelper.java
@@ -24,14 +24,12 @@
 import java.beans.*;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
 public class JavaBeanHelper {
+
     public static Map<String, PropertyDescriptor> getBeanProperties(Object bean) {
         try {
             return Arrays.stream(Introspector.getBeanInfo(bean.getClass(), Object.class).getPropertyDescriptors())
@@ -66,7 +64,16 @@ public static Map<Method, Method> getBeanGettersSetters(Object bean) {
     @SuppressWarnings("unchecked")
     public static <C> C convert(String text, Class<C> targetType) {
         PropertyEditor editor = PropertyEditorManager.findEditor(targetType);
+        if (editor == null) {
+            if (UUID.class.equals(targetType)) {
+                PropertyEditorManager.registerEditor(UUID.class, UuidPropertyEditor.class);
+                editor = PropertyEditorManager.findEditor(UUID.class);
+            } else {
+                return null;
+            }
+        }
         editor.setAsText(text);
         return (C) editor.getValue();
     }
+
 }
diff --git a/app/javabean/UuidPropertyEditor.java b/app/javabean/UuidPropertyEditor.java
@@ -0,0 +1,12 @@
+package javabean;
+
+import java.beans.PropertyEditorSupport;
+import java.util.UUID;
+
+public class UuidPropertyEditor extends PropertyEditorSupport {
+
+    @Override
+    public void setAsText(String text) throws IllegalArgumentException {
+        setValue(UUID.fromString(text));
+    }
+}
diff --git a/app/org/omg/sysml/metamodel/Element.java b/app/org/omg/sysml/metamodel/Element.java
@@ -49,12 +49,14 @@ public interface Element extends SysMLType {
 
     List<? extends String> getAliasIds();
 
+    String getDeclaredShortName();
+
+    String getDeclaredName();
+
     String getShortName();
 
     String getName();
 
-    String getEffectiveName();
-
     String getQualifiedName();
 
     Boolean getIsImpliedIncluded();

diff --git a/app/org/omg/sysml/metamodel/EventOccurrenceUsage.java b/app/org/omg/sysml/metamodel/EventOccurrenceUsage.java
@@ -28,4 +28,6 @@
 
 public interface EventOccurrenceUsage extends OccurrenceUsage, SysMLType {
     OccurrenceUsage getEventOccurrence();
+
+    Boolean getIsReference();
 }
diff --git a/app/org/omg/sysml/metamodel/LifeClass.java b/app/org/omg/sysml/metamodel/LifeClass.java
@@ -27,5 +27,5 @@
 import java.util.Set;
 
 public interface LifeClass extends Class, SysMLType {
-
+    Boolean getIsSufficient();
 }
diff --git a/app/org/omg/sysml/metamodel/impl/AcceptActionUsageImpl.java b/app/org/omg/sysml/metamodel/impl/AcceptActionUsageImpl.java
@@ -171,6 +171,42 @@ public void setChainingFeature(List<Feature> chainingFeature) {
 
 
 
+    // @info.archinnov.achilles.annotations.Column("declaredName")
+    private String declaredName;
+
+    @JsonGetter
+    @Lob
+    @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType")
+    @javax.persistence.Column(name = "declaredName", table = "AcceptActionUsage")
+    public String getDeclaredName() {
+        return declaredName;
+    }
+
+    @JsonSetter
+    public void setDeclaredName(String declaredName) {
+        this.declaredName = declaredName;
+    }
+
+
+
+    // @info.archinnov.achilles.annotations.Column("declaredShortName")
+    private String declaredShortName;
+
+    @JsonGetter
+    @Lob
+    @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType")
+    @javax.persistence.Column(name = "declaredShortName", table = "AcceptActionUsage")
+    public String getDeclaredShortName() {
+        return declaredShortName;
+    }
+
+    @JsonSetter
+    public void setDeclaredShortName(String declaredShortName) {
+        this.declaredShortName = declaredShortName;
+    }
+
+
+
     // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("definition")
     private List<Classifier> definition;
@@ -319,26 +355,6 @@ public void setDocumentation(List<Documentation> documentation) {
 
 
 
-    // @info.archinnov.achilles.annotations.Transient
-    // @info.archinnov.achilles.annotations.Column("effectiveName")
-    private String effectiveName;
-
-    @JsonGetter
-    @Lob
-    @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType")
-    // @javax.persistence.Transient
-    @javax.persistence.Column(name = "effectiveName", table = "AcceptActionUsage")
-    public String getEffectiveName() {
-        return effectiveName;
-    }
-
-    @JsonSetter
-    public void setEffectiveName(String effectiveName) {
-        this.effectiveName = effectiveName;
-    }
-
-
-
     // @info.archinnov.achilles.annotations.Column("elementId")
     private java.util.UUID elementId;
 
@@ -950,12 +966,14 @@ public void setMultiplicity(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 = "AcceptActionUsage")
     public String getName() {
         return name;
@@ -2596,12 +2614,14 @@ public void setReceiverArgument(Expression receiverArgument) {
 
 
 
+    // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("shortName")
     private String shortName;
 
     @JsonGetter
     @Lob
     @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType")
+    // @javax.persistence.Transient
     @javax.persistence.Column(name = "shortName", table = "AcceptActionUsage")
     public String getShortName() {
         return shortName;

diff --git a/app/org/omg/sysml/metamodel/impl/ActionDefinitionImpl.java b/app/org/omg/sysml/metamodel/impl/ActionDefinitionImpl.java
@@ -119,6 +119,42 @@ public void setAliasIds(List<String> aliasIds) {
 
 
 
+    // @info.archinnov.achilles.annotations.Column("declaredName")
+    private String declaredName;
+
+    @JsonGetter
+    @Lob
+    @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType")
+    @javax.persistence.Column(name = "declaredName", table = "ActionDefinition")
+    public String getDeclaredName() {
+        return declaredName;
+    }
+
+    @JsonSetter
+    public void setDeclaredName(String declaredName) {
+        this.declaredName = declaredName;
+    }
+
+
+
+    // @info.archinnov.achilles.annotations.Column("declaredShortName")
+    private String declaredShortName;
+
+    @JsonGetter
+    @Lob
+    @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType")
+    @javax.persistence.Column(name = "declaredShortName", table = "ActionDefinition")
+    public String getDeclaredShortName() {
+        return declaredShortName;
+    }
+
+    @JsonSetter
+    public void setDeclaredShortName(String declaredShortName) {
+        this.declaredShortName = declaredShortName;
+    }
+
+
+
     // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("differencingType")
     private List<Type> differencingType;
@@ -223,26 +259,6 @@ public void setDocumentation(List<Documentation> documentation) {
 
 
 
-    // @info.archinnov.achilles.annotations.Transient
-    // @info.archinnov.achilles.annotations.Column("effectiveName")
-    private String effectiveName;
-
-    @JsonGetter
-    @Lob
-    @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType")
-    // @javax.persistence.Transient
-    @javax.persistence.Column(name = "effectiveName", table = "ActionDefinition")
-    public String getEffectiveName() {
-        return effectiveName;
-    }
-
-    @JsonSetter
-    public void setEffectiveName(String effectiveName) {
-        this.effectiveName = effectiveName;
-    }
-
-
-
     // @info.archinnov.achilles.annotations.Column("elementId")
     private java.util.UUID elementId;
 
@@ -677,12 +693,14 @@ public void setMultiplicity(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 = "ActionDefinition")
     public String getName() {
         return name;
@@ -1960,12 +1978,14 @@ public void setQualifiedName(String qualifiedName) {
 
 
 
+    // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("shortName")
     private String shortName;
 
     @JsonGetter
     @Lob
     @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType")
+    // @javax.persistence.Transient
     @javax.persistence.Column(name = "shortName", table = "ActionDefinition")
     public String getShortName() {
         return shortName;