git.iko.soy/typeable/mock-server-client
on master help sign in
Merge branch 'update-generated-code'
commit7878d311edd8d9b4965e97db87f24c562c735a86 authorAleksey Uymanov <s9gf4ult@gmail.com> dateFri 20 Jan 2023, 12:36 (4 years ago) parent3f2964ed876333
7 files changed+76−5
compare with master
unifiedsplit
mock-server-client.cabal+1 src/MockServer.hs+2 src/MockServer/Operations/Put_mockserver_retrieve.hs+2−2 src/MockServer/Types.hs+2 src/MockServer/Types/HttpRequest.hs+7−3 src/MockServer/Types/Protocol.hs+53 src/MockServer/Types/Protocol.hs-boot+9
mock-server-client.cabal+1
@@ -47,6 +47,7 @@ library
4747 MockServer.Types.OpenAPIExpectations
4848 MockServer.Types.ParameterBodyMatcher
4949 MockServer.Types.Ports
50+ MockServer.Types.Protocol
5051 MockServer.Types.RegexBodyMatcher
5152 MockServer.Types.RequestDefinition
5253 MockServer.Types.SocketAddress
src/MockServer.hs+2
@@ -42,6 +42,7 @@ module MockServer (
4242 module MockServer.Types.OpenAPIExpectations,
4343 module MockServer.Types.ParameterBodyMatcher,
4444 module MockServer.Types.Ports,
45+ module MockServer.Types.Protocol,
4546 module MockServer.Types.RegexBodyMatcher,
4647 module MockServer.Types.RequestDefinition,
4748 module MockServer.Types.SocketAddress,
@@ -102,6 +103,7 @@ import MockServer.Types.OpenAPIExpectation
102103import MockServer.Types.OpenAPIExpectations
103104import MockServer.Types.ParameterBodyMatcher
104105import MockServer.Types.Ports
106+import MockServer.Types.Protocol
105107import MockServer.Types.RegexBodyMatcher
106108import MockServer.Types.RequestDefinition
107109import MockServer.Types.SocketAddress
src/MockServer/Operations/Put_mockserver_retrieve.hs+2−2
@@ -62,7 +62,7 @@ put_mockserver_retrieve parameters
6262data Put_mockserver_retrieveParameters = Put_mockserver_retrieveParameters {
6363 -- | queryFormat: Represents the parameter named \'format\'
6464 --
65− -- changes response format, default if not specificed is \"json\", supported values are \"java\", \"json\", \"log_entries\"
65+ -- changes response format, default if not specified is \"json\", supported values are \"java\", \"json\", \"log_entries\"
6666 put_mockserver_retrieveParametersQueryFormat :: (GHC.Maybe.Maybe Put_mockserver_retrieveParametersQueryFormat)
6767 -- | queryType: Represents the parameter named \'type\'
6868 --
@@ -83,7 +83,7 @@ mkPut_mockserver_retrieveParameters = Put_mockserver_retrieveParameters{put_mock
8383--
8484-- Represents the parameter named \'format\'
8585--
86−-- changes response format, default if not specificed is \"json\", supported values are \"java\", \"json\", \"log_entries\"
86+-- changes response format, default if not specified is \"json\", supported values are \"java\", \"json\", \"log_entries\"
8787data Put_mockserver_retrieveParametersQueryFormat =
8888 Put_mockserver_retrieveParametersQueryFormatOther Data.Aeson.Types.Internal.Value -- ^ This case is used if the value encountered during decoding does not match any of the provided cases in the specification.
8989 | Put_mockserver_retrieveParametersQueryFormatTyped Data.Text.Internal.Text -- ^ This constructor can be used to send values to the server which are not present in the specification yet.
src/MockServer/Types.hs+2
@@ -31,6 +31,7 @@ module MockServer.Types (
3131 module MockServer.Types.OpenAPIExpectations,
3232 module MockServer.Types.ParameterBodyMatcher,
3333 module MockServer.Types.Ports,
34+ module MockServer.Types.Protocol,
3435 module MockServer.Types.RegexBodyMatcher,
3536 module MockServer.Types.RequestDefinition,
3637 module MockServer.Types.SocketAddress,
@@ -77,6 +78,7 @@ import MockServer.Types.OpenAPIExpectation
7778import MockServer.Types.OpenAPIExpectations
7879import MockServer.Types.ParameterBodyMatcher
7980import MockServer.Types.Ports
81+import MockServer.Types.Protocol
8082import MockServer.Types.RegexBodyMatcher
8183import MockServer.Types.RequestDefinition
8284import MockServer.Types.SocketAddress
src/MockServer/Types/HttpRequest.hs+7−3
@@ -35,6 +35,7 @@ import MockServer.TypeAlias
3535import {-# SOURCE #-} MockServer.Types.Body
3636import {-# SOURCE #-} MockServer.Types.KeyToMultiValue
3737import {-# SOURCE #-} MockServer.Types.KeyToValue
38+import {-# SOURCE #-} MockServer.Types.Protocol
3839import {-# SOURCE #-} MockServer.Types.SocketAddress
3940import {-# SOURCE #-} MockServer.Types.StringOrJsonSchema
4041
@@ -56,6 +57,8 @@ data HttpRequest = HttpRequest {
5657 , httpRequestPath :: (GHC.Maybe.Maybe StringOrJsonSchema)
5758 -- | pathParameters
5859 , httpRequestPathParameters :: (GHC.Maybe.Maybe KeyToMultiValue)
60+ -- | protocol: protocol matcher
61+ , httpRequestProtocol :: (GHC.Maybe.Maybe Protocol)
5962 -- | queryStringParameters
6063 , httpRequestQueryStringParameters :: (GHC.Maybe.Maybe KeyToMultiValue)
6164 -- | secure
@@ -65,10 +68,10 @@ data HttpRequest = HttpRequest {
6568 } deriving (GHC.Show.Show
6669 , GHC.Classes.Eq)
6770instance Data.Aeson.Types.ToJSON.ToJSON HttpRequest
68− where toJSON obj = Data.Aeson.Types.Internal.object (Data.Foldable.concat (Data.Maybe.maybe GHC.Base.mempty (GHC.Base.pure GHC.Base.. ("body" Data.Aeson.Types.ToJSON..=)) (httpRequestBody obj) : Data.Maybe.maybe GHC.Base.mempty (GHC.Base.pure GHC.Base.. ("cookies" Data.Aeson.Types.ToJSON..=)) (httpRequestCookies obj) : Data.Maybe.maybe GHC.Base.mempty (GHC.Base.pure GHC.Base.. ("headers" Data.Aeson.Types.ToJSON..=)) (httpRequestHeaders obj) : Data.Maybe.maybe GHC.Base.mempty (GHC.Base.pure GHC.Base.. ("keepAlive" Data.Aeson.Types.ToJSON..=)) (httpRequestKeepAlive obj) : Data.Maybe.maybe GHC.Base.mempty (GHC.Base.pure GHC.Base.. ("method" Data.Aeson.Types.ToJSON..=)) (httpRequestMethod obj) : Data.Maybe.maybe GHC.Base.mempty (GHC.Base.pure GHC.Base.. ("path" Data.Aeson.Types.ToJSON..=)) (httpRequestPath obj) : Data.Maybe.maybe GHC.Base.mempty (GHC.Base.pure GHC.Base.. ("pathParameters" Data.Aeson.Types.ToJSON..=)) (httpRequestPathParameters obj) : Data.Maybe.maybe GHC.Base.mempty (GHC.Base.pure GHC.Base.. ("queryStringParameters" Data.Aeson.Types.ToJSON..=)) (httpRequestQueryStringParameters obj) : Data.Maybe.maybe GHC.Base.mempty (GHC.Base.pure GHC.Base.. ("secure" Data.Aeson.Types.ToJSON..=)) (httpRequestSecure obj) : Data.Maybe.maybe GHC.Base.mempty (GHC.Base.pure GHC.Base.. ("socketAddress" Data.Aeson.Types.ToJSON..=)) (httpRequestSocketAddress obj) : GHC.Base.mempty))
69− toEncoding obj = Data.Aeson.Encoding.Internal.pairs (GHC.Base.mconcat (Data.Foldable.concat (Data.Maybe.maybe GHC.Base.mempty (GHC.Base.pure GHC.Base.. ("body" Data.Aeson.Types.ToJSON..=)) (httpRequestBody obj) : Data.Maybe.maybe GHC.Base.mempty (GHC.Base.pure GHC.Base.. ("cookies" Data.Aeson.Types.ToJSON..=)) (httpRequestCookies obj) : Data.Maybe.maybe GHC.Base.mempty (GHC.Base.pure GHC.Base.. ("headers" Data.Aeson.Types.ToJSON..=)) (httpRequestHeaders obj) : Data.Maybe.maybe GHC.Base.mempty (GHC.Base.pure GHC.Base.. ("keepAlive" Data.Aeson.Types.ToJSON..=)) (httpRequestKeepAlive obj) : Data.Maybe.maybe GHC.Base.mempty (GHC.Base.pure GHC.Base.. ("method" Data.Aeson.Types.ToJSON..=)) (httpRequestMethod obj) : Data.Maybe.maybe GHC.Base.mempty (GHC.Base.pure GHC.Base.. ("path" Data.Aeson.Types.ToJSON..=)) (httpRequestPath obj) : Data.Maybe.maybe GHC.Base.mempty (GHC.Base.pure GHC.Base.. ("pathParameters" Data.Aeson.Types.ToJSON..=)) (httpRequestPathParameters obj) : Data.Maybe.maybe GHC.Base.mempty (GHC.Base.pure GHC.Base.. ("queryStringParameters" Data.Aeson.Types.ToJSON..=)) (httpRequestQueryStringParameters obj) : Data.Maybe.maybe GHC.Base.mempty (GHC.Base.pure GHC.Base.. ("secure" Data.Aeson.Types.ToJSON..=)) (httpRequestSecure obj) : Data.Maybe.maybe GHC.Base.mempty (GHC.Base.pure GHC.Base.. ("socketAddress" Data.Aeson.Types.ToJSON..=)) (httpRequestSocketAddress obj) : GHC.Base.mempty)))
71+ where toJSON obj = Data.Aeson.Types.Internal.object (Data.Foldable.concat (Data.Maybe.maybe GHC.Base.mempty (GHC.Base.pure GHC.Base.. ("body" Data.Aeson.Types.ToJSON..=)) (httpRequestBody obj) : Data.Maybe.maybe GHC.Base.mempty (GHC.Base.pure GHC.Base.. ("cookies" Data.Aeson.Types.ToJSON..=)) (httpRequestCookies obj) : Data.Maybe.maybe GHC.Base.mempty (GHC.Base.pure GHC.Base.. ("headers" Data.Aeson.Types.ToJSON..=)) (httpRequestHeaders obj) : Data.Maybe.maybe GHC.Base.mempty (GHC.Base.pure GHC.Base.. ("keepAlive" Data.Aeson.Types.ToJSON..=)) (httpRequestKeepAlive obj) : Data.Maybe.maybe GHC.Base.mempty (GHC.Base.pure GHC.Base.. ("method" Data.Aeson.Types.ToJSON..=)) (httpRequestMethod obj) : Data.Maybe.maybe GHC.Base.mempty (GHC.Base.pure GHC.Base.. ("path" Data.Aeson.Types.ToJSON..=)) (httpRequestPath obj) : Data.Maybe.maybe GHC.Base.mempty (GHC.Base.pure GHC.Base.. ("pathParameters" Data.Aeson.Types.ToJSON..=)) (httpRequestPathParameters obj) : Data.Maybe.maybe GHC.Base.mempty (GHC.Base.pure GHC.Base.. ("protocol" Data.Aeson.Types.ToJSON..=)) (httpRequestProtocol obj) : Data.Maybe.maybe GHC.Base.mempty (GHC.Base.pure GHC.Base.. ("queryStringParameters" Data.Aeson.Types.ToJSON..=)) (httpRequestQueryStringParameters obj) : Data.Maybe.maybe GHC.Base.mempty (GHC.Base.pure GHC.Base.. ("secure" Data.Aeson.Types.ToJSON..=)) (httpRequestSecure obj) : Data.Maybe.maybe GHC.Base.mempty (GHC.Base.pure GHC.Base.. ("socketAddress" Data.Aeson.Types.ToJSON..=)) (httpRequestSocketAddress obj) : GHC.Base.mempty))
72+ toEncoding obj = Data.Aeson.Encoding.Internal.pairs (GHC.Base.mconcat (Data.Foldable.concat (Data.Maybe.maybe GHC.Base.mempty (GHC.Base.pure GHC.Base.. ("body" Data.Aeson.Types.ToJSON..=)) (httpRequestBody obj) : Data.Maybe.maybe GHC.Base.mempty (GHC.Base.pure GHC.Base.. ("cookies" Data.Aeson.Types.ToJSON..=)) (httpRequestCookies obj) : Data.Maybe.maybe GHC.Base.mempty (GHC.Base.pure GHC.Base.. ("headers" Data.Aeson.Types.ToJSON..=)) (httpRequestHeaders obj) : Data.Maybe.maybe GHC.Base.mempty (GHC.Base.pure GHC.Base.. ("keepAlive" Data.Aeson.Types.ToJSON..=)) (httpRequestKeepAlive obj) : Data.Maybe.maybe GHC.Base.mempty (GHC.Base.pure GHC.Base.. ("method" Data.Aeson.Types.ToJSON..=)) (httpRequestMethod obj) : Data.Maybe.maybe GHC.Base.mempty (GHC.Base.pure GHC.Base.. ("path" Data.Aeson.Types.ToJSON..=)) (httpRequestPath obj) : Data.Maybe.maybe GHC.Base.mempty (GHC.Base.pure GHC.Base.. ("pathParameters" Data.Aeson.Types.ToJSON..=)) (httpRequestPathParameters obj) : Data.Maybe.maybe GHC.Base.mempty (GHC.Base.pure GHC.Base.. ("protocol" Data.Aeson.Types.ToJSON..=)) (httpRequestProtocol obj) : Data.Maybe.maybe GHC.Base.mempty (GHC.Base.pure GHC.Base.. ("queryStringParameters" Data.Aeson.Types.ToJSON..=)) (httpRequestQueryStringParameters obj) : Data.Maybe.maybe GHC.Base.mempty (GHC.Base.pure GHC.Base.. ("secure" Data.Aeson.Types.ToJSON..=)) (httpRequestSecure obj) : Data.Maybe.maybe GHC.Base.mempty (GHC.Base.pure GHC.Base.. ("socketAddress" Data.Aeson.Types.ToJSON..=)) (httpRequestSocketAddress obj) : GHC.Base.mempty)))
7073instance Data.Aeson.Types.FromJSON.FromJSON HttpRequest
71− where parseJSON = Data.Aeson.Types.FromJSON.withObject "HttpRequest" (\obj -> (((((((((GHC.Base.pure HttpRequest GHC.Base.<*> (obj Data.Aeson.Types.FromJSON..:! "body")) GHC.Base.<*> (obj Data.Aeson.Types.FromJSON..:! "cookies")) GHC.Base.<*> (obj Data.Aeson.Types.FromJSON..:! "headers")) GHC.Base.<*> (obj Data.Aeson.Types.FromJSON..:! "keepAlive")) GHC.Base.<*> (obj Data.Aeson.Types.FromJSON..:! "method")) GHC.Base.<*> (obj Data.Aeson.Types.FromJSON..:! "path")) GHC.Base.<*> (obj Data.Aeson.Types.FromJSON..:! "pathParameters")) GHC.Base.<*> (obj Data.Aeson.Types.FromJSON..:! "queryStringParameters")) GHC.Base.<*> (obj Data.Aeson.Types.FromJSON..:! "secure")) GHC.Base.<*> (obj Data.Aeson.Types.FromJSON..:! "socketAddress"))
74+ where parseJSON = Data.Aeson.Types.FromJSON.withObject "HttpRequest" (\obj -> ((((((((((GHC.Base.pure HttpRequest GHC.Base.<*> (obj Data.Aeson.Types.FromJSON..:! "body")) GHC.Base.<*> (obj Data.Aeson.Types.FromJSON..:! "cookies")) GHC.Base.<*> (obj Data.Aeson.Types.FromJSON..:! "headers")) GHC.Base.<*> (obj Data.Aeson.Types.FromJSON..:! "keepAlive")) GHC.Base.<*> (obj Data.Aeson.Types.FromJSON..:! "method")) GHC.Base.<*> (obj Data.Aeson.Types.FromJSON..:! "path")) GHC.Base.<*> (obj Data.Aeson.Types.FromJSON..:! "pathParameters")) GHC.Base.<*> (obj Data.Aeson.Types.FromJSON..:! "protocol")) GHC.Base.<*> (obj Data.Aeson.Types.FromJSON..:! "queryStringParameters")) GHC.Base.<*> (obj Data.Aeson.Types.FromJSON..:! "secure")) GHC.Base.<*> (obj Data.Aeson.Types.FromJSON..:! "socketAddress"))
7275-- | Create a new 'HttpRequest' with all required fields.
7376mkHttpRequest :: HttpRequest
7477mkHttpRequest = HttpRequest{httpRequestBody = GHC.Maybe.Nothing,
@@ -78,6 +81,7 @@ mkHttpRequest = HttpRequest{httpRequestBody = GHC.Maybe.Nothing,
7881 httpRequestMethod = GHC.Maybe.Nothing,
7982 httpRequestPath = GHC.Maybe.Nothing,
8083 httpRequestPathParameters = GHC.Maybe.Nothing,
84+ httpRequestProtocol = GHC.Maybe.Nothing,
8185 httpRequestQueryStringParameters = GHC.Maybe.Nothing,
8286 httpRequestSecure = GHC.Maybe.Nothing,
8387 httpRequestSocketAddress = GHC.Maybe.Nothing}
src/MockServer/Types/Protocol.hsnew file+53
@@ -0,0 +1,53 @@
1+-- CHANGE WITH CAUTION: This is a generated code file generated by https://github.com/Haskell-OpenAPI-Code-Generator/Haskell-OpenAPI-Client-Code-Generator.
2+
3+{-# LANGUAGE OverloadedStrings #-}
4+{-# LANGUAGE MultiWayIf #-}
5+
6+-- | Contains the types generated from the schema Protocol
7+module MockServer.Types.Protocol where
8+
9+import qualified Prelude as GHC.Integer.Type
10+import qualified Prelude as GHC.Maybe
11+import qualified Control.Monad.Fail
12+import qualified Data.Aeson
13+import qualified Data.Aeson as Data.Aeson.Encoding.Internal
14+import qualified Data.Aeson as Data.Aeson.Types
15+import qualified Data.Aeson as Data.Aeson.Types.FromJSON
16+import qualified Data.Aeson as Data.Aeson.Types.ToJSON
17+import qualified Data.Aeson as Data.Aeson.Types.Internal
18+import qualified Data.ByteString.Char8
19+import qualified Data.ByteString.Char8 as Data.ByteString.Internal
20+import qualified Data.Foldable
21+import qualified Data.Functor
22+import qualified Data.Maybe
23+import qualified Data.Scientific
24+import qualified Data.Text
25+import qualified Data.Text.Internal
26+import qualified Data.Time.Calendar as Data.Time.Calendar.Days
27+import qualified Data.Time.LocalTime as Data.Time.LocalTime.Internal.ZonedTime
28+import qualified GHC.Base
29+import qualified GHC.Classes
30+import qualified GHC.Int
31+import qualified GHC.Show
32+import qualified GHC.Types
33+import qualified MockServer.Common
34+import MockServer.TypeAlias
35+
36+-- | Defines the enum schema located at @components.schemas.Protocol@ in the specification.
37+--
38+-- protocol matcher
39+data Protocol =
40+ ProtocolOther Data.Aeson.Types.Internal.Value -- ^ This case is used if the value encountered during decoding does not match any of the provided cases in the specification.
41+ | ProtocolTyped Data.Aeson.Types.Internal.Object -- ^ This constructor can be used to send values to the server which are not present in the specification yet.
42+ | ProtocolEnumHTTP_1_1 -- ^ Represents the JSON value @"HTTP_1_1"@
43+ | ProtocolEnumHTTP_2 -- ^ Represents the JSON value @"HTTP_2"@
44+ deriving (GHC.Show.Show, GHC.Classes.Eq)
45+instance Data.Aeson.Types.ToJSON.ToJSON Protocol
46+ where toJSON (ProtocolOther val) = val
47+ toJSON (ProtocolTyped val) = Data.Aeson.Types.ToJSON.toJSON val
48+ toJSON (ProtocolEnumHTTP_1_1) = "HTTP_1_1"
49+ toJSON (ProtocolEnumHTTP_2) = "HTTP_2"
50+instance Data.Aeson.Types.FromJSON.FromJSON Protocol
51+ where parseJSON val = GHC.Base.pure (if | val GHC.Classes.== "HTTP_1_1" -> ProtocolEnumHTTP_1_1
52+ | val GHC.Classes.== "HTTP_2" -> ProtocolEnumHTTP_2
53+ | GHC.Base.otherwise -> ProtocolOther val)
src/MockServer/Types/Protocol.hs-bootnew file+9
@@ -0,0 +1,9 @@
1+module MockServer.Types.Protocol where
2+import Data.Aeson
3+import qualified Data.Aeson as Data.Aeson.Types.Internal
4+import qualified MockServer.Common
5+data Protocol
6+instance Show Protocol
7+instance Eq Protocol
8+instance FromJSON Protocol
9+instance ToJSON Protocol