Remove NodeBuilder to ensure that Params and Callback are always provided.

libraries/accountselect/impl/src/main/kotlin/io/element/android/libraries/accountselect/impl/DefaultAccountSelectEntryPoint.kt

@@ -9,7 +9,6 @@ package io.element.android.libraries.accountselect.impl
 
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
-import com.bumble.appyx.core.plugin.Plugin
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
 import io.element.android.libraries.accountselect.api.AccountSelectEntryPoint
@@ -17,18 +16,7 @@ import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
 class DefaultAccountSelectEntryPoint : AccountSelectEntryPoint {
-    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): AccountSelectEntryPoint.NodeBuilder {
-        val plugins = ArrayList<Plugin>()
-
-        return object : AccountSelectEntryPoint.NodeBuilder {
-            override fun callback(callback: AccountSelectEntryPoint.Callback): AccountSelectEntryPoint.NodeBuilder {
-                plugins += callback
-                return this
-            }
-
-            override fun build(): Node {
-                return parentNode.createNode<AccountSelectNode>(buildContext, plugins)
-            }
-        }
+    override fun createNode(parentNode: Node, buildContext: BuildContext, callback: AccountSelectEntryPoint.Callback): Node {
+        return parentNode.createNode<AccountSelectNode>(buildContext, listOf(callback))
     }
 }

libraries/accountselect/impl/src/test/kotlin/io/element/android/libraries/accountselect/impl/DefaultAccountSelectEntryPointTest.kt

@@ -35,9 +35,11 @@ class DefaultAccountSelectEntryPointTest {
             override fun onAccountSelected(sessionId: SessionId) = lambdaError()
             override fun onCancel() = lambdaError()
         }
-        val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null))
-            .callback(callback)
-            .build()
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            callback = callback,
+        )
         assertThat(result).isInstanceOf(AccountSelectNode::class.java)
         assertThat(result.plugins).contains(callback)
     }