Added DI configuration to new feature option. (#50)

Author: EranBoudjnah

cli/src/main/kotlin/com/mitteloupe/cag/cli/Main.kt

@@ -148,6 +148,7 @@ fun main(arguments: Array<String>) {
                 .enableCompose(true)
                 .enableKtlint(requestFeature.enableKtlint)
                 .enableDetekt(requestFeature.enableDetekt)
+                .setDependencyInjection(requestFeature.dependencyInjection.orDefault(configuration))
                 .build()
         executeAndReport {
             setVersionProvider(configuration.existingProjectVersions)

cli/src/main/kotlin/com/mitteloupe/cag/cli/argument/feature/NewFeaturesArgumentsParser.kt

@@ -1,6 +1,7 @@
 package com.mitteloupe.cag.cli.argument.feature
 
 import com.mitteloupe.cag.cli.argument.ArgumentParser
+import com.mitteloupe.cag.cli.argument.feature.mapper.toDependencyInjection
 import com.mitteloupe.cag.cli.flag.PrimaryFlag.NewFeaturePrimary
 import com.mitteloupe.cag.cli.flag.SecondaryFlagOptions
 import com.mitteloupe.cag.cli.request.FeatureRequest
@@ -12,6 +13,7 @@ fun ArgumentParser.parseNewFeaturesArguments(arguments: Array<String>): List<Fea
             packageName = secondaries[SecondaryFlagOptions.PACKAGE],
             enableKtlint = secondaries.containsKey(SecondaryFlagOptions.KTLINT),
             enableDetekt = secondaries.containsKey(SecondaryFlagOptions.DETEKT),
-            enableGit = secondaries.containsKey(SecondaryFlagOptions.GIT)
+            enableGit = secondaries.containsKey(SecondaryFlagOptions.GIT),
+            dependencyInjection = secondaries[SecondaryFlagOptions.DEPENDENCY_INJECTION]?.toDependencyInjection()
         )
     }

cli/src/main/kotlin/com/mitteloupe/cag/cli/flag/PrimaryFlag.kt

@@ -100,7 +100,8 @@ interface PrimaryFlag {
                 SecondaryFlags.packageName,
                 SecondaryFlags.ktlint,
                 SecondaryFlags.detekt,
-                SecondaryFlags.git
+                SecondaryFlags.git,
+                SecondaryFlags.dependencyInjection
             )
     }
 

cli/src/main/kotlin/com/mitteloupe/cag/cli/request/FeatureRequest.kt

@@ -1,9 +1,12 @@
 package com.mitteloupe.cag.cli.request
 
+import com.mitteloupe.cag.core.option.DependencyInjection
+
 data class FeatureRequest(
     val featureName: String,
     val packageName: String?,
     val enableKtlint: Boolean,
     val enableDetekt: Boolean,
-    val enableGit: Boolean = false
+    val enableGit: Boolean = false,
+    val dependencyInjection: DependencyInjection?
 )

cli/src/test/kotlin/com/mitteloupe/cag/cli/argument/AppArgumentProcessorTest.kt

@@ -20,6 +20,7 @@ import org.junit.runners.Suite.SuiteClasses
 @SuiteClasses(
     AppArgumentProcessorTest.Features::class,
     AppArgumentProcessorTest.Help::class,
+    AppArgumentProcessorTest.NewFeature::class,
     AppArgumentProcessorTest.AppArgumentProcessorArchitectureTest::class,
     AppArgumentProcessorTest.AppArgumentProcessorDataSourcesTest::class,
     AppArgumentProcessorTest.AppArgumentProcessorUseCasesTest::class,
@@ -59,6 +60,15 @@ class AppArgumentProcessorTest {
             // Then
             assertTrue(result)
         }
+    }
+
+    class NewFeature {
+        private lateinit var classUnderTest: AppArgumentProcessor
+
+        @Before
+        fun setUp() {
+            classUnderTest = AppArgumentProcessor()
+        }
 
         @Test
         fun `Given --new-feature with --ktlint when getNewFeatures then returns FeatureRequest with ktlint enabled`() {
@@ -70,7 +80,30 @@ class AppArgumentProcessorTest {
                         featureName = "Quality",
                         packageName = null,
                         enableKtlint = true,
-                        enableDetekt = false
+                        enableDetekt = false,
+                        dependencyInjection = null
+                    )
+                )
+
+            // When
+            val result = classUnderTest.getNewFeatures(givenArguments)
+
+            // Then
+            assertEquals(expectedRequests, result)
+        }
+
+        @Test
+        fun `Given --new-feature with --dependency-injection=Hilt when getNewFeatures then returns FeatureRequest with Hilt enabled`() {
+            // Given
+            val givenArguments = arrayOf("--new-feature", "--name=Quality", "--dependency-injection=Hilt")
+            val expectedRequests =
+                listOf(
+                    FeatureRequest(
+                        featureName = "Quality",
+                        packageName = null,
+                        enableKtlint = false,
+                        enableDetekt = false,
+                        dependencyInjection = DependencyInjection.Hilt
                     )
                 )
 
@@ -91,7 +124,8 @@ class AppArgumentProcessorTest {
                         featureName = "Quality",
                         packageName = null,
                         enableKtlint = true,
-                        enableDetekt = true
+                        enableDetekt = true,
+                        dependencyInjection = null
                     )
                 )
 
