jenkins-bot has submitted this change and it was merged.
Change subject: Use the default Gson unmarshaller with Retrofit
......................................................................
Use the default Gson unmarshaller with Retrofit
Our default Gson has custom TypeAdapters that are expected. Use that
instead of a new Gson().
Change-Id: Icc3a6587e9857bcbfcd5477ec59b6d8f3dd9078e
---
M app/src/main/java/org/wikipedia/dataclient/retrofit/RetrofitFactory.java
M app/src/test/java/org/wikipedia/test/MockWebServerTest.java
2 files changed, 4 insertions(+), 2 deletions(-)
Approvals:
Mholloway: Looks good to me, but someone else must approve
Dbrant: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/app/src/main/java/org/wikipedia/dataclient/retrofit/RetrofitFactory.java
b/app/src/main/java/org/wikipedia/dataclient/retrofit/RetrofitFactory.java
index 75d71a6..5305d6a 100644
--- a/app/src/main/java/org/wikipedia/dataclient/retrofit/RetrofitFactory.java
+++ b/app/src/main/java/org/wikipedia/dataclient/retrofit/RetrofitFactory.java
@@ -5,6 +5,7 @@
import org.wikipedia.OkHttpConnectionFactory;
import org.wikipedia.Site;
import org.wikipedia.WikipediaApp;
+import org.wikipedia.json.GsonUtil;
import java.io.IOException;
@@ -39,7 +40,7 @@
return new Retrofit.Builder()
.client(client)
.baseUrl(endpoint)
- .addConverterFactory(GsonConverterFactory.create())
+
.addConverterFactory(GsonConverterFactory.create(GsonUtil.getDefaultGson()))
.build();
}
diff --git a/app/src/test/java/org/wikipedia/test/MockWebServerTest.java
b/app/src/test/java/org/wikipedia/test/MockWebServerTest.java
index 3b46ac4..4319825 100644
--- a/app/src/test/java/org/wikipedia/test/MockWebServerTest.java
+++ b/app/src/test/java/org/wikipedia/test/MockWebServerTest.java
@@ -5,6 +5,7 @@
import org.junit.After;
import org.junit.Before;
import org.junit.runner.RunWith;
+import org.wikipedia.json.GsonUtil;
import okhttp3.Dispatcher;
import okhttp3.OkHttpClient;
@@ -50,7 +51,7 @@
.baseUrl(url)
.callbackExecutor(new ImmediateExecutor())
.client(okHttp)
- .addConverterFactory(GsonConverterFactory.create())
+
.addConverterFactory(GsonConverterFactory.create(GsonUtil.getDefaultGson()))
.build()
.create(clazz);
}
--
To view, visit https://gerrit.wikimedia.org/r/293571
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icc3a6587e9857bcbfcd5477ec59b6d8f3dd9078e
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski <[email protected]>
Gerrit-Reviewer: BearND <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Dbrant <[email protected]>
Gerrit-Reviewer: Mholloway <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
