Merge pull request #11 from studyplus/feature/remove_gson

GSON/Retrofitを削除

Author: koji-1009

build.gradle

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.0'
+    ext.kotlin_version = '1.3.10'
     ext.versions = [
             'compileSdk': 27,
             'minSdk': 16,

studyplus-android-sdk2/build.gradle

@@ -60,25 +60,29 @@ android {
             }
         }
     }
+
+    testOptions {
+        unitTests {
+            includeAndroidResources = true
+        }
+    }
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.0.0'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.0.0'
 
-    implementation 'com.google.code.gson:gson:2.8.5'
-    implementation 'com.squareup.okhttp3:okhttp:3.11.0'
+    def coroutines = "1.0.1"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines"
 
-    def retrofit = "2.4.0"
-    implementation "com.squareup.retrofit2:retrofit:$retrofit"
-    implementation "com.squareup.retrofit2:converter-gson:$retrofit"
-    implementation 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2'
+    def okhttp = "3.12.0"
+    implementation "com.squareup.okhttp3:okhttp:$okhttp"
 
     testImplementation 'junit:junit:4.12'
+    testImplementation 'org.robolectric:robolectric:4.0.2'
     testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
-    testImplementation "com.squareup.retrofit2:retrofit-mock:$retrofit"
+    testImplementation "com.squareup.okhttp3:mockwebserver:$okhttp"
 }
 
 apply from: 'build.publish.gradle'

studyplus-android-sdk2/lib-proguard-rules.txt

@@ -20,11 +20,6 @@
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
 
-# SDK2
-# Network Response
--keepnames class jp.studyplus.android.sdk.record.** { *; }
--keepnames class jp.studyplus.android.sdk.internal.api.response.** { *; }
-
 # Kotlin Coroutines
 # ServiceLoader support
 -keepnames class kotlinx.coroutines.internal.MainDispatcherFactory {}
@@ -35,27 +30,15 @@
     volatile <fields>;
 }
 
-# Stuire
+# OkHttp
 # JSR 305 annotations are for embedding nullability information.
 -dontwarn javax.annotation.**
+
 # A resource is loaded with a relative path so the package of this class must be preserved.
 -keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase
+
 # Animal Sniffer compileOnly dependency to ensure APIs are compatible with older versions of Java.
 -dontwarn org.codehaus.mojo.animal_sniffer.*
+
 # OkHttp platform used only on JVM and when Conscrypt dependency is available.
 -dontwarn okhttp3.internal.platform.ConscryptPlatform
-
-# Retrofit does reflection on generic parameters and InnerClass is required to use Signature.
--keepattributes Signature, InnerClasses
-# Retain service method parameters when optimizing.
--keepclassmembers,allowshrinking,allowobfuscation interface * {
-    @retrofit2.http.* <methods>;
-}
-# Ignore annotation used for build tooling.
--dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
-# Guarded by a NoClassDefFoundError try/catch and only used when on the classpath.
--dontwarn kotlin.Unit
-# Top-level functions that can only be used by Kotlin.
--dontwarn retrofit2.-KotlinExtensions
-
-

studyplus-android-sdk2/src/main/java/jp/studyplus/android/sdk/Studyplus.kt

