Skip to content

Commit 0db7506

Browse files
theapache64theapache64
committed
Improve flow
1 parent d92960e commit 0db7506

File tree

10 files changed

+143
-38
lines changed

10 files changed

+143
-38
lines changed

‎call-adapters/build.gradle

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
plugins {
2+
id 'java'
3+
id 'org.jetbrains.kotlin.jvm'
4+
}
5+
6+
group 'com.theapache64'
7+
version '1.1.0'
8+
9+
repositories {
10+
mavenCentral()
11+
}
12+
13+
dependencies {
14+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
15+
testCompile group: 'junit', name: 'junit', version: '4.12'
16+
17+
// Retrofit : A type-safe HTTP client for Android and Java.
18+
implementation 'com.squareup.retrofit2:retrofit:2.9.0'
19+
20+
// Moshi : Moshi
21+
implementation 'com.squareup.moshi:moshi:1.9.3'
22+
23+
// Moshi Kotlin : Moshi Kotlin
24+
implementation 'com.squareup.moshi:moshi-kotlin:1.9.3'
25+
26+
// Kotlinx Coroutines Core : Coroutines support libraries for Kotlin
27+
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8-1.4.0-rc'
28+
}
29+
30+
compileKotlin {
31+
kotlinOptions.jvmTarget = "1.8"
32+
}
33+
compileTestKotlin {
34+
kotlinOptions.jvmTarget = "1.8"
35+
}

‎call-adapters/gpm.json

+60
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
{
2+
"added": [
3+
{
4+
"id": 1,
5+
"type": "implementation",
6+
"installed_name": "retrofit",
7+
"gpm_dep": {
8+
"artifact_id": "retrofit",
9+
"default_type": "implementation",
10+
"docs": "https://mvnrepository.com/artifact/com.squareup.retrofit2/retrofit",
11+
"get_from": "Central",
12+
"group_id": "com.squareup.retrofit2",
13+
"name": "Retrofit",
14+
"description": "A type-safe HTTP client for Android and Java."
15+
}
16+
},
17+
{
18+
"id": 2,
19+
"type": "implementation",
20+
"installed_name": "moshi",
21+
"gpm_dep": {
22+
"artifact_id": "moshi",
23+
"default_type": "implementation",
24+
"docs": "https://mvnrepository.com/artifact/com.squareup.moshi/moshi",
25+
"get_from": "Central",
26+
"group_id": "com.squareup.moshi",
27+
"name": "Moshi",
28+
"description": "Moshi"
29+
}
30+
},
31+
{
32+
"id": 3,
33+
"type": "implementation",
34+
"installed_name": "moshi-kotlin",
35+
"gpm_dep": {
36+
"artifact_id": "moshi-kotlin",
37+
"default_type": "implementation",
38+
"docs": "https://mvnrepository.com/artifact/com.squareup.moshi/moshi-kotlin",
39+
"get_from": "Central",
40+
"group_id": "com.squareup.moshi",
41+
"name": "Moshi Kotlin",
42+
"description": "Moshi Kotlin"
43+
}
44+
},
45+
{
46+
"id": 4,
47+
"type": "implementation",
48+
"installed_name": "coroutines",
49+
"gpm_dep": {
50+
"artifact_id": "kotlinx-coroutines-core",
51+
"default_type": "implementation",
52+
"docs": "https://mvnrepository.com/artifact/org.jetbrains.kotlinx/kotlinx-coroutines-core",
53+
"get_from": "Central",
54+
"group_id": "org.jetbrains.kotlinx",
55+
"name": "Kotlinx Coroutines Core",
56+
"description": "Coroutines support libraries for Kotlin"
57+
}
58+
}
59+
]
60+
}

‎src/main/kotlin/com/theapache64/retrosheet/sample/flow/FlowResourceCallAdapter.kt ‎call-adapters/src/main/kotlin/com/theapache64/retrofit/calladapter/flow/FlowResourceCallAdapter.kt

+13-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
package com.theapache64.retrosheet.sample.flow
1+
package com.theapache64.retrofit.calladapter.flow
22

