Support UUID

Author: mhewedy

src/main/java/com/github/mhewedy/expressions/ExpressionsPredicateBuilder.java

@@ -11,6 +11,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 import static com.github.mhewedy.expressions.Expression.*;
@@ -297,7 +298,6 @@ private static Object convertValueToAttributeType(Object value, Class javaType)
         if (javaType.equals(ZonedDateTime.class)) {
             return ZonedDateTime.parse((CharSequence) value);
         }
-
         if (javaType.isEnum()) {
             if (Number.class.isAssignableFrom(value.getClass())) {
                 return javaType.getEnumConstants()[((Number) value).intValue()];
@@ -306,6 +306,9 @@ private static Object convertValueToAttributeType(Object value, Class javaType)
             }
             throw new IllegalArgumentException("enum value should be number or string");
         }
+        if (javaType.equals(UUID.class)) {
+            return UUID.fromString((String) value);
+        }
 
         // strings and numeric types don't need  conversion
         return value;

src/test/java/com/github/mhewedy/expressions/ExpressionsRepositoryImplTest.java

@@ -27,6 +27,7 @@
 import java.time.LocalDate;
 import java.util.Arrays;
 import java.util.List;
+import java.util.UUID;
 
 import static com.github.mhewedy.expressions.model.Status.ACTIVE;
 import static com.github.mhewedy.expressions.model.Status.NOT_ACTIVE;
@@ -58,7 +59,8 @@ public void setup() {
                         (short) 1,
                         true,
                         new Department(null, "hr", new City(null, "cairo")),
-                        Arrays.asList(new Task(null, "fix hr", ACTIVE), new Task(null, "fix hr", ACTIVE))
+                        Arrays.asList(new Task(null, "fix hr", ACTIVE), new Task(null, "fix hr", ACTIVE)),
+                        UUID.fromString("2dfb7bc7-38a6-4826-b6d3-297969d17244")
                 ),
                 new Employee(null,
                         "mohammad",
@@ -70,7 +72,8 @@ public void setup() {
                         (short) 1,
                         true,
                         new Department(null, "sw arch", new City(null, "giaz")),
-                        Arrays.asList(new Task(null, "fix sw arch", ACTIVE), new Task(null, "fix sw arch", ACTIVE))
+                        Arrays.asList(new Task(null, "fix sw arch", ACTIVE), new Task(null, "fix sw arch", ACTIVE)),
+                        UUID.randomUUID()
                 ),
                 new Employee(null,
                         "mostafa",
@@ -82,7 +85,8 @@ public void setup() {
                         (short) 2,
                         true,
                         new Department(null, "sw dev", new City(null, "alex")),
-                        Arrays.asList(new Task(null, "fix sw dev", ACTIVE), new Task(null, "fix sw dev", ACTIVE))
+                        Arrays.asList(new Task(null, "fix sw dev", ACTIVE), new Task(null, "fix sw dev", ACTIVE)),
+                        UUID.randomUUID()
                 ),
                 new Employee(null,
                         "wael",
@@ -94,7 +98,8 @@ public void setup() {
                         (short) 2,
                         true,
                         new Department(null, "hr", new City(null, "cairo")),
-                        Arrays.asList(new Task(null, "fix hr", ACTIVE), new Task(null, "fix hr", ACTIVE))
+                        Arrays.asList(new Task(null, "fix hr", ACTIVE), new Task(null, "fix hr", ACTIVE)),
+                        UUID.randomUUID()
                 ),
                 new Employee(null,
                         "farida",
@@ -106,7 +111,8 @@ public void setup() {
                         (short) 2,
                         false,
                         new Department(null, "hr", new City(null, "cairo")),
-                        Arrays.asList(new Task(null, "fix hr", ACTIVE), new Task(null, "fix hr", NOT_ACTIVE))
+                        Arrays.asList(new Task(null, "fix hr", ACTIVE), new Task(null, "fix hr", NOT_ACTIVE)),
+                        UUID.randomUUID()
                 ),
                 new Employee(null,
                         "fofo",
@@ -118,7 +124,8 @@ public void setup() {
                         (short) 2,
                         false,
                         null,
-                        null
+                        null,
+                        UUID.randomUUID()
                 )
         );
         employeeRepository.saveAll(employees);
@@ -540,6 +547,18 @@ public void testBooleanOperatorFromJava() {
         // where e.active=?
     }
 
+    @Test
+    public void testUUID() throws Exception {
+        String json = loadResourceJsonFile("testUUID");
+
+        Expressions expressions = new ObjectMapper().readValue(json, Expressions.class);
+
+        List<Employee> employeeList = employeeRepository.findAll(expressions);
+        assertThat(employeeList.size()).isEqualTo(1);
+
+        // where e.active=?
+    }
+
     @SneakyThrows
     private String loadResourceJsonFile(String name) {
         File file = ResourceUtils.getFile("classpath:" + name + ".json");

src/test/java/com/github/mhewedy/expressions/model/Employee.java

@@ -7,6 +7,7 @@
 import java.time.Instant;
 import java.time.LocalDate;
 import java.util.List;
+import java.util.UUID;
 
 @Entity
 @NoArgsConstructor
@@ -34,4 +35,5 @@ public class Employee extends Auditable {
     @OneToMany(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
     @JoinColumn(name = "employee_id")
     public List<Task> tasks;
+    public UUID serial;
 }

src/test/resources/testUUID.json

@@ -0,0 +1,3 @@
+{
+  "serial": "2dfb7bc7-38a6-4826-b6d3-297969d17244"
+}