@@ -122,13 +156,15 @@ class AppArgumentProcessorTest {
                         featureName = "First",
                         packageName = "com.first",
                         enableKtlint = false,
-                        enableDetekt = false
+                        enableDetekt = false,
+                        dependencyInjection = null
                     ),
                     FeatureRequest(
                         featureName = "Second",
                         packageName = null,
                         enableKtlint = false,
-                        enableDetekt = false
+                        enableDetekt = false,
+                        dependencyInjection = null
                     )
                 )
 
@@ -149,13 +185,15 @@ class AppArgumentProcessorTest {
                         featureName = "Third",
                         packageName = "com.third",
                         enableKtlint = false,
-                        enableDetekt = false
+                        enableDetekt = false,
+                        dependencyInjection = null
                     ),
                     FeatureRequest(
                         featureName = "Fourth",
                         packageName = "com.fourth",
                         enableKtlint = false,
-                        enableDetekt = false
+                        enableDetekt = false,
+                        dependencyInjection = null
                     )
                 )
 
@@ -258,7 +296,8 @@ class AppArgumentProcessorTest {
                     packageName = null,
                     enableKtlint = false,
                     enableDetekt = false,
-                    enableGit = true
+                    enableGit = true,
+                    dependencyInjection = null
                 )
 
             // When

plugin/src/main/kotlin/com/mitteloupe/cag/cleanarchitecturegenerator/CreateCleanArchitectureFeatureAction.kt

@@ -6,6 +6,8 @@ import com.intellij.openapi.components.service
 import com.intellij.openapi.ui.Messages
 import com.mitteloupe.cag.cleanarchitecturegenerator.filesystem.GeneratorProvider
 import com.mitteloupe.cag.cleanarchitecturegenerator.git.GitAddQueueService
+import com.mitteloupe.cag.cleanarchitecturegenerator.model.DependencyInjection
+import com.mitteloupe.cag.cleanarchitecturegenerator.settings.AppSettingsService
 import com.mitteloupe.cag.core.AppModuleDirectoryFinder
 import com.mitteloupe.cag.core.GenerationException
 import com.mitteloupe.cag.core.NamespaceResolver
@@ -16,14 +18,17 @@ class CreateCleanArchitectureFeatureAction : AnAction() {
     private val ideBridge = IdeBridge()
     private val appModuleDirectoryFinder = AppModuleDirectoryFinder()
     private val generatorProvider = GeneratorProvider()
+    private val appSettingsService = AppSettingsService.getInstance()
 
     override fun actionPerformed(event: AnActionEvent) {
         val project = event.project ?: return
         val projectModel = IntellijProjectModel(event)
         val defaultNamespace = NamespaceResolver().determineBasePackage(projectModel)
         val projectRootDirectory = project.basePath?.let { File(it) } ?: File(".")
         val appModuleDirectories = appModuleDirectoryFinder.findAndroidAppModuleDirectories(projectRootDirectory)
-        val dialog = CreateCleanArchitectureFeatureDialog(project, defaultNamespace, appModuleDirectories)
+        val defaultDependencyInjection = DependencyInjection.fromString(appSettingsService.defaultDependencyInjection)
+        val dialog =
+            CreateCleanArchitectureFeatureDialog(project, defaultNamespace, appModuleDirectories, defaultDependencyInjection)
         if (dialog.showAndGet()) {
             val featureName = dialog.featureName
             val featurePackageName = dialog.featurePackageName

plugin/src/main/kotlin/com/mitteloupe/cag/cleanarchitecturegenerator/CreateCleanArchitectureFeatureDialog.kt

@@ -19,7 +19,8 @@ private const val PLACEHOLDER = "FEATURE_NAME"
 class CreateCleanArchitectureFeatureDialog(
     project: Project?,
     private val defaultPackagePrefix: String? = null,
-    private val appModuleDirectories: List<File>
+    private val appModuleDirectories: List<File>,
+    defaultDependencyInjection: DependencyInjection
 ) : DialogWrapper(project) {
     private val featureNameTextField = JBTextField()
     private val featurePackageTextField = JBTextField()
@@ -45,7 +46,7 @@ class CreateCleanArchitectureFeatureDialog(
                 }
             }
 
-    val dependencyInjection: DependencyInjection = DependencyInjection.None
+    var dependencyInjection: DependencyInjection = defaultDependencyInjection
 
     val enableCompose: Boolean = true
 
@@ -120,6 +121,13 @@ class CreateCleanArchitectureFeatureDialog(
             row(CleanArchitectureGeneratorBundle.message("dialog.feature.package.label")) {
                 cell(featurePackageTextField)
             }
+            row(CleanArchitectureGeneratorBundle.message("dialog.feature.dependency.injection.label")) {
+                comboBox(DependencyInjection.entries)
+                    .bindItem(
+                        { dependencyInjection },
+                        { value -> value?.let { dependencyInjection = it } }
+                    )
+            }
             row(CleanArchitectureGeneratorBundle.message("dialog.feature.code.quality.label")) {
                 checkBox("ktlint").bindSelected(::enableKtlintInternal)
                 checkBox("detekt").bindSelected(::enableDetektInternal)

plugin/src/main/resources/messages/CleanArchitectureGeneratorBundle.properties

@@ -5,6 +5,7 @@ dialog.feature.name.label=Feature name:
 dialog.feature.package.label=Feature package:
 dialog.feature.code.quality.label=Code quality
 dialog.feature.app.module.label=App module:
+dialog.feature.dependency.injection.label=Dependency injection framework
 validation.feature.name.required=Please enter a feature name.
 info.feature.generator.confirmation=Generated feature: {0}\n{1}