3-
import com.theapache64.retrosheet.sample.Resource
3+
import com.theapache64.retrofit.calladapter.flow.Resource.Error
4+
import com.theapache64.retrofit.calladapter.flow.Resource.Success
45
import kotlinx.coroutines.ExperimentalCoroutinesApi
56
import kotlinx.coroutines.flow.Flow
67
import kotlinx.coroutines.flow.catch
@@ -31,17 +32,22 @@ class FlowResourceCallAdapter<R>(
3132

3233
if (resp.isSuccessful) {
3334
resp.body()?.let { data ->
34-
emit(Resource.Success(null, data))
35+
// Success
36+
emit(Success(null, data))
3537
} ?: kotlin.run {
36-
emit(Resource.Error(Throwable("Response can't be null")))
38+
// Error
39+
emit(Error("Response can't be null"))
3740
}
3841
} else {
39-
emit(Resource.Error(Throwable(resp.message())))
42+
// Error
43+
println("Hit!")
44+
val errorBody = resp.message()
45+
emit(Error(errorBody))
4046
}
4147

42-
}.catch { error ->
48+
}.catch { error: Throwable ->
4349
if (isSelfExceptionHandling) {
44-
emit(Resource.Error(error))
50+
emit(Error(error.message ?: "Something went wrong"))
4551
} else {
4652
throw error
4753
}

‎src/main/kotlin/com/theapache64/retrosheet/sample/flow/FlowResourceCallAdapterFactory.kt ‎call-adapters/src/main/kotlin/com/theapache64/retrofit/calladapter/flow/FlowResourceCallAdapterFactory.kt

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
package com.theapache64.retrosheet.sample.flow
1+
package com.theapache64.retrofit.calladapter.flow
22

33

4-
import com.theapache64.retrosheet.sample.Resource
54
import kotlinx.coroutines.flow.Flow
65
import retrofit2.CallAdapter
76
import retrofit2.CallAdapter.Factory
@@ -25,6 +24,9 @@ class FlowResourceCallAdapterFactory(
2524
require(rawObservableType == Resource::class.java) { "type must be a resource" }
2625
require(observableType is ParameterizedType) { "resource must be parameterized" }
2726
val bodyType = getParameterUpperBound(0, observableType)
28-
return FlowResourceCallAdapter<Any>(bodyType, isSelfExceptionHandling)
27+
return FlowResourceCallAdapter<Any>(
28+
bodyType,
29+
isSelfExceptionHandling
30+
)
2931
}
3032
}

‎src/main/kotlin/com/theapache64/retrosheet/sample/Result.kt ‎call-adapters/src/main/kotlin/com/theapache64/retrofit/calladapter/flow/Result.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.theapache64.retrosheet.sample
1+
package com.theapache64.retrofit.calladapter.flow
22

