Merge pull request #568 from Nezisi/cast-null-to-jsnull

Match a default value of "null" to JsNull
iheartradio · Jul 18, 2023 · 85ec204 · 85ec204
2 parents bac613b + b973fe9
commit 85ec204
Showing 1 changed file with 15 additions and 12 deletions.
diff --git a/core/src/main/scala/com/iheart/playSwagger/SwaggerParameterMapper.scala b/core/src/main/scala/com/iheart/playSwagger/SwaggerParameterMapper.scala
@@ -37,19 +37,22 @@ object SwaggerParameterMapper {
 
     val defaultValueO: Option[JsValue] = {
       parameter.default.map { value =>
-        typeName match {
-          case ci"Int" | ci"Long" => JsNumber(value.toLong)
-          case ci"Double" | ci"Float" | ci"BigDecimal" => JsNumber(value.toDouble)
-          case ci"Boolean" => JsBoolean(value.toBoolean)
-          case ci"String" => {
-            val noquotes = value match {
-              case c if c.startsWith("\"\"\"") && c.endsWith("\"\"\"") => c.substring(3, c.length - 3)
-              case c if c.startsWith("\"") && c.endsWith("\"") => c.substring(1, c.length - 1)
-              case c => c
-            }
-            JsString(noquotes)
+        if (value.equals("null")) {
+          JsNull
+        } else {
+          typeName match {
+            case ci"Int" | ci"Long" => JsNumber(value.toLong)
+            case ci"Double" | ci"Float" | ci"BigDecimal" => JsNumber(value.toDouble)
+            case ci"Boolean" => JsBoolean(value.toBoolean)
+            case ci"String" =>
+              val unquotedString = value match {
+                case c if c.startsWith("\"\"\"") && c.endsWith("\"\"\"") => c.substring(3, c.length - 3)
+                case c if c.startsWith("\"") && c.endsWith("\"") => c.substring(1, c.length - 1)
+                case c => c
+              }
+              JsString(unquotedString)
+            case _ => JsString(value)
           }
-          case _ => JsString(value)
         }
       }
     }