Merge remote-tracking branch 'origin/3.4.x' into 4.0.x

This commit is contained in:
William Cheng
2018-11-15 17:49:44 +08:00
581 changed files with 32821 additions and 958 deletions

View File

@@ -377,9 +377,15 @@ instance Produces TestEnumParameters MimeNoContent
-- Fake endpoint to test group parameters (optional)
--
testGroupParameters
:: OpenAPIPetstoreRequest TestGroupParameters MimeNoContent NoContent MimeNoContent
testGroupParameters =
:: RequiredStringGroup -- ^ "requiredStringGroup" - Required String in group parameters
-> RequiredBooleanGroup -- ^ "requiredBooleanGroup" - Required Boolean in group parameters
-> RequiredInt64Group -- ^ "requiredInt64Group" - Required Integer in group parameters
-> OpenAPIPetstoreRequest TestGroupParameters MimeNoContent NoContent MimeNoContent
testGroupParameters (RequiredStringGroup requiredStringGroup) (RequiredBooleanGroup requiredBooleanGroup) (RequiredInt64Group requiredInt64Group) =
_mkRequest "DELETE" ["/fake"]
`setQuery` toQuery ("required_string_group", Just requiredStringGroup)
`setHeader` toHeader ("required_boolean_group", requiredBooleanGroup)
`setQuery` toQuery ("required_int64_group", Just requiredInt64Group)
data TestGroupParameters

View File

@@ -180,9 +180,18 @@ newtype Query = Query { unQuery :: Text } deriving (P.Eq, P.Show)
-- ** RequestBody
newtype RequestBody = RequestBody { unRequestBody :: (Map.Map String Text) } deriving (P.Eq, P.Show, A.ToJSON)
-- ** RequiredBooleanGroup
newtype RequiredBooleanGroup = RequiredBooleanGroup { unRequiredBooleanGroup :: Bool } deriving (P.Eq, P.Show)
-- ** RequiredFile
newtype RequiredFile = RequiredFile { unRequiredFile :: FilePath } deriving (P.Eq, P.Show)
-- ** RequiredInt64Group
newtype RequiredInt64Group = RequiredInt64Group { unRequiredInt64Group :: Integer } deriving (P.Eq, P.Show)
-- ** RequiredStringGroup
newtype RequiredStringGroup = RequiredStringGroup { unRequiredStringGroup :: Int } deriving (P.Eq, P.Show)
-- ** Status
newtype Status = Status { unStatus :: [E'Status2] } deriving (P.Eq, P.Show)

View File

@@ -593,6 +593,25 @@ paths:
description: Fake endpoint to test group parameters (optional)
operationId: testGroupParameters
parameters:
- description: Required String in group parameters
in: query
name: required_string_group
required: true
schema:
type: integer
- description: Required Boolean in group parameters
in: header
name: required_boolean_group
required: true
schema:
type: boolean
- description: Required Integer in group parameters
in: query
name: required_int64_group
required: true
schema:
format: int64
type: integer
- description: String in group parameters
in: query
name: string_group