Merge pull request #4 from JavaWebStack/feature/implement-own-mapper

Implemented a new mapper as a replacement for gson.

Author: JanHolger

pom.xml

@@ -41,11 +41,6 @@
     </scm>
 
     <dependencies>
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>2.8.9</version>
-        </dependency>
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>

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

@@ -1,8 +1,5 @@
 package org.javawebstack.abstractdata;
 
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-
 import java.util.*;
 import java.util.stream.Stream;
 
@@ -242,7 +239,7 @@ public int size() {
 
     public boolean contains(Object o) {
         for (AbstractElement element : elements) {
-            if (o instanceof AbstractElement ? ((AbstractElement) o).toAbstractObject().equals(element.toAbstractObject()) : element.toAbstractObject().equals(o))
+            if (o instanceof AbstractElement ? ((AbstractElement) o).toObject().equals(element.toObject()) : element.toObject().equals(o))
                 return true;
         }
         return false;
@@ -257,25 +254,12 @@ public Iterator<AbstractElement> iterator() {
         return elements.iterator();
     }
 
-    public JsonElement toJson() {
-        JsonArray array = new JsonArray();
-        elements.forEach(e -> array.add(e.toJson()));
-        return array;
-    }
-
-    public Object toAbstractObject() {
+    public Object toObject() {
         List<Object> list = new ArrayList<>();
-        elements.forEach(e -> list.add(e.toAbstractObject()));
+        elements.forEach(e -> list.add(e.toObject()));
         return list;
     }
 
-    public static AbstractArray fromJson(JsonArray array) {
-        AbstractArray a = new AbstractArray();
-        array.forEach(e -> a.add(AbstractElement.fromJson(e)));
-        return a;
-    }
-
-
     public static AbstractArray fromArray(Object[] objects) {
         return new AbstractArray(objects);
     }

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

@@ -1,12 +1,12 @@
 package org.javawebstack.abstractdata;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonElement;
+import org.javawebstack.abstractdata.json.JsonDumper;
+import org.javawebstack.abstractdata.json.JsonParser;
 import org.javawebstack.abstractdata.util.QueryString;
 import org.yaml.snakeyaml.DumperOptions;
 import org.yaml.snakeyaml.Yaml;
 
+import java.text.ParseException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -73,19 +73,15 @@ default Number number() {
         return primitive().number();
     }
 
-    JsonElement toJson();
-
     default String toJsonString(boolean pretty) {
-        if (pretty)
-            return new GsonBuilder().setPrettyPrinting().disableHtmlEscaping().create().toJson(toJson());
-        return new GsonBuilder().disableHtmlEscaping().create().toJson(toJson());
+        return new JsonDumper().setPretty(pretty).dump(this);
     }
 
     default String toJsonString() {
         return toJsonString(false);
     }
 
-    Object toAbstractObject();
+    Object toObject();
 
     default String toYaml(boolean pretty) {
         Yaml yaml;
@@ -97,7 +93,7 @@ default String toYaml(boolean pretty) {
         } else {
             yaml = new Yaml();
         }
-        return yaml.dump(toAbstractObject());
+        return yaml.dump(toObject());
     }
 
     default String toYaml() {
@@ -162,20 +158,13 @@ default String toFormDataString() {
 
     Map<String[], Object> toTree();
 
-    static AbstractElement fromJson(JsonElement element) {
-        if (element == null)
-            return null;
-        if (element.isJsonArray())
-            return AbstractArray.fromJson(element.getAsJsonArray());
-        if (element.isJsonObject())
-            return AbstractObject.fromJson(element.getAsJsonObject());
-        if (element.isJsonPrimitive())
-            return AbstractPrimitive.fromJson(element.getAsJsonPrimitive());
-        return AbstractNull.INSTANCE;
-    }
-
     static AbstractElement fromJson(String json) {
-        return fromJson(new GsonBuilder().create().fromJson(json, JsonElement.class));
+        try {
+            return new JsonParser().parse(json);
+        } catch (ParseException e) {
+            e.printStackTrace();
+            return null;
+        }
     }
 
     static AbstractElement fromTree(Map<String[], Object> tree) {

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

@@ -1,22 +1,17 @@
 package org.javawebstack.abstractdata;
 
-import com.google.gson.ExclusionStrategy;
-import com.google.gson.FieldAttributes;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.annotations.Expose;
-import org.javawebstack.abstractdata.util.GsonAbstractDataAdapter;
+import org.javawebstack.abstractdata.mapper.Mapper;
 
 public class AbstractMapper {
 
-    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;
     }
 
@@ -26,7 +21,7 @@ public NamingPolicy getNamingPolicy() {
 
     public AbstractMapper setExposeRequired(boolean exposeRequired) {
         this.exposeRequired = exposeRequired;
-        gson = null;
+        mapper.requireExpose(exposeRequired);
         return this;
     }
 
@@ -36,52 +31,22 @@ public boolean isExposeRequired() {
 
     public AbstractMapper setDateFormat(String dateFormat) {
         this.dateFormat = dateFormat;
-        gson = null;
+        mapper.dateFormat(dateFormat);
         return this;
     }
 
     public String getDateFormat() {
         return dateFormat;
     }
 
-    private Gson gson() {
-        if (gson != null)
-            return gson;
-        GsonBuilder builder = new GsonBuilder()
-                .registerTypeAdapter(AbstractElement.class, new GsonAbstractDataAdapter<>())
-                .registerTypeAdapter(AbstractObject.class, new GsonAbstractDataAdapter<>())
-                .registerTypeAdapter(AbstractArray.class, new GsonAbstractDataAdapter<>())
-                .registerTypeAdapter(AbstractPrimitive.class, new GsonAbstractDataAdapter<>())
-                .registerTypeAdapter(AbstractNull.class, new GsonAbstractDataAdapter<>())
-                .setFieldNamingPolicy(namingPolicy.getGsonPolicy())
-                .disableHtmlEscaping();
-        if (dateFormat != null)
-            builder.setDateFormat(dateFormat);
-        if (exposeRequired) {
-            builder.excludeFieldsWithoutExposeAnnotation();
-        } else {
-            builder.setExclusionStrategies(new ExclusionStrategy() {
-                public boolean shouldSkipField(FieldAttributes fieldAttributes) {
-                    return fieldAttributes.getAnnotation(Expose.class) != null && !fieldAttributes.getAnnotation(Expose.class).serialize();
-                }
-
-                public boolean shouldSkipClass(Class<?> aClass) {
-                    return false;
-                }
-            });
-        }
-        gson = builder.create();
-        return gson;
-    }
-
     public AbstractElement toAbstract(Object object) {
-        return AbstractElement.fromJson(gson().toJsonTree(object));
+        return mapper.map(object);
     }
 
     public <T> T fromAbstract(AbstractElement element, Class<T> type) {
         if (element == null)
             return null;
-        return gson().fromJson(element.toJson(), type);
+        return mapper.map(element, type);
     }
 
 

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

@@ -1,8 +1,5 @@
 package org.javawebstack.abstractdata;
 
-import com.google.gson.JsonElement;
-import com.google.gson.JsonNull;
-
 import java.util.HashMap;
 import java.util.Map;
 
@@ -17,11 +14,7 @@ public boolean isNull() {
         return true;
     }
 
-    public JsonElement toJson() {
-        return JsonNull.INSTANCE;
-    }
-
-    public Object toAbstractObject() {
+    public Object toObject() {
         return null;
     }
 

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

@@ -1,17 +1,19 @@
 package org.javawebstack.abstractdata;
 
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-
 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 Set<Map.Entry<String, AbstractElement>> entries() {
+        return entries.entrySet();
+    }
 
     public AbstractObject setNull(String key) {
         set(key, AbstractNull.INSTANCE);
@@ -153,24 +155,12 @@ public Number number(String key, Number orElse) {
         return query(key, new AbstractPrimitive(orElse)).number();
     }
 
-    public JsonElement toJson() {
-        JsonObject object = new JsonObject();
-        entries.forEach((k, v) -> object.add(k, v.toJson()));
-        return object;
-    }
-
-    public Object toAbstractObject() {
+    public Object toObject() {
         Map<String, Object> map = new HashMap<>();
-        forEach((k, v) -> map.put(k, v.toAbstractObject()));
+        forEach((k, v) -> map.put(k, v.toObject()));
         return map;
     }
 
-    public static AbstractObject fromJson(JsonObject object) {
-        AbstractObject o = new AbstractObject();
-        object.entrySet().stream().map(Map.Entry::getKey).forEach(k -> o.set(k, AbstractElement.fromJson(object.get(k))));
-        return o;
-    }
-
     public Type getType() {
         return Type.OBJECT;
     }
@@ -188,7 +178,7 @@ public <T> T fill(Object object) {
                 field.setAccessible(true);
 
                 try {
-                    field.set(object, get(field.getName()).toAbstractObject());
+                    field.set(object, get(field.getName()).toObject());
                 } catch (IllegalAccessException e) {
                     e.printStackTrace();
                 }

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

@@ -1,8 +1,5 @@
 package org.javawebstack.abstractdata;
 
-import com.google.gson.JsonElement;
-import com.google.gson.JsonPrimitive;
-
 import java.util.HashMap;
 import java.util.Map;
 
@@ -59,17 +56,7 @@ public Object value() {
         return value;
     }
 
-    public JsonElement toJson() {
-        if (isString())
-            return new JsonPrimitive(string());
-        if (isBoolean())
-            return new JsonPrimitive(bool());
-        if (isNumber())
-            return new JsonPrimitive(number());
-        return null;
-    }
-
-    public Object toAbstractObject() {
+    public Object toObject() {
         return value;
     }
 
@@ -79,16 +66,6 @@ public Map<String[], Object> toTree() {
         return tree;
     }
 
-    public static AbstractPrimitive fromJson(JsonPrimitive primitive) {
-        if (primitive == null)
-            return null;
-        if (primitive.isNumber())
-            return new AbstractPrimitive(primitive.getAsNumber());
-        if (primitive.isBoolean())
-            return new AbstractPrimitive(primitive.getAsBoolean());
-        return new AbstractPrimitive(primitive.getAsString());
-    }
-
     public static AbstractPrimitive from(Object object) {
         if (object instanceof Number)
             return new AbstractPrimitive((Number) object);

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

@@ -1,20 +1,21 @@
 package org.javawebstack.abstractdata;
 
-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(org.javawebstack.abstractdata.mapper.naming.NamingPolicy.NONE),
+    CAMEL_CASE(org.javawebstack.abstractdata.mapper.naming.NamingPolicy.CAMEL_CASE),
+    PASCAL_CASE(org.javawebstack.abstractdata.mapper.naming.NamingPolicy.PASCAL_CASE),
+    SNAKE_CASE(org.javawebstack.abstractdata.mapper.naming.NamingPolicy.SNAKE_CASE),
+    KEBAB_CASE(org.javawebstack.abstractdata.mapper.naming.NamingPolicy.KEBAB_CASE);
+
+    private final org.javawebstack.abstractdata.mapper.naming.NamingPolicy mapperPolicy;
 
-    NamingPolicy(FieldNamingPolicy policy) {
-        this.policy = policy;
+    NamingPolicy(org.javawebstack.abstractdata.mapper.naming.NamingPolicy mapperPolicy) {
+        this.mapperPolicy = mapperPolicy;
     }
 
-    public FieldNamingPolicy getGsonPolicy() {
-        return policy;
+    public org.javawebstack.abstractdata.mapper.naming.NamingPolicy getMapperPolicy() {
+        return mapperPolicy;
     }
+
 }