git.iko.soy/typeable/openapi3
on master help sign in
Fix SwaggerSchema a bit
f11bd07Nickolay Kudasov
src/Data/Swagger/Internal.hs+4−3
compare with master
unifiedsplit
@@ -380,13 +380,13 @@ data SwaggerItemsCollectionFormat
380
380
381data SwaggerSchema = SwaggerSchema
381data SwaggerSchema = SwaggerSchema
382 { swaggerSchemaType :: SwaggerSchemaType
382 { swaggerSchemaType :: SwaggerSchemaType
383− , swaggerSchemaFormat :: SwaggerFormat
383+ , swaggerSchemaFormat :: Maybe SwaggerFormat
384 , swaggerSchemaTitle :: Maybe Text
384 , swaggerSchemaTitle :: Maybe Text
385 , swaggerSchemaDescription :: Maybe Text
385 , swaggerSchemaDescription :: Maybe Text
386 , swaggerSchemaRequired :: Maybe Bool
386 , swaggerSchemaRequired :: Maybe Bool
387
387
388− , swaggerSchemaItems :: SwaggerSchemaItems
388+ , swaggerSchemaItems :: Maybe SwaggerSchemaItems
389− , swaggerSchemaAllOf :: [SwaggerSchema]
389+ , swaggerSchemaAllOf :: Maybe [SwaggerSchema]
390 , swaggerSchemaProperties :: HashMap Text SwaggerSchema
390 , swaggerSchemaProperties :: HashMap Text SwaggerSchema
391 , swaggerSchemaAdditionalProperties :: Maybe SwaggerSchema
391 , swaggerSchemaAdditionalProperties :: Maybe SwaggerSchema
392
392
@@ -769,6 +769,7 @@ instance FromJSON SwaggerSecurityScheme where
769
769
770instance FromJSON SwaggerSchema where
770instance FromJSON SwaggerSchema where
771 parseJSON = genericParseJSONWithSub "common" (jsonPrefix "swaggerSchema")
771 parseJSON = genericParseJSONWithSub "common" (jsonPrefix "swaggerSchema")
772+ `withDefaults` [ "properties" .= (mempty :: HashMap Text SwaggerSchema) ]
772
773
773instance FromJSON SwaggerHeader where
774instance FromJSON SwaggerHeader where
774 parseJSON = genericParseJSONWithSub "common" (jsonPrefix "swaggerHeader")
775 parseJSON = genericParseJSONWithSub "common" (jsonPrefix "swaggerHeader")