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

features/forward/api/src/main/kotlin/io/element/android/features/forward/api/ForwardEntryPoint.kt

@@ -17,12 +17,6 @@ import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.timeline.TimelineProvider
 
 interface ForwardEntryPoint : FeatureEntryPoint {
-    interface NodeBuilder {
-        fun params(params: Params): NodeBuilder
-        fun callback(callback: Callback): NodeBuilder
-        fun build(): Node
-    }
-
     interface Callback : Plugin {
         fun onDone(roomIds: List<RoomId>)
     }
@@ -32,5 +26,5 @@ interface ForwardEntryPoint : FeatureEntryPoint {
         val timelineProvider: TimelineProvider,
     ) : NodeInputs
 
-    fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder
+    fun createNode(parentNode: Node, buildContext: BuildContext, params: Params, callback: Callback): Node
 }

features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/DefaultForwardEntryPoint.kt

@@ -9,7 +9,6 @@ package io.element.android.features.forward.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.ContributesBinding
 import io.element.android.features.forward.api.ForwardEntryPoint
 import io.element.android.libraries.architecture.createNode
@@ -17,26 +16,16 @@ import io.element.android.libraries.di.SessionScope
 
 @ContributesBinding(SessionScope::class)
 class DefaultForwardEntryPoint : ForwardEntryPoint {
-    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): ForwardEntryPoint.NodeBuilder {
-        val plugins = ArrayList<Plugin>()
-
-        return object : ForwardEntryPoint.NodeBuilder {
-            override fun params(params: ForwardEntryPoint.Params): ForwardEntryPoint.NodeBuilder {
-                plugins += ForwardMessagesNode.Inputs(
+    override fun createNode(parentNode: Node, buildContext: BuildContext, params: ForwardEntryPoint.Params, callback: ForwardEntryPoint.Callback): Node {
+        return parentNode.createNode<ForwardMessagesNode>(
+            buildContext = buildContext,
+            plugins = listOf(
+                ForwardMessagesNode.Inputs(
                     eventId = params.eventId,
                     timelineProvider = params.timelineProvider,
-                )
-                return this
-            }
-
-            override fun callback(callback: ForwardEntryPoint.Callback): ForwardEntryPoint.NodeBuilder {
-                plugins += callback
-                return this
-            }
-
-            override fun build(): Node {
-                return parentNode.createNode<ForwardMessagesNode>(buildContext, plugins)
-            }
-        }
+                ),
+                callback,
+            )
+        )
     }
 }

features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesNode.kt

@@ -70,10 +70,12 @@ class ForwardMessagesNode(
             }
         }
 
-        return roomSelectEntryPoint.nodeBuilder(this, buildContext)
-            .callback(callback)
-            .params(RoomSelectEntryPoint.Params(mode = RoomSelectMode.Forward))
-            .build()
+        return roomSelectEntryPoint.createNode(
+            parentNode = this,
+            buildContext = buildContext,
+            params = RoomSelectEntryPoint.Params(mode = RoomSelectMode.Forward),
+            callback = callback,
+        )
     }
 
     @Composable

features/forward/impl/src/test/kotlin/io/element/android/features/forward/impl/DefaultForwardEntryPointTest.kt

@@ -39,9 +39,12 @@ class DefaultForwardEntryPointTest {
                 plugins = plugins,
                 presenterFactory = { _, _ -> createForwardMessagesPresenter() },
                 roomSelectEntryPoint = object : RoomSelectEntryPoint {
-                    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): RoomSelectEntryPoint.NodeBuilder {
-                        lambdaError()
-                    }
+                    override fun createNode(
+                        parentNode: Node,
+                        buildContext: BuildContext,
+                        params: RoomSelectEntryPoint.Params,
+                        callback: RoomSelectEntryPoint.Callback,
+                    ) = lambdaError()
                 }
             )
         }
@@ -52,10 +55,12 @@ class DefaultForwardEntryPointTest {
             eventId = AN_EVENT_ID,
             timelineProvider = FakeTimelineProvider(),
         )
-        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(ForwardMessagesNode::class.java)
         assertThat(result.plugins).contains(
             ForwardMessagesNode.Inputs(