Support explicit API mode for complex map keys (#736)

* Support explicit API mode for complex map keys
square · Aug 3, 2023 · 6538b2c · 6538b2c
1 parent 81053bc
commit 6538b2c
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 0 deletions.
diff --git a/compiler/src/main/java/com/squareup/anvil/compiler/codegen/dagger/MapKeyCreatorGenerator.kt b/compiler/src/main/java/com/squareup/anvil/compiler/codegen/dagger/MapKeyCreatorGenerator.kt
@@ -178,6 +178,7 @@ internal class MapKeyCreatorGenerator : PrivateCodeGenerator() {
         className,
         properties.entries.map { it.value.callExpression }.joinToCode()
       )
+      .returns(className)
       .build()
   }
 }

diff --git a/integration-tests/library/build.gradle b/integration-tests/library/build.gradle
@@ -12,6 +12,10 @@ if (libs.versions.config.generateDaggerFactoriesWithAnvil.get().toBoolean()) {
 
   dependencies {
     kapt libs.dagger2.compiler
+
+    // Necessary because this is what dagger uses when it runs to support instantiating annotations at runtime
+    implementation libs.auto.value.annotations
+    kapt libs.auto.value.processor
   }
 }
 

diff --git a/integration-tests/library/src/main/java/com/squareup/anvil/test/MapBindings.kt b/integration-tests/library/src/main/java/com/squareup/anvil/test/MapBindings.kt
@@ -20,3 +20,20 @@ public object MapBinding2 : ParentType
 @ContributesMultibinding(AppScope::class)
 @BindingKey("3")
 public object MapBinding3 : ParentType
+
+@MapKey(unwrapValue = false)
+public annotation class WrappedBindingKey(val value: String)
+
+@ContributesMultibinding(AppScope::class, ignoreQualifier = true)
+@Named("def")
+@WrappedBindingKey("1")
+public object WrappedMapBinding1 : ParentType
+
+@ContributesMultibinding(AppScope::class)
+@Named("def")
+@WrappedBindingKey("2")
+public object WrappedMapBinding2 : ParentType
+
+@ContributesMultibinding(AppScope::class)
+@WrappedBindingKey("3")
+public object WrappedMapBinding3 : ParentType
diff --git a/integration-tests/tests/src/test/java/com/squareup/anvil/test/MergeComponentTest.kt b/integration-tests/tests/src/test/java/com/squareup/anvil/test/MergeComponentTest.kt
@@ -57,6 +57,16 @@ internal class MergeComponentTest {
 
     assertThat(appComponent.mapBindings()).containsExactly("1", MapBinding1, "3", MapBinding3)
     assertThat(appComponent.mapBindingsNamed()).containsExactly("2", MapBinding2)
+    assertThat(appComponent.mapBindingsWrapped()).containsExactly(
+      WrappedBindingKey("1"),
+      WrappedMapBinding1,
+      WrappedBindingKey("3"),
+      WrappedMapBinding3
+    )
+    assertThat(appComponent.mapBindingsWrappedNamed()).containsExactly(
+      WrappedBindingKey("2"),
+      WrappedMapBinding2
+    )
   }
 
   @Test fun `the binding with the highest priority is bound`() {
@@ -75,6 +85,8 @@ internal class MergeComponentTest {
     fun parentTypes(): Set<ParentType>
     fun mapBindings(): Map<String, ParentType>
     @Named("abc") fun mapBindingsNamed(): Map<String, ParentType>
+    fun mapBindingsWrapped(): Map<WrappedBindingKey, ParentType>
+    @Named("def") fun mapBindingsWrappedNamed(): Map<WrappedBindingKey, ParentType>
     fun priorityBinding(): PriorityBinding
   }