Merge pull request #99 from Systems-Modeling/feature/ST5AS-233

ST5AS-233 support UUIDs in Queries

Author: ivan-gomes

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 ?

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();
     }
+
 }

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));
+    }
+}