@@ -74,8 +74,8 @@ class Studyplus private constructor() {
         runBlocking {
             try {
                 val deferred = ApiClient.postStudyRecords(context, studyRecord)
-                val result = deferred.await()
-                listener?.onResult(success = true, recordId = result.recordId)
+                val recordId = deferred.await()
+                listener?.onResult(success = true, recordId = recordId)
             } catch (t: Throwable) {
                 listener?.onResult(success = false, throwable = t)
             }

studyplus-android-sdk2/src/main/java/jp/studyplus/android/sdk/internal/api/ApiClient.kt

@@ -1,14 +1,11 @@
 package jp.studyplus.android.sdk.internal.api
 
 import android.content.Context
-import jp.studyplus.android.sdk.internal.api.response.PostStudyRecordsResponse
 import jp.studyplus.android.sdk.record.StudyRecord
 import kotlinx.coroutines.Deferred
 
 internal object ApiClient {
-    private val apiService by lazy { ApiManager.retrofit.create(ApiService::class.java) }
-
-    fun postStudyRecords(context: Context, studyRecord: StudyRecord): Deferred<PostStudyRecordsResponse> {
-        return apiService.postStudyRecords(CertificationStore.create(context).getOAuthAccessToken(), studyRecord)
+    fun postStudyRecords(context: Context, studyRecord: StudyRecord): Deferred<Long?> {
+        return ApiService(ApiManager.client).post(CertificationStore.create(context).getOAuthAccessToken(), studyRecord.toJson())
     }
 }

studyplus-android-sdk2/src/main/java/jp/studyplus/android/sdk/internal/api/ApiManager.kt

@@ -1,28 +1,14 @@
 package jp.studyplus.android.sdk.internal.api
 
-import com.jakewharton.retrofit2.adapter.kotlin.coroutines.CoroutineCallAdapterFactory
-import jp.studyplus.android.sdk.BuildConfig
 import okhttp3.OkHttpClient
-import retrofit2.Retrofit
-import retrofit2.converter.gson.GsonConverterFactory
 import java.util.concurrent.TimeUnit
 
 internal object ApiManager {
-
-    private val client: OkHttpClient by lazy {
+    val client: OkHttpClient by lazy {
         OkHttpClient.Builder()
                 .connectTimeout(60, TimeUnit.SECONDS)
                 .writeTimeout(60, TimeUnit.SECONDS)
                 .readTimeout(60, TimeUnit.SECONDS)
                 .build()
     }
-
-    val retrofit: Retrofit by lazy {
-        Retrofit.Builder()
-                .client(client)
-                .baseUrl(BuildConfig.API_ENDPOINT)
-                .addCallAdapterFactory(CoroutineCallAdapterFactory())
-                .addConverterFactory(GsonConverterFactory.create())
-                .build()
-    }
 }

studyplus-android-sdk2/src/main/java/jp/studyplus/android/sdk/internal/api/ApiService.kt

@@ -1,21 +1,69 @@
 package jp.studyplus.android.sdk.internal.api
 
-import jp.studyplus.android.sdk.internal.api.response.PostStudyRecordsResponse
-import jp.studyplus.android.sdk.record.StudyRecord
+import jp.studyplus.android.sdk.BuildConfig
+import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.Deferred
-import retrofit2.http.Body
-import retrofit2.http.Header
-import retrofit2.http.Headers
-import retrofit2.http.POST
-
-internal interface ApiService {
-    @Headers(value = [
-        "Accept: application/json",
-        "Content-type: application/json"
-    ])
-    @POST("/v1/study_records")
-    fun postStudyRecords(
-            @Header("Authorization") oauth: String,
-            @Body studyRecord: StudyRecord
-    ): Deferred<PostStudyRecordsResponse>
-}
+import okhttp3.*
+import org.json.JSONObject
+import java.io.IOException
+
+internal class ApiService(private val client: OkHttpClient) {
+    fun post(auth: String, json: String): Deferred<Long?> {
+        val body = createPostBody(json)
+        val request = Request.Builder()
+                .header("Accept", HEADER_JSON)
+                .header("Content-type", HEADER_JSON)
+                .addHeader("Authorization", auth)
+                .url("$ENDPOINT/v1/study_records")
+                .post(body)
+                .build()
+
+        return execute(client.newCall(request))
+    }
+
+    companion object {
+        private const val ENDPOINT = BuildConfig.API_ENDPOINT
+        private const val HEADER_JSON = "application/json"
+    }
+}
+
+private val JSON_MEDIA_TYPE = MediaType.parse("application/json; charset=utf-8")
+
+internal fun createPostBody(json: String) =
+        RequestBody.create(JSON_MEDIA_TYPE, json)
+
+internal fun execute(call: Call): Deferred<Long?> {
+    val deferred = CompletableDeferred<Long?>()
+    deferred.invokeOnCompletion {
+        if (deferred.isCancelled) {
+            call.cancel()
+        }
+    }
+
+    call.enqueue(object : Callback {
+        private val EMPTY_JSON = "{}"
+        private val RECORD_ID = "record_id"
+        private val INVALID_RECORD_ID = -1L
+
+        override fun onFailure(call: Call, e: IOException) {
+            deferred.completeExceptionally(e)
+        }
+
+        override fun onResponse(call: Call, response: Response) {
+            if (response.isSuccessful) {
+                val parsedJson = JSONObject(response.body()?.string() ?: EMPTY_JSON)
+                val recordId = parsedJson.optLong(RECORD_ID, INVALID_RECORD_ID)
+
+                if (recordId != INVALID_RECORD_ID) {
+                    deferred.complete(recordId)
+                } else {
+                    deferred.complete(null)
+                }
+            } else {
+                deferred.completeExceptionally(IOException(response.toString()))
+            }
+        }
+    })
+
+    return deferred
+}

studyplus-android-sdk2/src/main/java/jp/studyplus/android/sdk/internal/api/response/PostStudyRecordsResponse.kt

@@ -1,37 +1,40 @@
 package jp.studyplus.android.sdk.record
 
-import com.google.gson.annotations.SerializedName
 import jp.studyplus.android.sdk.record.StudyRecord.Companion.getTime
+import org.json.JSONObject
 import java.security.InvalidParameterException
 import java.text.SimpleDateFormat
 import java.util.*
 
 class StudyRecord {
-    companion object {
+    var recordedTime: String = getTime(GregorianCalendar(DATE_TIME_ZONE, DATE_LOCALE))
+
+    var duration: Int = 0
+    var comment: String = ""
+    var amountTotal: Int? = null
+    var startPosition: Int? = null
+    var endPosition: Int? = null
+
+    fun toJson() = JSONObject().apply {
+        put("recorded_at", recordedTime)
+        put("duration", duration)
+        put("comment", comment)
+        put("amountTotal", amountTotal)
+        put("start_position", startPosition)
+        put("end_position", endPosition)
+    }.toString()
 
+    companion object {
         private const val DATE_FORMAT = "yyyy'-'MM'-'dd' 'HH':'mm':'ss"
-        val DATE_LOCALE: Locale = Locale.US
-        val DATE_TIME_ZONE: TimeZone = TimeZone.getTimeZone("UTC")
+        private val DATE_LOCALE: Locale = Locale.US
+        private val DATE_TIME_ZONE: TimeZone = TimeZone.getTimeZone("UTC")
 
-        fun getTime(calendar: Calendar): String {
+        internal fun getTime(calendar: Calendar): String {
             val format = SimpleDateFormat(DATE_FORMAT, DATE_LOCALE)
             format.timeZone = calendar.timeZone
             return format.format(calendar.time)
         }
     }
-
-    @SerializedName("recorded_at")
-    var recordedTime: String = getTime(GregorianCalendar(DATE_TIME_ZONE, DATE_LOCALE))
-    @SerializedName("duration")
-    var duration: Int = 0
-    @SerializedName("comment")
-    var comment: String = ""
-    @SerializedName("amount")
-    var amountTotal: Int? = null
-    @SerializedName("start_position")
-    var startPosition: Int? = null
-    @SerializedName("end_position")
-    var endPosition: Int? = null
 }
 
 class StudyRecordBuilder {

studyplus-android-sdk2/src/main/java/jp/studyplus/android/sdk/record/StudyRecord.kt

@@ -4,20 +4,23 @@ import jp.studyplus.android.sdk.internal.api.MockApiClient
 import jp.studyplus.android.sdk.record.StudyRecordBuilder
 import kotlinx.coroutines.runBlocking
 import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
 import kotlin.test.assertEquals
 import kotlin.test.assertNull
 
+@RunWith(RobolectricTestRunner::class)
 class ApiUnitTest {
 
     @Test
     fun mockApi() {
         val record = StudyRecordBuilder().build()
         runBlocking {
             try {
-                val deferred = MockApiClient.apiClient.postStudyRecords(null, record)
-                val result = deferred.await()
+                val deferred = MockApiClient.postStudyRecords(null, record)
+                val recordId = deferred.await()
 
-                assertEquals(result.recordId, 9999L)
+                assertEquals(recordId, 9999L)
             } catch (t: Throwable) {
                 assertNull(t)
             }