git.iko.soy/typeable/swagger2
on master help sign in
Fix Schema object's required field
commit43e3605e763b08255c6cbb0fb8919647ff898c58 authorNickolay Kudasov <nickolay.kudasov@gmail.com> dateSun 8 Nov 2015, 16:39 (11 years ago) parent18e18f5
2 files changed+6−2
compare with master
unifiedsplit
src/Data/Swagger.hs+1 src/Data/Swagger/Internal.hs+5−2
src/Data/Swagger.hs+1
@@ -37,6 +37,7 @@ module Data.Swagger (
3737 SwaggerParameterSchema(..),
3838 SwaggerParameterOtherSchema(..),
3939 SwaggerParameterLocation(..),
40+ SwaggerParamName(..),
4041 SwaggerItems(..),
4142 SwaggerHeader(..),
4243 SwaggerExample(..),
src/Data/Swagger/Internal.hs+5−2
@@ -381,12 +381,14 @@ data SwaggerItemsCollectionFormat
381381 | SwaggerItemsCollectionPipes -- ^ Pipe separated values: @foo|bar@.
382382 deriving (Eq, Show)
383383
384+type SwaggerParamName = Text
385+
384386data SwaggerSchema = SwaggerSchema
385387 { swaggerSchemaType :: SwaggerSchemaType
386388 , swaggerSchemaFormat :: Maybe SwaggerFormat
387389 , swaggerSchemaTitle :: Maybe Text
388390 , swaggerSchemaDescription :: Maybe Text
389− , swaggerSchemaRequired :: Maybe Bool
391+ , swaggerSchemaRequired :: [SwaggerParamName]
390392
391393 , swaggerSchemaItems :: Maybe SwaggerSchemaItems
392394 , swaggerSchemaAllOf :: Maybe [SwaggerSchema]
@@ -889,7 +891,8 @@ instance FromJSON SwaggerSecurityScheme where
889891
890892instance FromJSON SwaggerSchema where
891893 parseJSON = genericParseJSONWithSub "common" (jsonPrefix "swaggerSchema")
892− `withDefaults` [ "properties" .= (mempty :: HashMap Text SwaggerSchema) ]
894+ `withDefaults` [ "properties" .= (mempty :: HashMap Text SwaggerSchema)
895+ , "required" .= ([] :: [SwaggerParamName]) ]
893896
894897instance FromJSON SwaggerHeader where
895898 parseJSON = genericParseJSONWithSub "common" (jsonPrefix "swaggerHeader")