优化Converter

Author: catch-pig

app/src/main/java/com/catchpig/kmvvm/network/ResponseBodyConverter.kt

@@ -5,7 +5,7 @@ import com.catchpig.mvvm.network.data.BaseResponseData
 import kotlin.reflect.KClass
 
 class ResponseBodyConverter :
-    BaseResponseBodyConverter<Any>() {
+    BaseResponseBodyConverter() {
     override fun getResultClass(): KClass<out BaseResponseData<*>> {
         return Result::class
     }

compiler/src/main/java/com/catchpig/compiler/ServiceApiProcessor.kt

@@ -31,8 +31,6 @@ class ServiceApiProcessor : BaseProcessor() {
         private val CLASS_NAME_GSON = ClassName("com.google.gson", "Gson")
         private val CLASS_NAME_BASE_RESPONSE_BODY_CONVERTER =
             ClassName("com.catchpig.mvvm.network.converter", "BaseResponseBodyConverter")
-        private val CLASS_NAME_BASE_RESPONSE_BODY_CONVERTER_OF_ANY =
-            CLASS_NAME_BASE_RESPONSE_BODY_CONVERTER.parameterizedBy(ANY)
         private val CLASS_NAME_GSON_RESPONSE_BODY_CONVERTER =
             ClassName("com.catchpig.mvvm.network.converter", "GsonResponseBodyConverter")
         private val CLASS_NAME_CONVERTER =
@@ -190,7 +188,7 @@ class ServiceApiProcessor : BaseProcessor() {
             .addStatement("  }")
             .addStatement("}")
             .addStatement("when(bodyConverter){")
-            .addStatement("  is %T ->{", CLASS_NAME_BASE_RESPONSE_BODY_CONVERTER_OF_ANY)
+            .addStatement("  is %T ->{", CLASS_NAME_BASE_RESPONSE_BODY_CONVERTER)
             .addStatement("   bodyConverter.gson = gson")
             .addStatement("   bodyConverter.typeAdapter = typeAdapter")
             .addStatement("   bodyConverter.responseType = type")

mvvm/src/main/java/com/catchpig/mvvm/network/converter/BaseResponseBodyConverter.kt

@@ -9,20 +9,21 @@ import java.lang.reflect.ParameterizedType
 import java.lang.reflect.Type
 import kotlin.reflect.KClass
 
-open abstract class BaseResponseBodyConverter<T> : Converter<ResponseBody, T> {
+open abstract class BaseResponseBodyConverter : Converter<ResponseBody, Any> {
     companion object {
         private const val LIST_EMPTY = "[]"
         private const val MAP_EMPTY = "{}"
         private const val STRING_EMPTY = "\"\""
         private const val NUMBER_ZERO = "0"
     }
-    lateinit var typeAdapter: TypeAdapter<out T>
+
+    lateinit var typeAdapter: TypeAdapter<Any>
     lateinit var responseType: Type
     lateinit var gson: Gson
 
     abstract fun getResultClass(): KClass<out BaseResponseData<*>>
 
-    override fun convert(value: ResponseBody): T? {
+    override fun convert(value: ResponseBody): Any? {
         value.use { value ->
             val valueString = value.string()
             val result: BaseResponseData<*> = gson.fromJson(valueString, getResultClass().java)