Simplify ToJSON Responses

GetShopTV · Mar 8, 2016 · 943ec04 · 943ec04
1 parent 2064b96
commit 943ec04
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/Data/Swagger/Internal.hs b/src/Data/Swagger/Internal.hs
@@ -978,8 +978,7 @@ instance ToJSON ParamOtherSchema where
   toJSON = genericToJSONWithSub "paramSchema" (jsonPrefix "paramOtherSchema")
 
 instance ToJSON Responses where
-  toJSON (Responses def rs) = omitEmpties $
-    toJSON (InsOrdHashMap.mapKeys show rs) <+> object [ "default" .= def ]
+  toJSON = omitEmpties . genericToJSONWithSub "responses" (jsonPrefix "responses")
 
 instance ToJSON Response where
   toJSON = omitEmpties . genericToJSON (jsonPrefix "response")

diff --git a/src/Data/Swagger/Internal/Utils.hs b/src/Data/Swagger/Internal/Utils.hs
@@ -111,7 +111,7 @@ genericParseJSONWithSub sub opts js@(Object o)
   <|> genericParseJSON opts js'   -- try with subjson
   where
     js' = Object (HashMap.insert sub (Object o) o)
-genericParseJSONWithSub _ _ _ = error "genericParseJSONWithSub: given json is not an object"
+genericParseJSONWithSub _ _ _ = fail "genericParseJSONWithSub: given json is not an object"
 
 (<+>) :: Value -> Value -> Value
 Object x <+> Object y = Object (x <> y)