Only set genTypes default if query params is empty

cjbooms · Jan 13, 2025 · 35bd3e8 · 35bd3e8
1 parent ba65c85
commit 35bd3e8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/playground/src/main/kotlin/PlaygroundApplication.kt b/playground/src/main/kotlin/PlaygroundApplication.kt
@@ -49,6 +49,15 @@ fun main() {
             get("/") {
                 val generationSettings = call.queryParameters.receiveGenerationSettings()
                     .copy(inputSpec = sampleOpenApiSpec) // set the sample spec
+                    .run {
+                        // if no settings in query params we configure default
+                        // to ensure something is generated with just the sample spec
+                        if (call.queryParameters.isEmpty()) {
+                            copy(genTypes = setOf(CodeGenerationType.HTTP_MODELS))
+                        } else {
+                            this
+                        }
+                    }
 
                 call.respondHtml {
                     mainLayout {

diff --git a/playground/src/main/kotlin/lib/GenerationSettings.kt b/playground/src/main/kotlin/lib/GenerationSettings.kt
@@ -32,16 +32,12 @@ data class GenerationSettings(
          * Can be used for both query and form parameters.
          */
         fun Parameters.receiveGenerationSettings() = GenerationSettings(
-            genTypes = this.getAll("genTypes")?.map { CodeGenerationType.valueOf(it) }?.toSet() ?: setOf(
-                CodeGenerationType.HTTP_MODELS
-            ),
+            genTypes = this.getAll("genTypes")?.map { CodeGenerationType.valueOf(it) }?.toSet() ?: emptySet(),
 
             serializationLibrary = this["serializationLibrary"]?.let { SerializationLibrary.valueOf(it) }
                 ?: SerializationLibrary.default,
 
-            modelOptions = this.getAll("modelOptions")?.map { ModelCodeGenOptionType.valueOf(it) }?.toSet() ?: setOf(
-                ModelCodeGenOptionType.SEALED_INTERFACES_FOR_ONE_OF
-            ),
+            modelOptions = this.getAll("modelOptions")?.map { ModelCodeGenOptionType.valueOf(it) }?.toSet() ?: emptySet(),
 
             controllerTarget = this["controllerTarget"]?.let { ControllerCodeGenTargetType.valueOf(it) }
                 ?: ControllerCodeGenTargetType.default,