Use Moshi instead of Jackson

Author: simonesestito

.idea/dictionaries/Simone.xml

@@ -73,7 +73,7 @@ dependencies {
     annotationProcessor "com.google.dagger:dagger-compiler:$versions.dagger"
 
     // Retrofit
-    implementation "com.squareup.retrofit2:converter-jackson:$versions.retrofit"
+    implementation "com.squareup.retrofit2:converter-moshi:$versions.retrofit"
     implementation "com.squareup.retrofit2:retrofit:$versions.retrofit"
     implementation "com.squareup.okhttp3:logging-interceptor:$versions.okhttpLog"
 

app/build.gradle

@@ -22,12 +22,21 @@
 
 @SuppressWarnings("WeakerAccess")
 public class Constants {
-    public static final String API_BASE_URL = BuildConfig.DEBUG
-            ? Build.PRODUCT.equals("sdk") ? "http://10.0.2.2:1234" : "http://192.168.1.100:1234"
-            : "https://shopsqueue.simonesestito.com";
+    public static final boolean IS_EMULATOR = Build.PRODUCT.equals("sdk");
+    public static final String API_BASE_URL = getApiBaseUrl();
     public static final String SHARED_PREFERENCES_FILE = BuildConfig.APPLICATION_ID + "_preferences";
     public static final String SHARED_PREFERENCES_TOKEN_KEY = "api_access_token";
     public static final int COORDINATES_DIGITS_PRECISION = 6;
     public static final String APK_DOWNLOAD_URL = "https://firebasestorage.googleapis.com/v0/b/shops-queue.appspot.com/o/app.apk?alt=media";
     public static final String GITHUB_REPO_URL = "https://github.com/simonesestito/shops-queue-android";
+
+
+    private static String getApiBaseUrl() {
+        if (!BuildConfig.DEBUG)
+            return "https://shopsqueue.simonesestito.com";
+        else if (IS_EMULATOR)
+            return "http://10.0.2.2:1234";
+        else
+            return "http://192.168.1.100:1234";
+    }
 }

app/src/main/java/com/simonesestito/shopsqueue/Constants.java

@@ -31,15 +31,14 @@
 import androidx.core.app.NotificationCompat;
 import androidx.core.content.ContextCompat;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.firebase.messaging.FirebaseMessagingService;
 import com.google.firebase.messaging.RemoteMessage;
 import com.simonesestito.shopsqueue.api.dto.Booking;
 import com.simonesestito.shopsqueue.api.dto.BookingWithCount;
 import com.simonesestito.shopsqueue.api.dto.FcmToken;
 import com.simonesestito.shopsqueue.api.service.FcmService;
 import com.simonesestito.shopsqueue.ui.MainActivity;
+import com.squareup.moshi.Moshi;
 
 import java.util.Map;
 
@@ -151,11 +150,13 @@ private <T> T parseJson(String json, Class<T> clazz) {
         if (json == null || json.isEmpty())
             return null;
 
-        ObjectMapper objectMapper = new ObjectMapper();
         try {
-            return objectMapper.readerFor(clazz).readValue(json);
-        } catch (JsonProcessingException e) {
-            e.printStackTrace();
+            return new Moshi.Builder()
+                    .build()
+                    .adapter(clazz)
+                    .fromJson(json);
+        } catch (Exception e) {
+            Log.e("FcmReceiverService", "Unable to read FCM JSON", e);
             return null;
         }
     }

app/src/main/java/com/simonesestito/shopsqueue/FcmReceiverService.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2020 Simone Sestito
+ * This file is part of Shops Queue.
+ *
+ * Shops Queue is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Shops Queue is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Shops Queue.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.simonesestito.shopsqueue.api;
+
+import com.squareup.moshi.FromJson;
+import com.squareup.moshi.ToJson;
+
+import java.util.Date;
+
+import javax.inject.Inject;
+
+public class DateJsonAdapter {
+    @Inject
+    public DateJsonAdapter() {
+    }
+
+    @FromJson
+    public Date fromJson(long millis) {
+        return new Date(millis);
+    }
+
+    @ToJson
+    public long toJson(Date date) {
+        return date.getTime();
+    }
+}

app/src/main/java/com/simonesestito/shopsqueue/api/DateJsonAdapter.java

@@ -21,20 +21,22 @@
 import com.simonesestito.shopsqueue.BuildConfig;
 import com.simonesestito.shopsqueue.api.ApiCallAdapter;
 import com.simonesestito.shopsqueue.api.AuthorizationInterceptor;
+import com.simonesestito.shopsqueue.api.DateJsonAdapter;
 import com.simonesestito.shopsqueue.api.service.BookingService;
 import com.simonesestito.shopsqueue.api.service.FavouritesService;
 import com.simonesestito.shopsqueue.api.service.FcmService;
 import com.simonesestito.shopsqueue.api.service.LoginService;
 import com.simonesestito.shopsqueue.api.service.SessionService;
 import com.simonesestito.shopsqueue.api.service.ShopService;
 import com.simonesestito.shopsqueue.api.service.UserService;
+import com.squareup.moshi.Moshi;
 
 import dagger.Module;
 import dagger.Provides;
 import okhttp3.OkHttpClient;
 import okhttp3.logging.HttpLoggingInterceptor;
 import retrofit2.Retrofit;
-import retrofit2.converter.jackson.JacksonConverterFactory;
+import retrofit2.converter.moshi.MoshiConverterFactory;
 
 import static com.simonesestito.shopsqueue.Constants.API_BASE_URL;
 
@@ -54,10 +56,17 @@ OkHttpClient provideOkHttp(AuthorizationInterceptor authorizationInterceptor) {
     }
 
     @Provides
-    Retrofit provideRetrofit(OkHttpClient okHttpClient) {
+    Moshi provideMoshi(DateJsonAdapter dateJsonAdapter) {
+        return new Moshi.Builder()
+                .add(dateJsonAdapter)
+                .build();
+    }
+
+    @Provides
+    Retrofit provideRetrofit(OkHttpClient okHttpClient, Moshi moshi) {
         return new Retrofit.Builder()
                 .client(okHttpClient)
-                .addConverterFactory(JacksonConverterFactory.create())
+                .addConverterFactory(MoshiConverterFactory.create(moshi))
                 .addCallAdapterFactory(new ApiCallAdapter.Factory())
                 .baseUrl(API_BASE_URL)
                 .build();