#115 - Mapping - Add support for @ElementCollection enhancement

Add embedded bean support

src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbeddedMap.java

@@ -0,0 +1,84 @@
+package io.ebeaninternal.server.deploy;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
+import io.ebean.bean.EntityBean;
+import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
+import io.ebeaninternal.server.text.json.ReadJson;
+import io.ebeaninternal.server.text.json.SpiJsonWriter;
+import io.ebeaninternal.server.type.ScalarType;
+
+import java.io.IOException;
+import java.util.Map;
+
+/**
+ * Descriptor for element collection using Map with the value holding an embedded bean.
+ * <p>
+ * The expected limitation is that the key is a scalar type.
+ */
+class BeanDescriptorElementEmbeddedMap<T> extends BeanDescriptorElementEmbedded<T> {
+
+  private final ScalarType scalarTypeKey;
+
+  private final boolean stringKey;
+
+  BeanDescriptorElementEmbeddedMap(BeanDescriptorMap owner, DeployBeanDescriptor<T> deploy, ElementHelp elementHelp) {
+    super(owner, deploy, elementHelp);
+    this.scalarTypeKey = firstBaseScalarType();
+    this.stringKey = String.class.equals(scalarTypeKey.getType());
+  }
+
+  @Override
+  @SuppressWarnings("unchecked")
+  public void jsonWriteMapEntry(SpiJsonWriter ctx, Map.Entry<?, ?> entry) throws IOException {
+    ctx.writeStartObject();
+    if (stringKey) {
+      Object key = entry.getKey();
+      String keyName = (key == null) ? "null" : key.toString();
+      ctx.writeFieldName(keyName);
+      writeJsonElement(ctx, entry.getValue());
+    } else {
+      ctx.writeFieldName("key");
+      scalarTypeKey.jsonWrite(ctx.gen(), entry.getKey());
+      ctx.writeFieldName("value");
+      writeJsonElement(ctx, entry.getValue());
+    }
+    ctx.writeEndObject();
+  }
+
+  @Override
+  public Object jsonReadCollection(ReadJson readJson, EntityBean parentBean) throws IOException {
+
+    JsonParser parser = readJson.getParser();
+    ElementCollector add = elementHelp.createCollector();
+    do {
+      JsonToken token = parser.nextToken();
+      if (token != JsonToken.START_OBJECT) {
+        break;
+      }
+      if (stringKey) {
+        String key = parser.nextFieldName();
+        parser.nextToken();
+        Object val = readJsonElement(readJson, null);
+        add.addKeyValue(key, val);
+
+      } else {
+        parser.nextFieldName();
+        Object key = scalarTypeKey.jsonRead(parser);
+
+        parser.nextFieldName();
+        Object val = readJsonElement(readJson, null);
+        add.addKeyValue(key, val);
+      }
+
+      token = parser.nextToken();
+      if (token != JsonToken.END_OBJECT) {
+        break;
+      }
+
+    } while (true);
+
+    return add.collection();
+  }
+
+}