git.iko.soy/typeable/openapi3
on master help sign in
Fix SwaggerSchema a bit
commitf11bd07732d062aa9ea0bb4633ee06d3370b96c4 authorNickolay Kudasov <nickolay.kudasov@gmail.com> dateSun 8 Nov 2015, 00:52 (11 years ago) parent5475263
1 file changed+4−3
src/Data/Swagger/Internal.hs+4−3
src/Data/Swagger/Internal.hs+4−3
@@ -380,13 +380,13 @@ data SwaggerItemsCollectionFormat
380380
381381data SwaggerSchema = SwaggerSchema
382382 { swaggerSchemaType :: SwaggerSchemaType
383− , swaggerSchemaFormat :: SwaggerFormat
383+ , swaggerSchemaFormat :: Maybe SwaggerFormat
384384 , swaggerSchemaTitle :: Maybe Text
385385 , swaggerSchemaDescription :: Maybe Text
386386 , swaggerSchemaRequired :: Maybe Bool
387387
388− , swaggerSchemaItems :: SwaggerSchemaItems
389− , swaggerSchemaAllOf :: [SwaggerSchema]
388+ , swaggerSchemaItems :: Maybe SwaggerSchemaItems
389+ , swaggerSchemaAllOf :: Maybe [SwaggerSchema]
390390 , swaggerSchemaProperties :: HashMap Text SwaggerSchema
391391 , swaggerSchemaAdditionalProperties :: Maybe SwaggerSchema
392392
@@ -769,6 +769,7 @@ instance FromJSON SwaggerSecurityScheme where
769769
770770instance FromJSON SwaggerSchema where
771771 parseJSON = genericParseJSONWithSub "common" (jsonPrefix "swaggerSchema")
772+ `withDefaults` [ "properties" .= (mempty :: HashMap Text SwaggerSchema) ]
772773
773774instance FromJSON SwaggerHeader where
774775 parseJSON = genericParseJSONWithSub "common" (jsonPrefix "swaggerHeader")