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

features/verifysession/api/src/main/kotlin/io/element/android/features/verifysession/api/IncomingVerificationEntryPoint.kt

@@ -19,13 +19,7 @@ interface IncomingVerificationEntryPoint : FeatureEntryPoint {
         val verificationRequest: VerificationRequest.Incoming,
     ) : NodeInputs
 
-    fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder
-
-    interface NodeBuilder {
-        fun callback(callback: Callback): NodeBuilder
-        fun params(params: Params): NodeBuilder
-        fun build(): Node
-    }
+    fun createNode(parentNode: Node, buildContext: BuildContext, params: Params, callback: Callback): Node
 
     interface Callback : Plugin {
         fun onDone()

features/verifysession/api/src/main/kotlin/io/element/android/features/verifysession/api/OutgoingVerificationEntryPoint.kt

@@ -20,13 +20,7 @@ interface OutgoingVerificationEntryPoint : FeatureEntryPoint {
         val verificationRequest: VerificationRequest.Outgoing,
     ) : NodeInputs
 
-    fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder
-
-    interface NodeBuilder {
-        fun callback(callback: Callback): NodeBuilder
-        fun params(params: Params): NodeBuilder
-        fun build(): Node
-    }
+    fun createNode(parentNode: Node, buildContext: BuildContext, params: Params, callback: Callback): Node
 
     interface Callback : Plugin {
         fun navigateToLearnMoreAboutEncryption()

features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/DefaultIncomingVerificationEntryPoint.kt

@@ -9,7 +9,6 @@ package io.element.android.features.verifysession.impl.incoming
 
 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.features.verifysession.api.IncomingVerificationEntryPoint
@@ -17,23 +16,12 @@ import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
 class DefaultIncomingVerificationEntryPoint : IncomingVerificationEntryPoint {
-    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): IncomingVerificationEntryPoint.NodeBuilder {
-        val plugins = ArrayList<Plugin>()
-
-        return object : IncomingVerificationEntryPoint.NodeBuilder {
-            override fun callback(callback: IncomingVerificationEntryPoint.Callback): IncomingVerificationEntryPoint.NodeBuilder {
-                plugins += callback
-                return this
-            }
-
-            override fun params(params: IncomingVerificationEntryPoint.Params): IncomingVerificationEntryPoint.NodeBuilder {
-                plugins += params
-                return this
-            }
-
-            override fun build(): Node {
-                return parentNode.createNode<IncomingVerificationNode>(buildContext, plugins)
-            }
-        }
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: IncomingVerificationEntryPoint.Params,
+        callback: IncomingVerificationEntryPoint.Callback,
+    ): Node {
+        return parentNode.createNode<IncomingVerificationNode>(buildContext, listOf(params, callback))
     }
 }

features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/DefaultOutgoingVerificationEntryPoint.kt

@@ -9,7 +9,6 @@ package io.element.android.features.verifysession.impl.outgoing
 
 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.features.verifysession.api.OutgoingVerificationEntryPoint
@@ -17,23 +16,12 @@ import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
 class DefaultOutgoingVerificationEntryPoint : OutgoingVerificationEntryPoint {
-    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): OutgoingVerificationEntryPoint.NodeBuilder {
-        val plugins = ArrayList<Plugin>()
-
-        return object : OutgoingVerificationEntryPoint.NodeBuilder {
-            override fun callback(callback: OutgoingVerificationEntryPoint.Callback): OutgoingVerificationEntryPoint.NodeBuilder {
-                plugins += callback
-                return this
-            }
-
-            override fun params(params: OutgoingVerificationEntryPoint.Params): OutgoingVerificationEntryPoint.NodeBuilder {
-                plugins += params
-                return this
-            }
-
-            override fun build(): Node {
-                return parentNode.createNode<OutgoingVerificationNode>(buildContext, plugins)
-            }
-        }
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: OutgoingVerificationEntryPoint.Params,
+        callback: OutgoingVerificationEntryPoint.Callback,
+    ): Node {
+        return parentNode.createNode<OutgoingVerificationNode>(buildContext, listOf(params, callback))
     }
 }

features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/incoming/DefaultIncomingVerificationEntryPointTest.kt

@@ -37,10 +37,12 @@ class DefaultIncomingVerificationEntryPointTest {
         val params = IncomingVerificationEntryPoint.Params(
             verificationRequest = anIncomingSessionVerificationRequest()
         )
-        val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null))
-            .params(params)
-            .callback(callback)
-            .build()
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            params = params,
+            callback = callback,
+        )
         assertThat(result).isInstanceOf(IncomingVerificationNode::class.java)
         assertThat(result.plugins).contains(params)
         assertThat(result.plugins).contains(callback)

features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/outgoing/DefaultOutgoingVerificationEntryPointTest.kt

@@ -42,10 +42,12 @@ class DefaultOutgoingVerificationEntryPointTest {
             showDeviceVerifiedScreen = true,
             verificationRequest = anOutgoingSessionVerificationRequest(),
         )
-        val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null))
-            .params(params)
-            .callback(callback)
-            .build()
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            params = params,
+            callback = callback,
+        )
         assertThat(result).isInstanceOf(OutgoingVerificationNode::class.java)
         assertThat(result.plugins).contains(params)
         assertThat(result.plugins).contains(callback)