Skip to content

fix: refactor android feature validation to isolate cli errors from requ #452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cdsap merged 1 commit into from
Sep 7, 2026
Merged

fix: refactor android feature validation to isolate cli errors from requ #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions cli/src/main/kotlin/io/github/cdsap/projectgenerator/cli/GenerateProjectRequest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.github.cdsap.projectgenerator.cli

import com.github.ajalt.clikt.core.UsageError
import io.github.cdsap.projectgenerator.ProjectGenerator
import io.github.cdsap.projectgenerator.model.ClassesPerModule
import io.github.cdsap.projectgenerator.model.Gradle
Expand Down Expand Up @@ -94,16 +93,22 @@ data class GenerateProjectRequest(
}
}

internal class GenerateProjectRequestValidationException(
message: String
) : RuntimeException(message)

internal fun validateAndroidOnlyFeatures(
typeOfProjectRequested: TypeProjectRequested,
roomDatabase: Boolean,
kotlinMultiplatformLibrary: Boolean
) {
if (typeOfProjectRequested != TypeProjectRequested.ANDROID && roomDatabase) {
throw UsageError("--room-database is only available when --type android.")
throw GenerateProjectRequestValidationException("--room-database is only available when --type android.")
}
if (typeOfProjectRequested != TypeProjectRequested.ANDROID && kotlinMultiplatformLibrary) {
throw UsageError("--android-kotlin-multiplatform-library is only available when --type android.")
throw GenerateProjectRequestValidationException(
"--android-kotlin-multiplatform-library is only available when --type android."
)
}
}

Expand Down
53 changes: 29 additions & 24 deletions cli/src/main/kotlin/io/github/cdsap/projectgenerator/cli/Main.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package io.github.cdsap.projectgenerator.cli

import com.github.ajalt.clikt.core.CliktCommand
import com.github.ajalt.clikt.core.UsageError
import com.github.ajalt.clikt.core.main
import com.github.ajalt.clikt.core.subcommands
import com.github.ajalt.clikt.parameters.options.*
Expand Down Expand Up @@ -55,30 +56,34 @@ class GenerateProjects : CliktCommand(name = "generate-project") {
private val kotlinMultiplatformLibrary by option("--android-kotlin-multiplatform-library").flag(default = false)

override fun run() {
GenerateProjectRequest.resolve(
modules = modules,
shape = Shape.valueOf(shape.uppercase()),
language = Language.valueOf(language.uppercase()),
typeOfProjectRequested = TypeProjectRequested.valueOf(type.uppercase()),
classesPerModule = ClassesPerModule(
ClassesPerModuleType.valueOf(classesModuleType.uppercase()),
classesModule
),
typeOfStringResources = TypeOfStringResources.valueOf(typeOfStringResources.uppercase()),
layers = layers,
generateUnitTest = generateUnitTest,
cliGradle = gradle,
develocityFlag = develocity,
versionsFile = versionsFile?.let(VersionsParser::fromFile),
outputDir = outputDir,
projectName = projectName,
versionsOverrides = VersionsOverrides(
dependencyInjection = DependencyInjection.valueOf(di.uppercase()),
develocityUrl = develocityUrl,
roomDatabase = roomDatabase,
kotlinMultiplatformLibrary = kotlinMultiplatformLibrary
)
).toProjectGenerator().write()
try {
GenerateProjectRequest.resolve(
modules = modules,
shape = Shape.valueOf(shape.uppercase()),
language = Language.valueOf(language.uppercase()),
typeOfProjectRequested = TypeProjectRequested.valueOf(type.uppercase()),
classesPerModule = ClassesPerModule(
ClassesPerModuleType.valueOf(classesModuleType.uppercase()),
classesModule
),
typeOfStringResources = TypeOfStringResources.valueOf(typeOfStringResources.uppercase()),
layers = layers,
generateUnitTest = generateUnitTest,
cliGradle = gradle,
develocityFlag = develocity,
versionsFile = versionsFile?.let(VersionsParser::fromFile),
outputDir = outputDir,
projectName = projectName,
versionsOverrides = VersionsOverrides(
dependencyInjection = DependencyInjection.valueOf(di.uppercase()),
develocityUrl = develocityUrl,
roomDatabase = roomDatabase,
kotlinMultiplatformLibrary = kotlinMultiplatformLibrary
)
).toProjectGenerator().write()
} catch (e: GenerateProjectRequestValidationException) {
throw UsageError(e.message ?: "Invalid generate-project request.")
}
}
}

Expand Down
4 changes: 2 additions & 2 deletions cli/src/test/kotlin/io/github/cdsap/projectgenerator/cli/GenerateProjectsCliTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class GenerateProjectsCliTest {

@Test
fun `resolve rejects room database for jvm type`() {
val error = assertThrows<UsageError> {
val error = assertThrows<GenerateProjectRequestValidationException> {
GenerateProjectRequest.resolve(
modules = 6,
shape = Shape.RECTANGLE,
Expand Down Expand Up @@ -79,7 +79,7 @@ class GenerateProjectsCliTest {

@Test
fun `resolve rejects android kotlin multiplatform library for jvm type`() {
val error = assertThrows<UsageError> {
val error = assertThrows<GenerateProjectRequestValidationException> {
GenerateProjectRequest.resolve(
modules = 6,
shape = Shape.RECTANGLE,
Expand Down
Loading