33
/**
44
* Created by theapache64 : Jul 26 Sun,2020 @ 13:22
@@ -13,6 +13,6 @@ sealed class Resource<T> {
1313
) : Resource<T>()
1414

1515
data class Error<T>(
16-
val message: Throwable
16+
val errorData: String
1717
) : Resource<T>()
1818
}

‎retrosheet/src/main/kotlin/com/theapache64/retrosheet/RetrosheetInterceptor.kt

+19-10
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
package com.theapache64.retrosheet
22

3-
import com.theapache64.retrosheet.core.SheetVerifier
4-
import com.theapache64.retrosheet.core.UrlBuilder
5-
import com.theapache64.retrosheet.core.either.ApiError
6-
import com.theapache64.retrosheet.core.either.ApiErrorJsonAdapter
7-
import com.theapache64.retrosheet.core.either.SheetErrorJsonAdapter
3+
import com.theapache64.retrosheet.core.*
84
import com.theapache64.retrosheet.utils.CsvConverter
95
import com.theapache64.retrosheet.utils.JsonValidator
106
import com.theapache64.retrosheet.utils.MoshiUtils
@@ -29,6 +25,8 @@ private constructor(
2925
private const val URL_START = "https://docs.google.com/spreadsheets/d"
3026
private const val ERROR_NO_COLUMN_START = "Invalid query: NO_COLUMN"
3127
private const val SIGNATURE_LIST_CONTAINS = "java/util/List"
28+
private const val PACKAGE_LIST_CONTAINS = "java.util.List"
29+
private const val TYPE_OBJECT = "class java.lang.Object"
3230
const val ERROR_UNKNOWN = "Something went wrong"
3331

3432
private val URL_REGEX by lazy {
@@ -46,10 +44,21 @@ private constructor(
4644

4745
private fun isReturnTypeList(request: Request): Boolean {
4846
val method = request.tag(Invocation::class.java)?.method()
49-
val f = Method::class.java.getDeclaredField("signature")
50-
f.isAccessible = true
51-
val signature = f.get(method).toString()
52-
return signature.contains(SIGNATURE_LIST_CONTAINS)
47+
val genericReturnType = method?.genericReturnType?.toString()
48+
return if (genericReturnType != null && genericReturnType != TYPE_OBJECT) {
49+
genericReturnType.contains(PACKAGE_LIST_CONTAINS)
50+
} else {
51+
// go for hard reflection
52+
try {
53+
val f = Method::class.java.getDeclaredField("signature")
54+
f.isAccessible = true
55+
val signature = f.get(method).toString()
56+
signature.contains(SIGNATURE_LIST_CONTAINS)
57+
} catch (e: NoSuchFieldException) {
58+
false
59+
}
60+
}
61+
5362
}
5463

5564
}
@@ -120,7 +129,7 @@ private constructor(
120129
// Telling it's an error
121130
responseBuilder
122131
.code(HttpsURLConnection.HTTP_BAD_REQUEST)
123-
.message(jsonRoot)
132+
.message(apiError.message)
124133
} else {
125134

126135
// It's the CSV.

‎retrosheet/src/main/kotlin/com/theapache64/retrosheet/core/either/ApiError.kt ‎retrosheet/src/main/kotlin/com/theapache64/retrosheet/core/ApiError.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.theapache64.retrosheet.core.either
1+
package com.theapache64.retrosheet.core
22

33
import com.squareup.moshi.Json
44
import com.squareup.moshi.JsonClass

‎retrosheet/src/main/kotlin/com/theapache64/retrosheet/core/either/SheetError.kt ‎retrosheet/src/main/kotlin/com/theapache64/retrosheet/core/SheetError.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.theapache64.retrosheet.core.either
1+
package com.theapache64.retrosheet.core
22

33
import com.squareup.moshi.Json
44
import com.squareup.moshi.JsonClass

‎src/main/kotlin/com/theapache64/retrosheet/sample/Main.kt

+5-6
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ package com.theapache64.retrosheet.sample
22

33
import com.squareup.moshi.Moshi
44
import com.theapache64.retrofit.calladapter.either.EitherCallAdapterFactory
5+
import com.theapache64.retrofit.calladapter.flow.FlowResourceCallAdapterFactory
56
import com.theapache64.retrosheet.RetrosheetInterceptor
6-
import com.theapache64.retrosheet.sample.flow.FlowResourceCallAdapterFactory
7-
import kotlinx.coroutines.flow.collect
87
import kotlinx.coroutines.runBlocking
98
import okhttp3.OkHttpClient
109
import retrofit2.Retrofit
@@ -45,7 +44,7 @@ fun main() = runBlocking {
4544

4645
val nemoApi = retrofit.create(NemoApi::class.java)
4746

48-
nemoApi.getProductsFlow().collect {
47+
/*nemoApi.getProducts().collect {
4948
when (it) {
5049
is Resource.Loading -> {
5150
println("Loading products...")
@@ -54,11 +53,11 @@ fun main() = runBlocking {
5453
println("Got products... ${it.data}")
5554
}
5655
is Resource.Error -> {
57-
println("Failed to get products : ${it.message}")
56+
println("Failed to get products : ${it.errorData}")
5857
}
5958
}
60-
}
59+
}*/
6160

62-
// println(nemoApi.getProducts())
61+
println(nemoApi.getProducts())
6362
Unit
6463
}

‎src/main/kotlin/com/theapache64/retrosheet/sample/NemoApi.kt

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,12 @@
11
package com.theapache64.retrosheet.sample
22

3-
import com.theapache64.retrofit.calladapter.either.Either
43
import com.theapache64.retrosheet.core.SheetQuery
5-
import com.theapache64.retrosheet.core.either.ApiError
6-
import kotlinx.coroutines.flow.Flow
74
import retrofit2.http.GET
85

96
interface NemoApi {
107

11-
@SheetQuery("SELECT id, title, image_url")
12-
@GET("products") // sheetName
13-
suspend fun getProducts(): Either<ApiError, List<Product>>
148

159
@SheetQuery("SELECT id, title, image_url")
1610
@GET("products") // sheetName
17-
fun getProductsFlow(): Flow<Resource<List<Product>>>
18-
}
11+
suspend fun getProducts(): List<Product>
12+
}

0 commit comments

Comments
 (0)