git.iko.soy/typeable/openapi3
on master help sign in
Fix some defaults in FromJSON instances
966767eNickolay Kudasov
src/Data/Swagger/Internal.hs+18−4
compare with master
unifiedsplit
@@ -89,7 +89,7 @@ data Swagger = Swagger
89 , swaggerTags :: [SwaggerTag]
89 , swaggerTags :: [SwaggerTag]
90
90
91 -- | Additional external documentation.
91 -- | Additional external documentation.
92− , swaggerExternalDocs :: SwaggerExternalDocs
92+ , swaggerExternalDocs :: Maybe SwaggerExternalDocs
93 } deriving (Eq, Show, Generic)
93 } deriving (Eq, Show, Generic)
94
94
95-- | The object provides metadata about the API.
95-- | The object provides metadata about the API.
@@ -748,7 +748,6 @@ instance SwaggerMonoid SwaggerParameterSchema where
748
748
749deriveJSON (jsonPrefix "SwaggerParameter") ''SwaggerParameterLocation
749deriveJSON (jsonPrefix "SwaggerParameter") ''SwaggerParameterLocation
750deriveJSON (jsonPrefix "SwaggerParam") ''SwaggerParameterType
750deriveJSON (jsonPrefix "SwaggerParam") ''SwaggerParameterType
751−deriveJSON' ''SwaggerPathItem
752deriveJSON' ''SwaggerInfo
751deriveJSON' ''SwaggerInfo
753deriveJSON' ''SwaggerContact
752deriveJSON' ''SwaggerContact
754deriveJSON' ''SwaggerLicense
753deriveJSON' ''SwaggerLicense
@@ -766,6 +765,7 @@ deriveJSON' ''SwaggerXml
766
765
767deriveToJSON' ''SwaggerOperation
766deriveToJSON' ''SwaggerOperation
768deriveToJSON' ''SwaggerResponse
767deriveToJSON' ''SwaggerResponse
768+deriveToJSON' ''SwaggerPathItem
769
769
770-- =======================================================================
770-- =======================================================================
771-- Manual ToJSON instances
771-- Manual ToJSON instances
@@ -883,7 +883,16 @@ instance FromJSON Swagger where
883 parseJSON json@(Object o) = do
883 parseJSON json@(Object o) = do
884 (version :: Text) <- o .: "swagger"
884 (version :: Text) <- o .: "swagger"
885 when (version /= "2.0") empty
885 when (version /= "2.0") empty
886− genericParseJSON (jsonPrefix "swagger") json
886+ (genericParseJSON (jsonPrefix "swagger")
887+ `withDefaults` [ "consumes" .= (mempty :: SwaggerMimeList)
888+ , "produces" .= (mempty :: SwaggerMimeList)
889+ , "security" .= ([] :: [SwaggerSecurityRequirement])
890+ , "tags" .= ([] :: [SwaggerTag])
891+ , "definitions" .= (mempty :: HashMap Text SwaggerSchema)
892+ , "parameters" .= (mempty :: HashMap Text SwaggerParameter)
893+ , "responses" .= (mempty :: HashMap Text SwaggerResponse)
894+ , "securityDefinitions" .= (mempty :: HashMap Text SwaggerSecurityScheme)
895+ ] ) json
887 parseJSON _ = empty
896 parseJSON _ = empty
888
897
889instance FromJSON SwaggerSecurityScheme where
898instance FromJSON SwaggerSecurityScheme where
@@ -954,5 +963,10 @@ instance FromJSON SwaggerResponse where
954
963
955instance FromJSON SwaggerOperation where
964instance FromJSON SwaggerOperation where
956 parseJSON = genericParseJSON (jsonPrefix "swaggerOperation")
965 parseJSON = genericParseJSON (jsonPrefix "swaggerOperation")
957− `withDefaults` [ "deprecated" .= False ]
966+ `withDefaults` [ "deprecated" .= False
967+ , "security" .= ([] :: [SwaggerSecurityRequirement]) ]
968+
969+instance FromJSON SwaggerPathItem where
970+ parseJSON = genericParseJSON (jsonPrefix "swaggerPathItem")
971+ `withDefaults` [ "parameters" .= ([] :: [SwaggerParameter]) ]
958
972
src/Data/Swagger/Internal/Utils.hs+1−4
@@ -42,14 +42,11 @@ jsonPrefix prefix = defaultOptions
42 lowerFirstUppers s = map toLower x ++ y
42 lowerFirstUppers s = map toLower x ++ y
43 where (x, y) = span isUpper s
43 where (x, y) = span isUpper s
44
44
45−deriveToJSONDefault :: Name -> Q [Dec]
46−deriveToJSONDefault = deriveToJSON defaultOptions
47−
48deriveToJSON' :: Name -> Q [Dec]
45deriveToJSON' :: Name -> Q [Dec]
49deriveToJSON' name = deriveToJSON (jsonPrefix (nameBase name)) name
46deriveToJSON' name = deriveToJSON (jsonPrefix (nameBase name)) name
50
47
51deriveJSONDefault :: Name -> Q [Dec]
48deriveJSONDefault :: Name -> Q [Dec]
52−deriveJSONDefault = deriveJSON defaultOptions
49+deriveJSONDefault = deriveJSON (jsonPrefix "")
53
50
54deriveJSON' :: Name -> Q [Dec]
51deriveJSON' :: Name -> Q [Dec]
55deriveJSON' name = deriveJSON (jsonPrefix (nameBase name)) name
52deriveJSON' name = deriveJSON (jsonPrefix (nameBase name)) name