render proper json for swagger with auth

scalatra · Feb 5, 2013 · e33449c · e33449c
1 parent 49e99b4
commit e33449c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/json/src/test/scala/org/scalatra/json/JValueResultSpec.scala b/json/src/test/scala/org/scalatra/json/JValueResultSpec.scala
@@ -38,6 +38,7 @@ class JValueResultSpec extends MutableScalatraSpec {
     get("/empty-halt") {
       halt(400, null)
     }
+
     error {
       case t: Throwable =>
         t.printStackTrace()

diff --git a/swagger-ext/src/main/scala/org/scalatra/swagger/SwaggerAuth.scala b/swagger-ext/src/main/scala/org/scalatra/swagger/SwaggerAuth.scala
@@ -123,7 +123,7 @@ object AuthApi {
     new ModelFieldSerializer,
     new AuthOperationSerializer(userOption)) ++ JodaTimeSerializers.all
 
-  def toJValue[T <: AnyRef](doc: Any, uOpt: Option[T]) = (Extraction.decompose(doc)(formats(uOpt)).noNulls)
+  def toJValue[T <: AnyRef](doc: Any, uOpt: Option[T]) = Extraction.decompose(doc)(formats(uOpt))
 
   class AuthOperationSerializer[T <: AnyRef](userOption: Option[T]) extends Serializer[AuthOperation[T]] {