内部処理改善

Author: koji-1009

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

@@ -15,7 +15,7 @@ constructor(retrofit: Retrofit) {
 
         private fun getOAuthAccessToken(context: Context): Observable<String> {
             return Observable.just(CertificationStore.create(context))
-                    .map { it.apiCertification.accessToken }
+                    .map { it.apiCertification() }
                     .map { "OAuth $it" }
         }
     }

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

@@ -1,36 +1,19 @@
 package jp.studyplus.android.sdk.internal.api
 
-import com.google.gson.FieldNamingPolicy
-import com.google.gson.GsonBuilder
 import jp.studyplus.android.sdk.BuildConfig
 import okhttp3.OkHttpClient
-import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
 import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory
 import retrofit2.converter.gson.GsonConverterFactory
 import java.util.concurrent.TimeUnit
 
 internal object ApiManager {
 
-    private val loggingLevel: HttpLoggingInterceptor.Level
-        get() = if (BuildConfig.DEBUG) {
-            HttpLoggingInterceptor.Level.BODY
-        } else {
-            HttpLoggingInterceptor.Level.NONE
-        }
-
-    private val gson by lazy {
-        GsonBuilder()
-                .setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES)
-                .create()
-    }
-
     private val client by lazy {
         OkHttpClient.Builder()
                 .connectTimeout(60, TimeUnit.SECONDS)
                 .writeTimeout(60, TimeUnit.SECONDS)
                 .readTimeout(60, TimeUnit.SECONDS)
-                .addInterceptor(HttpLoggingInterceptor().setLevel(loggingLevel))
                 .build()
     }
 
@@ -39,7 +22,7 @@ internal object ApiManager {
                 .client(client)
                 .baseUrl(BuildConfig.API_ENDPOINT)
                 .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
-                .addConverterFactory(GsonConverterFactory.create(gson))
+                .addConverterFactory(GsonConverterFactory.create())
                 .build()!!
     }
 }

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

@@ -5,11 +5,6 @@ import android.content.Intent
 import android.content.SharedPreferences
 import android.net.Uri
 import jp.studyplus.android.sdk.BuildConfig
-import jp.studyplus.android.sdk.internal.auth.AccessTokenNotFound
-
-internal interface ApiCertification {
-    val accessToken: String
-}
 
 internal class CertificationStore
 private constructor(private val preferences: SharedPreferences) {
@@ -34,14 +29,7 @@ private constructor(private val preferences: SharedPreferences) {
         return !token.isNullOrEmpty()
     }
 
-    val apiCertification: ApiCertification
-        get() {
-            val token = preferences.getString(KEY_ACCESS_TOKEN, "")
-            if (token.isNullOrEmpty()) {
-                throw AccessTokenNotFound()
-            }
-            return ApiCertificationImpl(token)
-        }
+    fun apiCertification(): String = preferences.getString(KEY_ACCESS_TOKEN, "")
 
     fun update(data: Intent) {
         val code = data.getStringExtra(EXTRA_SP_AUTH_RESULT_CODE).orEmpty()
@@ -52,7 +40,4 @@ private constructor(private val preferences: SharedPreferences) {
             }
         }
     }
-
-    private class ApiCertificationImpl
-    constructor(override val accessToken: String) : ApiCertification
 }

studyplus-android-sdk2/src/main/java/jp/studyplus/android/sdk/internal/auth/AuthTransit.kt

@@ -5,8 +5,6 @@ import android.content.Intent
 import android.net.Uri
 import jp.studyplus.android.sdk.R
 
-class AccessTokenNotFound : RuntimeException()
-
 internal class AuthTransit
 /**
  * @param consumerKey for API