Removing extra constructor param

LikeTheSalad · May 20, 2023 · 99d249b · 99d249b
1 parent 13236ad
commit 99d249b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/.../main/java/com/likethesalad/tools/resource/locator/android/di/ResourceLocatorComponent.kt b/.../main/java/com/likethesalad/tools/resource/locator/android/di/ResourceLocatorComponent.kt
@@ -3,11 +3,13 @@ package com.likethesalad.tools.resource.locator.android.di
 import com.likethesalad.tools.resource.collector.android.di.CollectorComponent
 import com.likethesalad.tools.resource.collector.android.source.providers.ResDirResourceSourceProvider
 import com.likethesalad.tools.resource.locator.android.extension.configuration.source.utils.CommonSourceConfigurationCreator
+import com.likethesalad.tools.resource.locator.android.providers.InstancesProvider
 import dagger.Component
 
 @Component(modules = [ResourceLocatorModule::class], dependencies = [CollectorComponent::class])
 @LocatorScope
 interface ResourceLocatorComponent {
     fun commonSourceConfigurationCreator(): CommonSourceConfigurationCreator
     fun resDirResourceSourceProviderFactory(): ResDirResourceSourceProvider.Factory
+    fun instancesProvider(): InstancesProvider
 }
diff --git a/...ocator/android/extension/configuration/source/impl/AndroidLibrariesSourceConfiguration.kt b/...ocator/android/extension/configuration/source/impl/AndroidLibrariesSourceConfiguration.kt
@@ -3,18 +3,22 @@ package com.likethesalad.tools.resource.locator.android.extension.configuration.
 import com.likethesalad.tools.resource.api.android.environment.Variant
 import com.likethesalad.tools.resource.collector.android.data.resdir.ResDir
 import com.likethesalad.tools.resource.collector.android.data.variant.VariantTree
+import com.likethesalad.tools.resource.locator.android.di.ResourceLocatorComponent
+import com.likethesalad.tools.resource.locator.android.di.ResourceLocatorComponentProvider
 import com.likethesalad.tools.resource.locator.android.extension.configuration.source.base.ResDirResourceSourceConfiguration
 import com.likethesalad.tools.resource.locator.android.providers.InstancesProvider
 import org.gradle.api.file.FileCollection
 import org.gradle.api.provider.Provider
 import java.io.File
 
 open class AndroidLibrariesSourceConfiguration(
-    variantTree: VariantTree,
-    private val instancesProvider: InstancesProvider
+    variantTree: VariantTree
 ) : ResDirResourceSourceConfiguration(variantTree) {
 
     private lateinit var libraryResources: FileCollection
+    private val instancesProvider:InstancesProvider by lazy {
+        ResourceLocatorComponentProvider.getComponent().instancesProvider()
+    }
 
     override fun getResDirs(): List<ResDir> {
         val resDirs = mutableListOf<ResDir>()

diff --git a/...urce/locator/android/extension/configuration/source/impl/AndroidRawSourceConfiguration.kt b/...urce/locator/android/extension/configuration/source/impl/AndroidRawSourceConfiguration.kt
@@ -4,6 +4,7 @@ import com.likethesalad.tools.resource.collector.android.data.resdir.ResDirFinde
 import com.likethesalad.tools.resource.collector.android.data.variant.VariantTree
 import com.likethesalad.tools.resource.collector.android.source.providers.VariantTreeResourceSourceProvider
 import com.likethesalad.tools.resource.collector.source.ResourceSourceProvider
+import com.likethesalad.tools.resource.locator.android.di.ResourceLocatorComponentProvider
 import com.likethesalad.tools.resource.locator.android.extension.configuration.source.ResourceSourceConfiguration
 import com.likethesalad.tools.resource.locator.android.providers.InstancesProvider
 import org.gradle.api.provider.Provider
@@ -12,10 +13,12 @@ import java.io.File
 class AndroidRawSourceConfiguration(
     variantTree: VariantTree,
     resDirFinder: ResDirFinder,
-    private val variantTreeResourceSourceProviderFactory: VariantTreeResourceSourceProvider.Factory,
-    private val instancesProvider: InstancesProvider
+    private val variantTreeResourceSourceProviderFactory: VariantTreeResourceSourceProvider.Factory
 ) : ResourceSourceConfiguration(variantTree) {
 
+    private val instancesProvider:InstancesProvider by lazy {
+        ResourceLocatorComponentProvider.getComponent().instancesProvider()
+    }
     private val variantTreeResourceProvider: VariantTreeResourceSourceProvider by lazy {
         createVariantTreeResourceProvider(
             variantTree,

diff --git a/.../locator/android/extension/configuration/source/utils/CommonSourceConfigurationCreator.kt b/.../locator/android/extension/configuration/source/utils/CommonSourceConfigurationCreator.kt
@@ -15,19 +15,18 @@ import javax.inject.Inject
 class CommonSourceConfigurationCreator @Inject constructor(
     private val taskFinder: TaskFinder,
     private val resDirFinder: ResDirFinder,
-    private val variantTreeResourceSourceProviderFactory: VariantTreeResourceSourceProvider.Factory,
-    private val instancesProvider: InstancesProvider
+    private val variantTreeResourceSourceProviderFactory: VariantTreeResourceSourceProvider.Factory
 ) {
 
     fun createAndroidRawConfiguration(variantTree: VariantTree): AndroidRawSourceConfiguration {
-        return AndroidRawSourceConfiguration(variantTree, resDirFinder, variantTreeResourceSourceProviderFactory, instancesProvider)
+        return AndroidRawSourceConfiguration(variantTree, resDirFinder, variantTreeResourceSourceProviderFactory)
     }
 
     fun createAndroidGeneratedResConfiguration(variantTree: VariantTree): AndroidGeneratedSourceConfiguration {
         return AndroidGeneratedSourceConfiguration(variantTree, taskFinder)
     }
 
     fun createAndroidAndroidLibrariesConfiguration(variantTree: VariantTree): AndroidLibrariesSourceConfiguration {
-        return AndroidLibrariesSourceConfiguration(variantTree, instancesProvider)
+        return AndroidLibrariesSourceConfiguration(variantTree)
     }
 }