Handle cases of using class with generics for @BindingAdapter in bi…

…nding-adapter-bridge Support cases where `@BindingAdapter` is statically declared in a class that uses generic in its type params. This change fix code generation to not generate generic information in generated code generics for static access is invalid in Java/Kotlin. Fixes #16
grab · Jan 25, 2022 · d6f8409 · d6f8409
1 parent f94294d
commit d6f8409
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 2 deletions.
diff --git a/...ng-adapter-bridge/src/main/java/com/grab/pax/binding/processor/BindingAdapterProcessor.kt b/...ng-adapter-bridge/src/main/java/com/grab/pax/binding/processor/BindingAdapterProcessor.kt
@@ -76,8 +76,10 @@ class BindingAdapterProcessor : BasicAnnotationProcessor(),
                             .addParameters(params.map { variableElement ->
                                 ParameterSpec.get(variableElement)
                             })
-                            .addStatement(buildStatement(methodName, params, returns), parentClass)
-                            .addTypeVariables(typeParams.map { TypeVariableName.get(it) })
+                            .addStatement(
+                                buildStatement(methodName, params, returns),
+                                buildParentClassName(parentClass)
+                            ).addTypeVariables(typeParams.map { TypeVariableName.get(it) })
                             .build()
                     } else null
                 }
@@ -99,6 +101,14 @@ class BindingAdapterProcessor : BasicAnnotationProcessor(),
         return packageName.replace(".", "_") + GeneratedSuffix
     }
 
+    private fun buildParentClassName(parentClass: Element): ClassName {
+        val packageElement = processingEnv.elementUtils.getPackageOf(parentClass)
+        return ClassName.get(
+            packageElement.qualifiedName.toString(),
+            parentClass.simpleName.toString() // Strip type params since we only access the class statically
+        )
+    }
+
     private fun buildStatement(
         methodName: String,
         params: List<VariableElement>,

diff --git a/...dapter-bridge/src/test/java/com/grab/pax/binding/processor/BindingAdapterProcessorTest.kt b/...dapter-bridge/src/test/java/com/grab/pax/binding/processor/BindingAdapterProcessorTest.kt
@@ -85,6 +85,16 @@ fun <T : Node> Node.genericsUpdateNode(node: T, value: Int) {
     updateNode(node, value)
 }
 
+class CompanionTest<T> {
+    companion object Databinding {
+        @BindingAdapter(TEST_BIND)
+        @JvmStatic
+        fun <T : Node> companionUpdateNode(node: T, value: Int) {
+            updateNode(node, value)
+        }
+    }
+}
+
 class BindingAdapterProcessorTest {
 
     @Test
@@ -158,6 +168,11 @@ class BindingAdapterProcessorTest {
         assertNodeUpdate(com_grab_pax_binding_processor_Binding_Adapter_Stub::getUpdateNode)
     }
 
+    @Test
+    fun `when binding adapters in named companion object, assert proxy forwards to Kotlin implementation`() {
+        assertNodeUpdate(com_grab_pax_binding_processor_Binding_Adapter_Stub::companionUpdateNode)
+    }
+
     private fun assertNodeUpdate(updateFunction: (Node, Int) -> Unit) {
         val node = Node()
         val value = 10