These static imports are important, they were accidentally removed (#42)

* These static imports are important, they were accidentally removed when transitioning from Controller implementations to interfaces. There is a hole in our tests that doesn't pick this up, but it would be a time-consuming test to rejig * fixing warning
cjbooms · May 1, 2021 · 6dc029c · 6dc029c
1 parent eef549d
commit 6dc029c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/main/kotlin/com/cjbooms/fabrikt/generators/model/JacksonModelGenerator.kt b/src/main/kotlin/com/cjbooms/fabrikt/generators/model/JacksonModelGenerator.kt
@@ -190,8 +190,6 @@ class JacksonModelGenerator(
                             else -> emptySet()
                         }
                     }
-                else ->
-                    emptySet()
             }
         }
 

diff --git a/src/main/kotlin/com/cjbooms/fabrikt/model/KotlinGenModels.kt b/src/main/kotlin/com/cjbooms/fabrikt/model/KotlinGenModels.kt
@@ -1,5 +1,6 @@
 package com.cjbooms.fabrikt.model
 
+import com.cjbooms.fabrikt.generators.controller.metadata.SpringImports
 import com.cjbooms.fabrikt.model.Destinations.clientPackage
 import com.cjbooms.fabrikt.model.Destinations.controllersPackage
 import com.cjbooms.fabrikt.model.Destinations.modelsPackage
@@ -49,7 +50,15 @@ data class Clients(val clients: Collection<ClientType>) : KotlinTypes(clients) {
 }
 
 data class Controllers(val controllers: Collection<ControllerType>) : KotlinTypes(controllers) {
-    override val files: Collection<FileSpec> = controllers.toFileSpec()
+    override val files: Collection<FileSpec> = super.files.map {
+        it.toBuilder()
+            .addImport(SpringImports.Static.REQUEST_METHOD.first, SpringImports.Static.REQUEST_METHOD.second)
+            .addImport(
+                SpringImports.Static.RESPONSE_STATUS.first,
+                SpringImports.Static.RESPONSE_STATUS.second
+            )
+            .build()
+    }
 }
 
 data class MethodSignature(val name: String, val returnType: TypeName, val parameters: List<IncomingParameter>)
-Original file line number
+Diff line change
@@ Expand Up / @@ -190,8 +190,6 @@ class JacksonModelGenerator( @@
                                 else -> emptySet()
                             }
                         }
-                    else ->
-                        emptySet()
                 }
             }
@@ Expand Down @@