removed AutoValue from geoJson (#953)

* removed AutoValue from geoJson * removing dependency on PointDeserializer, PointSerializer, BoundingBoxDeserializer and BoundingBoxSerializer, GeometryDeserializer in favor of TypeAdapters
mapbox · Mar 4, 2019 · 82837f3 · 82837f3
1 parent 4afbd73
commit 82837f3
Show file tree

Hide file tree

Showing 50 changed files with 2,625 additions and 306 deletions.
diff --git a/...es-directions/src/main/java/com/mapbox/api/directions/v5/models/DirectionsJsonObject.java b/...es-directions/src/main/java/com/mapbox/api/directions/v5/models/DirectionsJsonObject.java
@@ -3,7 +3,7 @@
 import com.google.gson.GsonBuilder;
 import com.mapbox.api.directions.v5.DirectionsAdapterFactory;
 import com.mapbox.geojson.Point;
-import com.mapbox.geojson.gson.PointSerializer;
+import com.mapbox.geojson.PointAsCoordinatesTypeAdapter;
 
 import java.io.Serializable;
 
@@ -24,7 +24,7 @@ public class DirectionsJsonObject implements Serializable {
   public String toJson() {
     GsonBuilder gson = new GsonBuilder();
     gson.registerTypeAdapterFactory(DirectionsAdapterFactory.create());
-    gson.registerTypeAdapter(Point.class, new PointSerializer());
+    gson.registerTypeAdapter(Point.class, new PointAsCoordinatesTypeAdapter());
     return gson.create().toJson(this);
   }
 }
diff --git a/...ices-directions/src/main/java/com/mapbox/api/directions/v5/models/DirectionsResponse.java b/...ices-directions/src/main/java/com/mapbox/api/directions/v5/models/DirectionsResponse.java
@@ -9,7 +9,7 @@
 import com.google.gson.TypeAdapter;
 import com.mapbox.api.directions.v5.DirectionsAdapterFactory;
 import com.mapbox.geojson.Point;
-import com.mapbox.geojson.gson.PointDeserializer;
+import com.mapbox.geojson.PointAsCoordinatesTypeAdapter;
 
 import java.util.List;
 
@@ -129,7 +129,7 @@ public static TypeAdapter<DirectionsResponse> typeAdapter(Gson gson) {
   public static DirectionsResponse fromJson(String json) {
     GsonBuilder gson = new GsonBuilder();
     gson.registerTypeAdapterFactory(DirectionsAdapterFactory.create());
-    gson.registerTypeAdapter(Point.class, new PointDeserializer());
+    gson.registerTypeAdapter(Point.class, new PointAsCoordinatesTypeAdapter());
     return gson.create().fromJson(json, DirectionsResponse.class);
   }
 

diff --git a/services-directions/src/main/java/com/mapbox/api/directions/v5/models/DirectionsRoute.java b/services-directions/src/main/java/com/mapbox/api/directions/v5/models/DirectionsRoute.java
@@ -10,7 +10,7 @@
 import com.mapbox.api.directions.v5.DirectionsAdapterFactory;
 import com.mapbox.api.directions.v5.MapboxDirections;
 import com.mapbox.geojson.Point;
-import com.mapbox.geojson.gson.PointDeserializer;
+import com.mapbox.geojson.PointAsCoordinatesTypeAdapter;
 
 import java.util.List;
 
@@ -155,7 +155,7 @@ public static TypeAdapter<DirectionsRoute> typeAdapter(Gson gson) {
   public static DirectionsRoute fromJson(String json) {
     GsonBuilder gson = new GsonBuilder();
     gson.registerTypeAdapterFactory(DirectionsAdapterFactory.create());
-    gson.registerTypeAdapter(Point.class, new PointDeserializer());
+    gson.registerTypeAdapter(Point.class, new PointAsCoordinatesTypeAdapter());
     return gson.create().fromJson(json, DirectionsRoute.class);
   }
 

diff --git a/services-directions/src/main/java/com/mapbox/api/directions/v5/models/RouteOptions.java b/services-directions/src/main/java/com/mapbox/api/directions/v5/models/RouteOptions.java
@@ -12,7 +12,7 @@
 import com.mapbox.api.directions.v5.DirectionsCriteria;
 import com.mapbox.api.directions.v5.MapboxDirections;
 import com.mapbox.geojson.Point;
-import com.mapbox.geojson.gson.PointDeserializer;
+import com.mapbox.geojson.PointAsCoordinatesTypeAdapter;
 
 import java.util.List;
 
@@ -334,7 +334,7 @@ public static TypeAdapter<RouteOptions> typeAdapter(Gson gson) {
   public static RouteOptions fromJson(String json) {
     GsonBuilder gson = new GsonBuilder();
     gson.registerTypeAdapterFactory(DirectionsAdapterFactory.create());
-    gson.registerTypeAdapter(Point.class, new PointDeserializer());
+    gson.registerTypeAdapter(Point.class, new PointAsCoordinatesTypeAdapter());
     return gson.create().fromJson(json, RouteOptions.class);
   }
 

diff --git a/services-geocoding/src/main/java/com/mapbox/api/geocoding/v5/MapboxGeocoding.java b/services-geocoding/src/main/java/com/mapbox/api/geocoding/v5/MapboxGeocoding.java
@@ -17,11 +17,9 @@
 import com.mapbox.core.utils.MapboxUtils;
 import com.mapbox.core.utils.TextUtils;
 import com.mapbox.geojson.BoundingBox;
-import com.mapbox.geojson.Geometry;
+import com.mapbox.geojson.GeometryAdapterFactory;
 import com.mapbox.geojson.Point;
-import com.mapbox.geojson.gson.BoundingBoxDeserializer;
-import com.mapbox.geojson.gson.GeometryDeserializer;
-import com.mapbox.geojson.gson.PointDeserializer;
+import com.mapbox.geojson.gson.BoundingBoxTypeAdapter;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -71,11 +69,11 @@ protected MapboxGeocoding() {
 
   @Override
   protected GsonBuilder getGsonBuilder() {
+
     return new GsonBuilder()
       .registerTypeAdapterFactory(GeocodingAdapterFactory.create())
-      .registerTypeAdapter(Point.class, new PointDeserializer())
-      .registerTypeAdapter(Geometry.class, new GeometryDeserializer())
-      .registerTypeAdapter(BoundingBox.class, new BoundingBoxDeserializer());
+      .registerTypeAdapterFactory(GeometryAdapterFactory.create())
+      .registerTypeAdapter(BoundingBox.class, new BoundingBoxTypeAdapter());
   }
 
   @Override

diff --git a/services-geocoding/src/main/java/com/mapbox/api/geocoding/v5/models/CarmenFeature.java b/services-geocoding/src/main/java/com/mapbox/api/geocoding/v5/models/CarmenFeature.java
@@ -13,12 +13,9 @@
 import com.mapbox.geojson.Feature;
 import com.mapbox.geojson.GeoJson;
 import com.mapbox.geojson.Geometry;
+import com.mapbox.geojson.GeometryAdapterFactory;
 import com.mapbox.geojson.Point;
-import com.mapbox.geojson.gson.BoundingBoxDeserializer;
-import com.mapbox.geojson.gson.BoundingBoxSerializer;
-import com.mapbox.geojson.gson.GeometryDeserializer;
-import com.mapbox.geojson.gson.GeometryTypeAdapter;
-import com.mapbox.geojson.gson.PointDeserializer;
+import com.mapbox.geojson.gson.BoundingBoxTypeAdapter;
 
 import java.io.Serializable;
 import java.util.List;
@@ -55,10 +52,10 @@ public abstract class CarmenFeature implements GeoJson, Serializable {
    */
   @NonNull
   public static CarmenFeature fromJson(@NonNull String json) {
+
     Gson gson = new GsonBuilder()
-      .registerTypeAdapter(Point.class, new PointDeserializer())
-      .registerTypeAdapter(Geometry.class, new GeometryDeserializer())
-      .registerTypeAdapter(BoundingBox.class, new BoundingBoxDeserializer())
+      .registerTypeAdapterFactory(GeometryAdapterFactory.create())
+      .registerTypeAdapter(BoundingBox.class, new BoundingBoxTypeAdapter())
       .registerTypeAdapterFactory(GeocodingAdapterFactory.create())
       .create();
     CarmenFeature feature = gson.fromJson(json, CarmenFeature.class);
@@ -296,9 +293,10 @@ public static TypeAdapter<CarmenFeature> typeAdapter(Gson gson) {
   @Override
   @SuppressWarnings("unused")
   public String toJson() {
+
     Gson gson = new GsonBuilder()
-      .registerTypeAdapter(Geometry.class, new GeometryTypeAdapter())
-      .registerTypeAdapter(BoundingBox.class, new BoundingBoxSerializer())
+      .registerTypeAdapterFactory(GeometryAdapterFactory.create())
+      .registerTypeAdapter(BoundingBox.class, new BoundingBoxTypeAdapter())
       .registerTypeAdapterFactory(GeocodingAdapterFactory.create())
       .create();
 

diff --git a/services-geocoding/src/main/java/com/mapbox/api/geocoding/v5/models/GeocodingResponse.java b/services-geocoding/src/main/java/com/mapbox/api/geocoding/v5/models/GeocodingResponse.java
@@ -7,13 +7,8 @@
 import com.google.gson.TypeAdapter;
 import com.mapbox.geojson.BoundingBox;
 import com.mapbox.geojson.FeatureCollection;
-import com.mapbox.geojson.Geometry;
-import com.mapbox.geojson.Point;
-import com.mapbox.geojson.gson.BoundingBoxDeserializer;
-import com.mapbox.geojson.gson.BoundingBoxSerializer;
-import com.mapbox.geojson.gson.GeometryDeserializer;
-import com.mapbox.geojson.gson.GeometryTypeAdapter;
-import com.mapbox.geojson.gson.PointDeserializer;
+import com.mapbox.geojson.GeometryAdapterFactory;
+import com.mapbox.geojson.gson.BoundingBoxTypeAdapter;
 
 import java.io.Serializable;
 import java.util.List;
@@ -41,9 +36,8 @@ public abstract class GeocodingResponse implements Serializable {
   @NonNull
   public static GeocodingResponse fromJson(@NonNull String json) {
     Gson gson = new GsonBuilder()
-      .registerTypeAdapter(Point.class, new PointDeserializer())
-      .registerTypeAdapter(Geometry.class, new GeometryDeserializer())
-      .registerTypeAdapter(BoundingBox.class, new BoundingBoxDeserializer())
+      .registerTypeAdapterFactory(GeometryAdapterFactory.create())
+      .registerTypeAdapter(BoundingBox.class, new BoundingBoxTypeAdapter())
       .registerTypeAdapterFactory(GeocodingAdapterFactory.create())
       .create();
     return gson.fromJson(json, GeocodingResponse.class);
@@ -123,8 +117,8 @@ public static Builder builder() {
   @NonNull
   public String toJson() {
     Gson gson = new GsonBuilder()
-      .registerTypeAdapter(Geometry.class, new GeometryTypeAdapter())
-      .registerTypeAdapter(BoundingBox.class, new BoundingBoxSerializer())
+      .registerTypeAdapterFactory(GeometryAdapterFactory.create())
+      .registerTypeAdapter(BoundingBox.class, new BoundingBoxTypeAdapter())
       .registerTypeAdapterFactory(GeocodingAdapterFactory.create())
       .create();
     return gson.toJson(this, GeocodingResponse.class);

diff --git a/services-geocoding/src/test/java/com/mapbox/api/geocoding/v5/models/CarmenFeatureTest.java b/services-geocoding/src/test/java/com/mapbox/api/geocoding/v5/models/CarmenFeatureTest.java
@@ -172,7 +172,7 @@ public void testNullProperties() {
 
   @Test
   public void testNullPropertiesJson() {
-    String jsonString = "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[-77.0, 38.0]}}";
+    String jsonString = "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[-77.0,38.0]}}";
     CarmenFeature feature = CarmenFeature.fromJson(jsonString);
 
     // Json( null Properties) -> Feature (empty Properties) -> Json(null Properties)