🎨 Use toInstance instead of provider
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 31 Mar 2025 18:41:13 +0000 (20:41 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 31 Mar 2025 18:41:13 +0000 (20:41 +0200)
I probably always meant to do this, but didn’t manage to find the toInstance method…

src/main/kotlin/net/pterodactylus/sone/main/FreenetModule.kt

index 4933e8f..04cc8bc 100644 (file)
@@ -19,12 +19,12 @@ import jakarta.inject.Singleton
 class FreenetModule(private val pluginRespirator: PluginRespirator) : Module {
 
        override fun configure(binder: Binder): Unit = binder.run {
-               bind(PluginRespiratorFacade::class.java).toProvider(Provider { FredPluginRespiratorFacade(pluginRespirator) }).`in`(Singleton::class.java)
+               bind(PluginRespiratorFacade::class.java).toInstance(FredPluginRespiratorFacade(pluginRespirator))
                bind(PluginConnector::class.java).to(FredPluginConnector::class.java).`in`(Singleton::class.java)
-               bind(Node::class.java).toProvider(Provider { pluginRespirator.node })
-               bind(HighLevelSimpleClient::class.java).toProvider(Provider<HighLevelSimpleClient> { pluginRespirator.hlSimpleClient!! })
-               bind(ToadletContainer::class.java).toProvider(Provider<ToadletContainer> { pluginRespirator.toadletContainer })
-               bind(PageMaker::class.java).toProvider(Provider<PageMaker> { pluginRespirator.pageMaker })
+               bind(Node::class.java).toInstance(pluginRespirator.node)
+               bind(HighLevelSimpleClient::class.java).toInstance(pluginRespirator.hlSimpleClient)
+               bind(ToadletContainer::class.java).toInstance(pluginRespirator.toadletContainer)
+               bind(PageMaker::class.java).toInstance(pluginRespirator.pageMaker)
        }
 
        @Provides