Implemented a new mapper as a replacement for gson.

Author: JanHolger

src/main/java/org/javawebstack/abstractdata/AbstractMapper.java

@@ -5,18 +5,24 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.annotations.Expose;
+import org.javawebstack.abstractdata.mapper.Mapper;
 import org.javawebstack.abstractdata.util.GsonAbstractDataAdapter;
 
 public class AbstractMapper {
 
+    // This allows
+    public static boolean enableExperimentalMapper = false;
+
     private Gson gson;
+    private final Mapper mapper = new Mapper();
     private NamingPolicy namingPolicy = NamingPolicy.NONE;
     private String dateFormat = "yyyy-MM-dd HH:mm:ss";
     private boolean exposeRequired = false;
 
     public AbstractMapper setNamingPolicy(NamingPolicy namingPolicy) {
         this.namingPolicy = namingPolicy;
         gson = null;
+        mapper.namingPolicy(namingPolicy.getMapperPolicy());
         return this;
     }
 
@@ -27,6 +33,7 @@ public NamingPolicy getNamingPolicy() {
     public AbstractMapper setExposeRequired(boolean exposeRequired) {
         this.exposeRequired = exposeRequired;
         gson = null;
+        mapper.requireExpose(exposeRequired);
         return this;
     }
 
@@ -37,6 +44,7 @@ public boolean isExposeRequired() {
     public AbstractMapper setDateFormat(String dateFormat) {
         this.dateFormat = dateFormat;
         gson = null;
+        mapper.dateFormat(dateFormat);
         return this;
     }
 
@@ -75,12 +83,16 @@ public boolean shouldSkipClass(Class<?> aClass) {
     }
 
     public AbstractElement toAbstract(Object object) {
+        if(enableExperimentalMapper)
+            return mapper.map(object);
         return AbstractElement.fromJson(gson().toJsonTree(object));
     }
 
     public <T> T fromAbstract(AbstractElement element, Class<T> type) {
         if (element == null)
             return null;
+        if(enableExperimentalMapper)
+            return mapper.map(element, type);
         return gson().fromJson(element.toJson(), type);
     }
 

src/main/java/org/javawebstack/abstractdata/AbstractObject.java

@@ -5,13 +5,14 @@
 
 import java.lang.reflect.Field;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
 import java.util.function.BiConsumer;
 
 public class AbstractObject implements AbstractElement {
 
-    private final Map<String, AbstractElement> entries = new HashMap<>();
+    private final Map<String, AbstractElement> entries = new LinkedHashMap<>();
 
     public AbstractObject setNull(String key) {
         set(key, AbstractNull.INSTANCE);

src/main/java/org/javawebstack/abstractdata/NamingPolicy.java

@@ -3,18 +3,25 @@
 import com.google.gson.FieldNamingPolicy;
 
 public enum NamingPolicy {
-    NONE(FieldNamingPolicy.IDENTITY),
-    CAMEL_CASE(FieldNamingPolicy.IDENTITY),
-    PASCAL_CASE(FieldNamingPolicy.UPPER_CAMEL_CASE),
-    SNAKE_CASE(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES),
-    KEBAB_CASE(FieldNamingPolicy.LOWER_CASE_WITH_DASHES);
-    private final FieldNamingPolicy policy;
+    NONE(FieldNamingPolicy.IDENTITY, org.javawebstack.abstractdata.mapper.naming.NamingPolicy.NONE),
+    CAMEL_CASE(FieldNamingPolicy.IDENTITY, org.javawebstack.abstractdata.mapper.naming.NamingPolicy.CAMEL_CASE),
+    PASCAL_CASE(FieldNamingPolicy.UPPER_CAMEL_CASE, org.javawebstack.abstractdata.mapper.naming.NamingPolicy.PASCAL_CASE),
+    SNAKE_CASE(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES, org.javawebstack.abstractdata.mapper.naming.NamingPolicy.SNAKE_CASE),
+    KEBAB_CASE(FieldNamingPolicy.LOWER_CASE_WITH_DASHES, org.javawebstack.abstractdata.mapper.naming.NamingPolicy.KEBAB_CASE);
 
-    NamingPolicy(FieldNamingPolicy policy) {
-        this.policy = policy;
+    private final FieldNamingPolicy gsonPolicy;
+    private final org.javawebstack.abstractdata.mapper.naming.NamingPolicy mapperPolicy;
+
+    NamingPolicy(FieldNamingPolicy gsonPolicy, org.javawebstack.abstractdata.mapper.naming.NamingPolicy mapperPolicy) {
+        this.gsonPolicy = gsonPolicy;
+        this.mapperPolicy = mapperPolicy;
     }
 
     public FieldNamingPolicy getGsonPolicy() {
-        return policy;
+        return gsonPolicy;
+    }
+
+    public org.javawebstack.abstractdata.mapper.naming.NamingPolicy getMapperPolicy() {
+        return mapperPolicy;
     }
 }