#2174 - Entity beans with @Cache + @DbArray of enums (or UUID or Integer) not converted to enums (come back as String) (#2175)

ebean-core/src/main/java/io/ebeaninternal/server/type/ArrayElementConverter.java

@@ -10,9 +10,14 @@ import java.util.UUID;
 interface ArrayElementConverter<T> {
 
   /**
-   * Convert the array element to the logical type.
+   * Convert element it's json serialized form.
    */
-  T toElement(Object rawValue);
+  T fromSerialized(Object rawValue);
+
+  /**
+   * Convert the array element from it's DB array form.
+   */
+  T fromDbArray(Object rawValue);
 
   default Object[] toDbArray(Object[] objects) {
     return objects;
@@ -46,7 +51,12 @@ interface ArrayElementConverter<T> {
   class LongConverter implements ArrayElementConverter<Long> {
 
     @Override
-    public Long toElement(Object rawValue) {
+    public Long fromSerialized(Object rawValue) {
+      return fromDbArray(rawValue);
+    }
+
+    @Override
+    public Long fromDbArray(Object rawValue) {
       if (rawValue instanceof Long) {
         return (Long) rawValue;
       } else {
@@ -58,7 +68,12 @@ interface ArrayElementConverter<T> {
   class IntegerConverter implements ArrayElementConverter<Integer> {
 
     @Override
-    public Integer toElement(Object rawValue) {
+    public Integer fromSerialized(Object rawValue) {
+      return ((Number) rawValue).intValue();
+    }
+
+    @Override
+    public Integer fromDbArray(Object rawValue) {
       if (rawValue instanceof Integer) {
         return (Integer) rawValue;
       } else {
@@ -70,7 +85,12 @@ interface ArrayElementConverter<T> {
   class DoubleConverter implements ArrayElementConverter<Double> {
 
     @Override
-    public Double toElement(Object rawValue) {
+    public Double fromSerialized(Object rawValue) {
+      return fromDbArray(rawValue);
+    }
+
+    @Override
+    public Double fromDbArray(Object rawValue) {
       if (rawValue instanceof Double) {
         return (Double) rawValue;
       } else {
@@ -82,21 +102,34 @@ interface ArrayElementConverter<T> {
   /**
    * String converter (noop based).
    */
-  class StringConverter extends NoopConverter<String> {
+  class StringConverter implements ArrayElementConverter<String> {
+
+    public String fromDbArray(Object rawValue) {
+      return (String) rawValue;
+    }
+
+    @Override
+    public String fromSerialized(Object rawValue) {
+      return (String) rawValue;
+    }
   }
 
   /**
-   * UUID converter (noop based).
+   * UUID converter.
    */
-  class UuidConverter extends NoopConverter<UUID> {
-  }
+  class UuidConverter implements ArrayElementConverter<UUID> {
 
-  class NoopConverter<T> implements ArrayElementConverter<T> {
-
-    @SuppressWarnings("unchecked")
     @Override
-    public T toElement(Object rawValue) {
-      return (T) rawValue;
+    public java.util.UUID fromSerialized(Object rawValue) {
+      return java.util.UUID.fromString((String)rawValue);
+    }
+
+    @Override
+    public java.util.UUID fromDbArray(Object rawValue) {
+      if (rawValue instanceof UUID) {
+        return (java.util.UUID) rawValue;
+      }
+      return java.util.UUID.fromString(rawValue.toString());
     }
   }
 
@@ -113,7 +146,12 @@ interface ArrayElementConverter<T> {
     }
 
     @Override
-    public Object toElement(Object rawValue) {
+    public Object fromSerialized(Object rawValue) {
+      return scalarType.parse((String) rawValue);
+    }
+
+    @Override
+    public Object fromDbArray(Object rawValue) {
       return scalarType.toBeanType(rawValue);
     }
 

ebean-core/src/main/java/io/ebeaninternal/server/type/ArrayElementConverterEnum.java

@@ -1,25 +0,0 @@
-package io.ebeaninternal.server.type;
-
-import io.ebean.core.type.ScalarType;
-
-public class ArrayElementConverterEnum implements ArrayElementConverter<String> {
-
-  final ScalarType<?> scalarType;
-
-  final Class<? extends Enum<?>> valueType1;
-
-  public ArrayElementConverterEnum(ScalarType<?> scalarType, Class<? extends Enum<?>> valueType1) {
-    this.scalarType = scalarType;
-    this.valueType1 = valueType1;
-  }
-
-  @Override
-  public String toElement(Object rawValue) {
-    // FIXME: Don't understand for what is this.
-    Enum<?>[] enumConstants = valueType1.getEnumConstants();
-    if (scalarType == null) {
-      return rawValue.toString();
-    }
-    return scalarType.format(rawValue);
-  }
-}

ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java

@@ -105,7 +105,7 @@ public class ScalarTypeArrayList extends ScalarTypeArrayBase<List> implements Sc
       if (element == null) {
         list.add(null);
       } else {
-        list.add(converter.toElement(element));
+        list.add(converter.fromDbArray(element));
       }
     }
     return new ModifyAwareList(list);
@@ -145,15 +145,27 @@ public class ScalarTypeArrayList extends ScalarTypeArrayBase<List> implements Sc
   @Override
   public List parse(String value) {
     try {
-      return EJson.parseList(value, false);
+      return convert(EJson.parseList(value, false));
     } catch (IOException e) {
       throw new TextException("Failed to parse JSON [{}] as List", value, e);
     }
   }
 
+  /**
+   * Convert from the json types to the proper scalar types (uuid, enum, double etc)
+   */
+  @SuppressWarnings("rawtypes")
+  private List convert(List<Object> rawList) {
+    List list = new ArrayList(rawList.size());
+    for (Object rawVal : rawList) {
+      list.add(converter.fromSerialized(rawVal));
+    }
+    return new ModifyAwareList(list);
+  }
+
   @Override
   public List jsonRead(JsonParser parser) throws IOException {
-    return EJson.parseList(parser, parser.getCurrentToken());
+    return convert(EJson.parseList(parser, parser.getCurrentToken()));
   }
 
   @Override

ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java

@@ -17,6 +17,7 @@ import java.sql.SQLException;
 import java.sql.Types;
 import java.util.HashMap;
 import java.util.LinkedHashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
@@ -101,7 +102,7 @@ public class ScalarTypeArraySet extends ScalarTypeArrayBase<Set> implements Scal
   protected Set fromArray(Object[] array1) {
     Set set = new LinkedHashSet();
     for (Object element : array1) {
-      set.add(converter.toElement(element));
+      set.add(converter.fromDbArray(element));
     }
     return new ModifyAwareSet(set);
   }
@@ -140,15 +141,26 @@ public class ScalarTypeArraySet extends ScalarTypeArrayBase<Set> implements Scal
   @Override
   public Set parse(String value) {
     try {
-      return EJson.parseSet(value, false);
+      return convert(EJson.parseList(value, false));
     } catch (IOException e) {
       throw new TextException("Failed to parse JSON [{}] as Set", value, e);
     }
   }
 
+  /**
+   * Convert from the json types to the proper scalar types (uuid, enum, double etc)
+   */
+  private Set convert(List<Object> rawList) {
+    Set asSet = new LinkedHashSet();
+    for (Object rawVal : rawList) {
+        asSet.add(converter.fromSerialized(rawVal));
+    }
+    return new ModifyAwareSet(asSet);
+  }
+
   @Override
   public Set jsonRead(JsonParser parser) throws IOException {
-    return EJson.parseSet(parser, parser.getCurrentToken());
+    return convert(EJson.parseList(parser, parser.getCurrentToken()));
   }
 
   @Override