Removed SlackService class and moved the API creation to the SlackApi…

… class.
CodemateLtd · Feb 3, 2017 · 3b797f9 · 3b797f9
1 parent 600f538
commit 3b797f9
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 42 deletions.
diff --git a/app/src/main/java/com/codemate/koffeemate/data/network/SlackApi.kt b/app/src/main/java/com/codemate/koffeemate/data/network/SlackApi.kt
@@ -8,6 +8,9 @@ import okhttp3.MultipartBody
 import okhttp3.RequestBody
 import okhttp3.ResponseBody
 import retrofit2.Response
+import retrofit2.Retrofit
+import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory
+import retrofit2.converter.gson.GsonConverterFactory
 import retrofit2.http.*
 import rx.Observable
 
@@ -39,5 +42,15 @@ interface SlackApi {
 
     companion object {
         val BASE_URL = HttpUrl.parse("https://slack.com/api/")!!
+
+        fun create(baseUrl: HttpUrl): SlackApi {
+            val retrofit = Retrofit.Builder()
+                    .baseUrl(baseUrl)
+                    .addConverterFactory(GsonConverterFactory.create())
+                    .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
+                    .build()
+
+            return retrofit.create(SlackApi::class.java)
+        }
     }
 }
diff --git a/app/src/main/java/com/codemate/koffeemate/data/network/SlackService.kt b/app/src/main/java/com/codemate/koffeemate/data/network/SlackService.kt
diff --git a/app/src/main/java/com/codemate/koffeemate/di/modules/NetModule.kt b/app/src/main/java/com/codemate/koffeemate/di/modules/NetModule.kt
@@ -16,7 +16,7 @@
 
 package com.codemate.koffeemate.di.modules
 
-import com.codemate.koffeemate.data.network.SlackService
+import com.codemate.koffeemate.data.network.SlackApi
 import dagger.Module
 import dagger.Provides
 import okhttp3.HttpUrl
@@ -26,5 +26,5 @@ import javax.inject.Singleton
 class NetModule(val baseUrl: HttpUrl) {
     @Provides
     @Singleton
-    fun provideApi() = SlackService.getApi(baseUrl)
+    fun provideApi() = SlackApi.create(baseUrl)
 }
diff --git a/app/src/test/java/com/codemate/koffeemate/usecases/LoadUsersUseCaseTest.kt b/app/src/test/java/com/codemate/koffeemate/usecases/LoadUsersUseCaseTest.kt
@@ -20,7 +20,6 @@ import com.codemate.koffeemate.BuildConfig
 import com.codemate.koffeemate.data.local.UserRepository
 import com.codemate.koffeemate.data.models.User
 import com.codemate.koffeemate.data.network.SlackApi
-import com.codemate.koffeemate.data.network.SlackService
 import com.codemate.koffeemate.testutils.getResourceFile
 import com.nhaarman.mockito_kotlin.verify
 import com.nhaarman.mockito_kotlin.whenever
@@ -52,7 +51,7 @@ class LoadUsersUseCaseTest {
         mockServer = MockWebServer()
         mockServer.start()
 
-        slackApi = SlackService.getApi(mockServer.url("/"))
+        slackApi = SlackApi.create(mockServer.url("/"))
         useCase = LoadUsersUseCase(
                 mockUserRepository,
                 slackApi,

diff --git a/app/src/test/java/com/codemate/koffeemate/usecases/PostAccidentUseCaseTest.kt b/app/src/test/java/com/codemate/koffeemate/usecases/PostAccidentUseCaseTest.kt
@@ -23,7 +23,6 @@ import com.codemate.koffeemate.common.AwardBadgeCreator
 import com.codemate.koffeemate.data.local.CoffeeEventRepository
 import com.codemate.koffeemate.data.local.CoffeePreferences
 import com.codemate.koffeemate.data.network.SlackApi
-import com.codemate.koffeemate.data.network.SlackService
 import com.codemate.koffeemate.testutils.RegexMatcher.Companion.matchesPattern
 import com.codemate.koffeemate.testutils.fakeUser
 import com.codemate.koffeemate.testutils.getResourceFile
@@ -75,7 +74,7 @@ class PostAccidentUseCaseTest {
         whenever(mockAwardBadgeCreator.createBitmapFileWithAward(mockBitmap, 1))
                 .thenReturn(getResourceFile("images/empty.png"))
 
-        slackApi = SlackService.getApi(mockServer.url("/"))
+        slackApi = SlackApi.create(mockServer.url("/"))
         useCase = PostAccidentUseCase(
                 slackApi,
                 mockCoffeeEventRepository,

diff --git a/app/src/test/java/com/codemate/koffeemate/usecases/SendCoffeeAnnouncementUseCaseTest.kt b/app/src/test/java/com/codemate/koffeemate/usecases/SendCoffeeAnnouncementUseCaseTest.kt
@@ -18,7 +18,6 @@ package com.codemate.koffeemate.usecases
 
 import com.codemate.koffeemate.BuildConfig
 import com.codemate.koffeemate.data.network.SlackApi
-import com.codemate.koffeemate.data.network.SlackService
 import okhttp3.ResponseBody
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.MockWebServer
@@ -48,7 +47,7 @@ class SendCoffeeAnnouncementUseCaseTest {
         mockServer = MockWebServer()
         mockServer.start()
 
-        slackApi = SlackService.getApi(mockServer.url("/"))
+        slackApi = SlackApi.create(mockServer.url("/"))
         useCase = SendCoffeeAnnouncementUseCase(
                 slackApi,
                 Schedulers.immediate(),