added method to add interceptor

Author: shishir5

zcnetwork/src/main/java/com/zoomcar/zcnetwork/core/ZcNetworkBuilder.kt

@@ -3,6 +3,7 @@ package com.zoomcar.zcnetwork.core
 import android.app.Activity
 import androidx.fragment.app.Fragment
 import com.zoomcar.zcnetwork.utils.ZcRequestType
+import okhttp3.Interceptor
 
 /*
   * @created 08/01/2020 - 12:35 PM
@@ -22,6 +23,7 @@ class ZcNetworkBuilder {
     private lateinit var requestType: ZcRequestType
     private var useDefaultService: Boolean = true
     private var baseUrl: String? = null
+    private var interceptors: MutableList<Interceptor> = mutableListOf()
 
     fun setActivity(activity: Activity): ZcNetworkBuilder = apply { this.activity = activity }
     fun setFragment(fragment: Fragment): ZcNetworkBuilder = apply { this.fragment = fragment }
@@ -40,7 +42,11 @@ class ZcNetworkBuilder {
     fun setListener(listener: ZcNetworkListener): ZcNetworkBuilder =
         apply { this.listener = listener }
 
+    fun addInterceptor(interceptor: Interceptor): ZcNetworkBuilder =
+        apply { this.interceptors.add(interceptor)}
+
     fun setTag(tag: String): ZcNetworkBuilder = apply { this.tag = tag }
+    fun addInterceptor(tag: String): ZcNetworkBuilder = apply { this.tag = tag }
     fun setUrl(url: String): ZcNetworkBuilder = apply { this.url = url }
     fun setRequestType(requestType: ZcRequestType) = apply { this.requestType = requestType }
     fun setBaseUrl(baseUrl: String) = apply { this.baseUrl = baseUrl }
@@ -57,7 +63,8 @@ class ZcNetworkBuilder {
             tag,
             url,
             useDefaultService,
-            bodyParams
+            bodyParams,
+            interceptors
         )
     }
 }

zcnetwork/src/main/java/com/zoomcar/zcnetwork/core/ZcNetworkManager.kt

@@ -18,6 +18,7 @@ import com.zoomcar.zcnetwork.utils.NetworkResponseStatus.FAILURE
 import com.zoomcar.zcnetwork.utils.NetworkResponseStatus.SUCCESS
 import com.zoomcar.zcnetwork.utils.ZcRequestType
 import com.zoomcar.zcnetwork.utils.getTimeDifferenceInMillis
+import okhttp3.Interceptor
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -33,6 +34,7 @@ object ZcNetworkManager {
     private var zcRequestManager: ZcRequestManager? = null
     private var isDebugLogEnabled: Boolean = false
     private var baseUrl: String? = null
+    private var interceptors: MutableList<Interceptor> = mutableListOf()
 
     fun builder(applicationContext: Context): ZcNetworkManager =
         apply { this.applicationContext = applicationContext }
@@ -45,14 +47,19 @@ object ZcNetworkManager {
             this.analyticsListener = analyticsListener
         }
 
+    fun addInterceptor(interceptor: Interceptor): ZcNetworkManager =
+        apply {
+            this.interceptors.add(interceptor)
+        }
+
     fun addBaseUrl(baseUrl: String?): ZcNetworkManager = apply { this.baseUrl = baseUrl }
 
     fun build() {
         if (this.baseUrl == null) throw java.lang.IllegalArgumentException(
             CustomExceptions.NO_BASE_URL
         )
         zcRequestManager =
-            ZcRequestManager.getInstance(applicationContext, isDebugLogEnabled, baseUrl!!)
+            ZcRequestManager.getInstance(applicationContext, isDebugLogEnabled, baseUrl!!, interceptors)
     }
 
     fun request(
@@ -66,7 +73,8 @@ object ZcNetworkManager {
         tag: String? = null,
         url: String,
         defaultService: Boolean = true,
-        bodyParams: HashMap<String, Any>
+        bodyParams: HashMap<String, Any>,
+        interceptors: MutableList<Interceptor>
     ) {
 
         if (zcRequestManager == null) throw IllegalArgumentException(NOT_INITIALIZED)
@@ -153,7 +161,7 @@ object ZcNetworkManager {
         val call: Call<JsonElement>?
         if (defaultService) {
             val apiService =
-                ZcRequestManager.getInstance(applicationContext, baseUrl = this.baseUrl!!)
+                ZcRequestManager.getInstance(applicationContext, baseUrl = this.baseUrl!!, interceptor = interceptors)
                     .getDefaultApiService()
             call = when (requestType) {
                 ZcRequestType.GET -> apiService.getResource(url, requestParams)
@@ -171,7 +179,7 @@ object ZcNetworkManager {
         applicationContext: Context
     ) {
         if (headerParams != null) {
-            ZcRequestManager.getInstance(applicationContext, baseUrl = baseUrl!!)
+            ZcRequestManager.getInstance(applicationContext, baseUrl = baseUrl!!, interceptor = interceptors)
                 .setHeaderParams(headerParams)
         }
     }

zcnetwork/src/main/java/com/zoomcar/zcnetwork/core/ZcRequestManager.kt

@@ -5,6 +5,7 @@ import com.readystatesoftware.chuck.ChuckInterceptor
 import com.zoomcar.zcnetwork.utils.TimeoutDefaults
 import com.zoomcar.zcnetwork.utils.TimeoutHeaders
 import okhttp3.HttpUrl
+import okhttp3.Interceptor
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.logging.HttpLoggingInterceptor
@@ -20,7 +21,8 @@ import java.util.concurrent.TimeUnit
 class ZcRequestManager(
     private val applicationContext: Context,
     private val isDebugLogEnabled: Boolean,
-    baseUrl: String
+    baseUrl: String,
+    private val interceptors: List<Interceptor>
 ) {
 
     private lateinit var defaultApiService: ZcApiService
@@ -41,11 +43,17 @@ class ZcRequestManager(
         fun getInstance(
             applicationContext: Context,
             debugLogEnabled: Boolean = false,
-            baseUrl: String
+            baseUrl: String,
+            interceptor: List<Interceptor> = listOf()
         ) =
             instance ?: synchronized(applicationContext) {
                 instance
-                    ?: ZcRequestManager(applicationContext, debugLogEnabled, baseUrl).also {
+                    ?: ZcRequestManager(
+                        applicationContext,
+                        debugLogEnabled,
+                        baseUrl,
+                        interceptor
+                    ).also {
                         instance = it
                     }
             }
@@ -90,6 +98,9 @@ class ZcRequestManager(
             val logging = HttpLoggingInterceptor()
             logging.level = HttpLoggingInterceptor.Level.BODY
             builder.addInterceptor(logging)
+            interceptors.map {
+                builder.addInterceptor(it)
+            }
             builder.addInterceptor(ChuckInterceptor(applicationContext))
         }
 

zcnetwork/src/main/java/com/zoomcar/zcnetwork/models/BaseErrorVO.kt

@@ -11,6 +11,7 @@ import kotlinx.android.parcel.RawValue
 @JsonObject
 open class BaseErrorVO : Parcelable {
     @JsonField
+    @SerializedName(value = "status")
     var status: Int = 0
 
     @SerializedName(value = "error_code")
@@ -21,12 +22,15 @@ open class BaseErrorVO : Parcelable {
     @JsonField(name = ["error_title"])
     var errorTitle: String? = null
 
+    @SerializedName("msg")
     @JsonField
     var msg: String? = null
 
     @JsonField
+    @SerializedName("httpStatusCode")
     var httpStatusCode: Int = 0
 
     @JsonField(name = ["metadata"])
+    @SerializedName("metadata")
     var metadata: MutableMap<String, @RawValue Any?>? = null
 }