refactor: Qualifier 수정, DI 수정

app/build.gradle.kts

@@ -44,16 +44,15 @@ android {
 
 dependencies {
  implementation(project(":domain"))
- implementation("com.github.hyemdooly:android-di:v2.0.0")
-// implementation(project(":di"))
+// implementation("com.github.hyemdooly:android-di:v2.0.0")
+ implementation(project(":di"))
 
  implementation("androidx.core:core-ktx:1.10.1")
  implementation("androidx.appcompat:appcompat:1.6.1")
  implementation("com.google.android.material:material:1.9.0")
  implementation("androidx.constraintlayout:constraintlayout:2.1.4")
  implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1")
  implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
- implementation(project(mapOf("path" to ":di")))
  testImplementation("junit:junit:4.13.2")
  testImplementation("com.google.truth:truth:1.1.3")
  testImplementation("androidx.arch.core:core-testing:2.2.0")

app/src/main/java/woowacourse/shopping/data/InDiskCartRepository.kt

@@ -1,13 +1,11 @@
 package woowacourse.shopping.data
 
-import io.hyemdooly.di.annotation.InDisk
 import woowacourse.shopping.data.mapper.toCartProduct
 import woowacourse.shopping.data.mapper.toEntity
 import woowacourse.shopping.model.CartProduct
 import woowacourse.shopping.model.Product
 
 // TODO: Step2 - CartProductDao를 참조하도록 변경
-@InDisk
 class InDiskCartRepository(
  private val dao: CartProductDao,
 ) : CartRepository {

app/src/main/java/woowacourse/shopping/data/InMemoryCartRepository.kt

@@ -1,11 +1,9 @@
 package woowacourse.shopping.data
 
-import io.hyemdooly.di.annotation.InMemory
 import woowacourse.shopping.model.CartProduct
 import woowacourse.shopping.model.Product
 
 // TODO: Step2 - CartProductDao를 참조하도록 변경
-@InMemory
 class InMemoryCartRepository : CartRepository {
  private val products = mutableListOf<CartProduct>()
  override suspend fun addCartProduct(product: Product) {

app/src/main/java/woowacourse/shopping/data/InMemoryProductRepository.kt

@@ -1,10 +1,8 @@
 package woowacourse.shopping.data
 
-import io.hyemdooly.di.annotation.InMemory
 import io.hyemdooly.di.annotation.Inject
 import woowacourse.shopping.model.Product
 
-@InMemory
 class InMemoryProductRepository : ProductRepository {
  @Inject
  private val products: List<Product> = emptyList()

app/src/main/java/woowacourse/shopping/ui/MainViewModel.kt

@@ -4,16 +4,17 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import io.hyemdooly.di.annotation.InDisk
-import io.hyemdooly.di.annotation.InMemory
+import io.hyemdooly.di.annotation.Qualifier
 import kotlinx.coroutines.launch
 import woowacourse.shopping.data.CartRepository
+import woowacourse.shopping.data.InDiskCartRepository
+import woowacourse.shopping.data.InMemoryProductRepository
 import woowacourse.shopping.data.ProductRepository
 import woowacourse.shopping.model.Product
 
 class MainViewModel(
- @InMemory private val productRepository: ProductRepository,
- @InDisk private val cartRepository: CartRepository,
+ @Qualifier(InMemoryProductRepository::class) private val productRepository: ProductRepository,
+ @Qualifier(InDiskCartRepository::class) private val cartRepository: CartRepository,
 ) : ViewModel() {
 
  private val _products: MutableLiveData<List<Product>> = MutableLiveData(emptyList())

app/src/main/java/woowacourse/shopping/ui/ShoppingApplication.kt

@@ -4,12 +4,9 @@ import android.app.Application
 import androidx.room.Room
 import io.hyemdooly.di.Container
 import io.hyemdooly.di.Injector
-import woowacourse.shopping.data.CartProductDao
-import woowacourse.shopping.data.CartRepository
 import woowacourse.shopping.data.InDiskCartRepository
 import woowacourse.shopping.data.InMemoryCartRepository
 import woowacourse.shopping.data.InMemoryProductRepository
-import woowacourse.shopping.data.ProductRepository
 import woowacourse.shopping.data.ShoppingDatabase
 import woowacourse.shopping.model.Product
 
@@ -44,11 +41,11 @@ class ShoppingApplication : Application() {
  ),
  )
 
- Container.addInstance(List::class, products)
- Container.addInstance(CartProductDao::class, inDiskDb.cartProductDao())
+ Container.addInstance(products)
+ Container.addInstance(inDiskDb.cartProductDao())
 
- Container.addInstance(ProductRepository::class, Injector.inject(InMemoryProductRepository::class))
- Container.addInstance(CartRepository::class, Injector.inject(InDiskCartRepository::class))
- Container.addInstance(CartRepository::class, Injector.inject(InMemoryCartRepository::class))
+ Container.addInstance(Injector.inject(InMemoryProductRepository::class))
+ Container.addInstance(Injector.inject(InDiskCartRepository::class))
+ Container.addInstance(Injector.inject(InMemoryCartRepository::class))
  }
 }

app/src/main/java/woowacourse/shopping/ui/cart/CartViewModel.kt

@@ -4,13 +4,14 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import io.hyemdooly.di.annotation.InDisk
+import io.hyemdooly.di.annotation.Qualifier
 import kotlinx.coroutines.launch
 import woowacourse.shopping.data.CartRepository
+import woowacourse.shopping.data.InDiskCartRepository
 import woowacourse.shopping.model.CartProduct
 
 class CartViewModel(
- @InDisk private val cartRepository: CartRepository,
+ @Qualifier(InDiskCartRepository::class) private val cartRepository: CartRepository,
 ) : ViewModel() {
 
  private val _cartProducts: MutableLiveData<List<CartProduct>> =

di/src/main/java/io/hyemdooly/di/Container.kt

@@ -1,18 +1,19 @@
 package io.hyemdooly.di
 
 import kotlin.reflect.KClass
-
-data class InstanceInfo(val clazz: KClass<*>, val annotations: List<Annotation>)
+import kotlin.reflect.full.isSubclassOf
 
 object Container {
- private val instances = mutableMapOf<InstanceInfo, Any>()
- fun addInstance(type: KClass<*>, instance: Any) {
- val key = InstanceInfo(type, instance::class.annotations)
- instances[key] = instance
+ private val instances = mutableMapOf<KClass<*>, Any>()
+
+ fun addInstance(instance: Any) {
+ println(instance::class)
+ instances[instance::class] = instance
  }
 
- fun getInstance(type: KClass<*>, annotations: List<Annotation> = emptyList()): Any? {
- val key = InstanceInfo(type, annotations)
+ fun getInstance(type: KClass<*>): Any? {
+ if (instances[type] != null) instances[type]
+ val key = instances.keys.firstOrNull { it.isSubclassOf(type) }
  return instances[key]
  }
 

di/src/main/java/io/hyemdooly/di/Injector.kt

@@ -1,9 +1,11 @@
 package io.hyemdooly.di
 
 import io.hyemdooly.di.annotation.Inject
+import io.hyemdooly.di.annotation.Qualifier
 import kotlin.reflect.KClass
 import kotlin.reflect.KFunction
 import kotlin.reflect.full.declaredMemberProperties
+import kotlin.reflect.full.findAnnotation
 import kotlin.reflect.full.hasAnnotation
 import kotlin.reflect.full.primaryConstructor
 import kotlin.reflect.jvm.isAccessible
@@ -30,7 +32,13 @@ object Injector {
  private fun <T> getParamInstances(constructor: KFunction<T>): List<Any> {
  val paramInstances = constructor.parameters.map { param ->
  val type = param.type.jvmErasure
- Container.getInstance(type, param.annotations) ?: inject(type)
+
+ val annotation = param.findAnnotation<Qualifier>()
+ if (annotation != null) {
+ Container.getInstance(annotation.clazz) ?: inject(annotation.clazz)
+ } else {
+ Container.getInstance(type) ?: inject(type)
+ }
  }
  return paramInstances
  }

di/src/main/java/io/hyemdooly/di/annotation/Qualifier.kt

@@ -1,4 +1,5 @@
 package io.hyemdooly.di.annotation
 
-@Target(AnnotationTarget.ANNOTATION_CLASS)
-annotation class Qualifier
+import kotlin.reflect.KClass
+
+annotation class Qualifier(val clazz: KClass<*>)

di/src/test/kotlin/io/hyemdooly/di/InjectorTest.kt

@@ -1,7 +1,8 @@
 package io.hyemdooly.di
 
-import io.hyemdooly.di.annotation.InMemory
+// import io.hyemdooly.di.annotation.InMemory
 import io.hyemdooly.di.annotation.Inject
+import io.hyemdooly.di.annotation.Qualifier
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertNotNull
 import org.junit.jupiter.api.BeforeEach
@@ -13,18 +14,24 @@ class InjectorTest {
  class FakeDatabase
 
  interface FakeRepository {
+ @Inject
+ val name: String
+
  @Inject
  val items: List<String>
  }
 
- @InMemory
+ // @InMemory
  class DefaultFakeRepository(private val database: FakeDatabase) : FakeRepository {
+ @Inject
+ override val name: String = ""
+
  @Inject
  override val items: List<String> = emptyList()
  }
 
  class FakeViewModel(
- @InMemory val fakeRepository: FakeRepository,
+ @Qualifier(DefaultFakeRepository::class) val fakeRepository: FakeRepository,
  )
 
  @BeforeEach
@@ -35,33 +42,39 @@ class InjectorTest {
  @Test
  fun `Container에서 타입에 맞는 instance를 찾아 의존성을 주입한다`() {
  // given
+ val name = "FakeRepository"
  val items = listOf("item1", "item2", "item3")
 
  // when
- Container.addInstance(List::class, items)
- Container.addInstance(FakeRepository::class, Injector.inject(FakeDatabase::class))
- Container.addInstance(FakeRepository::class, Injector.inject(DefaultFakeRepository::class))
+ Container.addInstance(name)
+ Container.addInstance(items)
+ Container.addInstance(Injector.inject(FakeDatabase::class))
+ Container.addInstance(Injector.inject(DefaultFakeRepository::class))
  val viewModel = Injector.inject<FakeViewModel>(FakeViewModel::class)
 
  // then
  assertNotNull(viewModel)
  assertNotNull(viewModel.fakeRepository)
+ assertEquals(name, viewModel.fakeRepository.name)
  assertEquals(items, viewModel.fakeRepository.items)
  }
 
  @Test
  fun `Container에서 찾을 수 없는 instance는 재귀로 생성하여 주입한다`() {
  // given
+ val name = "FakeRepository"
  val items = listOf("item1", "item2", "item3")
 
  // when
- Container.addInstance(List::class, items)
- Container.addInstance(FakeRepository::class, Injector.inject(DefaultFakeRepository::class))
+ Container.addInstance(name)
+ Container.addInstance(items)
+ Container.addInstance(Injector.inject(DefaultFakeRepository::class))
  val viewModel = Injector.inject<FakeViewModel>(FakeViewModel::class)
 
  // then
  assertNotNull(viewModel)
  assertNotNull(viewModel.fakeRepository)
+ assertEquals(name, viewModel.fakeRepository.name)
  assertEquals(items, viewModel.fakeRepository.items)
  }