Merge pull request #12 from GSculerlor/better-throwing

Better exception handing
GSculerlor · May 5, 2020 · 51e50c7 · 51e50c7
2 parents 0fe939e + c22a6d1
commit 51e50c7
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 18 deletions.
diff --git a/src/main/kotlin/moe/ganen/jikankt/JikanKt.kt b/src/main/kotlin/moe/ganen/jikankt/JikanKt.kt
@@ -28,7 +28,7 @@ import moe.ganen.jikankt.utils.InterfaceAdapter
 import moe.ganen.jikankt.utils.deserialize
 
 object JikanKt {
-    private val restClient = RestClient()
+    internal var restClient = RestClient(false)
     private val gson = GsonBuilder().registerTypeAdapter(Entity::class.java, InterfaceAdapter<Entity>()).create()
 
     //region Anime

diff --git a/src/main/kotlin/moe/ganen/jikankt/connection/RestClient.kt b/src/main/kotlin/moe/ganen/jikankt/connection/RestClient.kt
@@ -11,9 +11,8 @@ import io.ktor.http.HttpHeaders
 import io.ktor.http.HttpMethod
 import moe.ganen.jikankt.JikanClient
 import moe.ganen.jikankt.exception.JikanException
-import moe.ganen.jikankt.exception.TooManyRequestException
 
-class RestClient : JikanClient() {
+class RestClient(private val isDebug: Boolean) : JikanClient() {
     private val client = httpClient
     private val gson = Gson()
 
@@ -49,26 +48,44 @@ class RestClient : JikanClient() {
             logger.debug("Response from Jikan: ${response.status.value}, body: $json")
 
             if (response.status.value !in 200..299) {
-                if (response.status.value in 500..599)
-                    throw Exception("An internal server error has occurred, code: ${response.status.value}")
+                if (response.status.value in 500..599) {
+                    val ex = Exception("An internal server error has occurred, code: ${response.status.value}")
+                    if (isDebug)
+                        throw ex
+                    else
+                        exceptionHandler(ex)
+                } else {
+                    val ex = JikanException(
+                        "Jikan API returns code ${response.status.value} and body ${json?.toString()}",
+                        response.status.value
+                    )
 
-                throw JikanException(
-                    "Jikan API returns code ${response.status.value} and body ${json?.toString()}",
-                    response.status.value
-                )
+                    if (isDebug)
+                        throw ex
+                    else
+                        exceptionHandler(ex)
+                }
             }
 
             return json ?: JsonObject()
-        } catch (ex: JikanException) {
-            throw ex
-        } catch (ex: TooManyRequestException) {
-            throw ex
         } catch (ex: Exception) {
-            logger.error(ex) { "An unexpected error has occurred!" }
-            throw ex
+            if (!isDebug) {
+                return exceptionHandler(ex, "An unexpected error has occurred!")
+            } else
+                throw ex
         }
     }
 
+    private fun exceptionHandler(ex: java.lang.Exception, message: String? = null) : JsonObject {
+        if (message.isNullOrEmpty())
+            logger.error { "Something went wrong! Exception: ${ex.localizedMessage}" }
+        else
+            logger.error(ex) { message }
+
+        //Will return empty json object instead
+        return JsonObject()
+    }
+
     companion object {
         private const val BASE_URL = "https://api.jikan.moe/v3/"
     }

diff --git a/src/test/kotlin/moe/ganen/jikankt/TestCaseSearch.kt b/src/test/kotlin/moe/ganen/jikankt/TestCaseSearch.kt
@@ -1,10 +1,12 @@
 package moe.ganen.jikankt
 
 import kotlinx.coroutines.runBlocking
+import moe.ganen.jikankt.connection.RestClient
 import moe.ganen.jikankt.exception.JikanException
 import moe.ganen.jikankt.models.base.types.CharacterSearchSubEntity
 import moe.ganen.jikankt.models.base.types.MalSubEntity
 import moe.ganen.jikankt.models.base.types.PeopleSearchSubEntity
+import moe.ganen.jikankt.models.search.CharacterSearchResult
 import org.junit.Assert.assertEquals
 import org.junit.Test
 
@@ -34,9 +36,24 @@ class TestCaseSearch {
         assertEquals(expected, result)
     }
 
+    @Test
+    fun `test search random character return empty`() {
+        val jikan = JikanKt.apply {
+            restClient = RestClient(false)
+        }
+
+        val expected = CharacterSearchResult()
+        val result = runBlocking { jikan.searchCharacter("Bjir") }
+
+        assertEquals(expected, result)
+    }
+
     @Test(expected = JikanException::class)
-    fun `test search random character`() {
-        runBlocking { JikanKt.searchCharacter("Bjir").results?.get(0) }
+    fun `test search random character return exception`() {
+        val jikan = JikanKt.apply {
+            restClient = RestClient(true)
+        }
+        runBlocking { jikan.searchCharacter("Bjir").results?.get(0) }
     }
 
     @Test
@@ -52,7 +69,7 @@ class TestCaseSearch {
         assertEquals(expected.name, result?.name)
     }
 
-    @Test()
+    @Test
     fun `test search random people`() {
         val result = runBlocking { JikanKt.searchPeople("Bjir").results }
         assertEquals(0, result?.size)