git.iko.soy/typeable/openapi3
on master help sign in
Factor out SwaggerSchemaCommon and add model for SwaggerSchemaItems
60c11bdNickolay Kudasov
src/Data/Swagger/Internal.hs+13−39
compare with master
unifiedsplit
@@ -394,12 +394,21 @@ data SwaggerSchema = SwaggerSchema
394 , swaggerSchemaMaxProperties :: Maybe Integer
394 , swaggerSchemaMaxProperties :: Maybe Integer
395 , swaggerSchemaMinProperties :: Maybe Integer
395 , swaggerSchemaMinProperties :: Maybe Integer
396
396
397+ , swaggerSchemaCommon :: SwaggerSchemaCommon
398+ } deriving (Show)
399+
400+data SwaggerSchemaItems
401+ = SwaggerSchemaItemsObject SwaggerSchema
402+ | SwaggerSchemaItemsArray [SwaggerSchema]
403+ deriving (Show)
404+
405+data SwaggerSchemaCommon = SwaggerSchemaCommon
397− -- | Declares the value of the parameter that the server will use if none is provided,
406+ { -- | Declares the value of the parameter that the server will use if none is provided,
398 -- for example a @"count"@ to control the number of results per page might default to @100@
407 -- for example a @"count"@ to control the number of results per page might default to @100@
399 -- if not supplied by the client in the request.
408 -- if not supplied by the client in the request.
400 -- (Note: "default" has no meaning for required parameters.)
409 -- (Note: "default" has no meaning for required parameters.)
401 -- Unlike JSON Schema this value MUST conform to the defined type for this parameter.
410 -- Unlike JSON Schema this value MUST conform to the defined type for this parameter.
402− , swaggerSchemaDefault :: Maybe JSON.Value
411+ swaggerSchemaDefault :: Maybe JSON.Value
403
412
404 , swaggerSchemaMaximum :: Maybe Integer
413 , swaggerSchemaMaximum :: Maybe Integer
405 , swaggerSchemaExclusiveMaximum :: Maybe Bool
414 , swaggerSchemaExclusiveMaximum :: Maybe Bool
@@ -415,9 +424,6 @@ data SwaggerSchema = SwaggerSchema
415 , swaggerSchemaMultipleOf :: Maybe Integer
424 , swaggerSchemaMultipleOf :: Maybe Integer
416 } deriving (Show)
425 } deriving (Show)
417
426
418−data SwaggerSchemaItems = SwaggerSchemaItems
419− deriving (Show)
420−
421data SwaggerXml = SwaggerXml
427data SwaggerXml = SwaggerXml
422 { -- | Replaces the name of the element/attribute used for the described schema property.
428 { -- | Replaces the name of the element/attribute used for the described schema property.
423 -- When defined within the @'SwaggerItems'@ (items), it will affect the name of the individual XML elements within the list.
429 -- When defined within the @'SwaggerItems'@ (items), it will affect the name of the individual XML elements within the list.
@@ -461,23 +467,7 @@ data SwaggerItems = SwaggerItems
461 -- Default value is @'SwaggerItemsCollectionCSV'@.
467 -- Default value is @'SwaggerItemsCollectionCSV'@.
462 , swaggerItemsCollectionFormat :: SwaggerItemsCollectionFormat
468 , swaggerItemsCollectionFormat :: SwaggerItemsCollectionFormat
463
469
464− -- | Declares the value of the item that the server will use if none is provided.
470+ , swaggerItemsCommon :: SwaggerSchemaCommon
465− -- (Note: "default" has no meaning for required items.)
466− -- Unlike JSON Schema this value MUST conform to the defined type for the data type.
467− , swaggerItemsDefault :: JSON.Value
468−
469− , swaggerItemsMaximum :: Maybe Integer
470− , swaggerItemsExclusiveMaximum :: Maybe Bool
471− , swaggerItemsMinimum :: Maybe Integer
472− , swaggerItemsExclusiveMinimum :: Maybe Bool
473− , swaggerItemsMaxLength :: Maybe Integer
474− , swaggerItemsMinLength :: Maybe Integer
475− , swaggerItemsPattern :: Maybe Text
476− , swaggerItemsMaxItems :: Maybe Integer
477− , swaggerItemsMinItems :: Maybe Integer
478− , swaggerItemsUniqueItems :: Maybe Bool
479− , swaggerItemsEnum :: Maybe [JSON.Value]
480− , swaggerItemsMultipleOf :: Maybe Integer
481 } deriving (Show)
471 } deriving (Show)
482
472
483-- | A container for the expected responses of an operation.
473-- | A container for the expected responses of an operation.
@@ -537,23 +527,7 @@ data SwaggerHeader = SwaggerHeader
537 -- Default value is @'SwaggerItemsCollectionCSV'@.
527 -- Default value is @'SwaggerItemsCollectionCSV'@.
538 , swaggerHeaderCollectionFormat :: SwaggerItemsCollectionFormat
528 , swaggerHeaderCollectionFormat :: SwaggerItemsCollectionFormat
539
529
540− -- | Declares the value of the item that the server will use if none is provided.
530+ , swaggerHeaderCommon :: SwaggerSchemaCommon
541− -- (Note: "default" has no meaning for required items.)
542− -- Unlike JSON Schema this value MUST conform to the defined type for the data type.
543− , swaggerHeaderDefault :: JSON.Value
544−
545− , swaggerHeaderMaximum :: Maybe Integer
546− , swaggerHeaderExclusiveMaximum :: Maybe Bool
547− , swaggerHeaderMinimum :: Maybe Integer
548− , swaggerHeaderExclusiveMinimum :: Maybe Bool
549− , swaggerHeaderMaxLength :: Maybe Integer
550− , swaggerHeaderMinLength :: Maybe Integer
551− , swaggerHeaderPattern :: Maybe Text
552− , swaggerHeaderMaxItems :: Maybe Integer
553− , swaggerHeaderMinItems :: Maybe Integer
554− , swaggerHeaderUniqueItems :: Maybe Bool
555− , swaggerHeaderEnum :: Maybe [JSON.Value]
556− , swaggerHeaderMultipleOf :: Maybe Integer
557 } deriving (Show)
531 } deriving (Show)
558
532
559data SwaggerExample = SwaggerExample
533data SwaggerExample = SwaggerExample