From 1b9d010e39f44935888c13e9be87463edbf40563 Mon Sep 17 00:00:00 2001 From: Raphael Tiersch Date: Thu, 14 Nov 2019 17:23:10 +0100 Subject: [PATCH 1/4] missing indent on the new feature pull request. --- .../src/main/resources/haskell-servant/API.mustache | 6 +++--- .../petstore/haskell-servant/lib/OpenAPIPetstore/API.hs | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/haskell-servant/API.mustache b/modules/openapi-generator/src/main/resources/haskell-servant/API.mustache index 400dee38f1db..ffe1ed1f64e0 100644 --- a/modules/openapi-generator/src/main/resources/haskell-servant/API.mustache +++ b/modules/openapi-generator/src/main/resources/haskell-servant/API.mustache @@ -219,9 +219,9 @@ requestMiddlewareId a = a -- | Run the {{title}} server at the provided host and port. run{{title}}Server -:: (MonadIO m, MonadThrow m) -=> Config -> {{title}}Backend (ExceptT ServerError IO) -> m () -run{{title}}Server config backend = run{{title}}MiddlewareServer config requestMiddlewareId backend + :: (MonadIO m, MonadThrow m) + => Config -> {{title}}Backend (ExceptT ServerError IO) -> m () + run{{title}}Server config backend = run{{title}}MiddlewareServer config requestMiddlewareId backend -- | Run the {{title}} server at the provided host and port. run{{title}}MiddlewareServer diff --git a/samples/server/petstore/haskell-servant/lib/OpenAPIPetstore/API.hs b/samples/server/petstore/haskell-servant/lib/OpenAPIPetstore/API.hs index a6d82d949705..20d1ceba2ecb 100644 --- a/samples/server/petstore/haskell-servant/lib/OpenAPIPetstore/API.hs +++ b/samples/server/petstore/haskell-servant/lib/OpenAPIPetstore/API.hs @@ -271,9 +271,9 @@ requestMiddlewareId a = a -- | Run the OpenAPIPetstore server at the provided host and port. runOpenAPIPetstoreServer -:: (MonadIO m, MonadThrow m) -=> Config -> OpenAPIPetstoreBackend (ExceptT ServerError IO) -> m () -runOpenAPIPetstoreServer config backend = runOpenAPIPetstoreMiddlewareServer config requestMiddlewareId backend + :: (MonadIO m, MonadThrow m) + => Config -> OpenAPIPetstoreBackend (ExceptT ServerError IO) -> m () + runOpenAPIPetstoreServer config backend = runOpenAPIPetstoreMiddlewareServer config requestMiddlewareId backend -- | Run the OpenAPIPetstore server at the provided host and port. runOpenAPIPetstoreMiddlewareServer From 262e5d81989ada829546bb5270b0b8df5608dc6f Mon Sep 17 00:00:00 2001 From: Raphael Tiersch Date: Thu, 14 Nov 2019 18:17:27 +0100 Subject: [PATCH 2/4] One indentation to much --- .../src/main/resources/haskell-servant/API.mustache | 2 +- .../server/petstore/haskell-servant/lib/OpenAPIPetstore/API.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/haskell-servant/API.mustache b/modules/openapi-generator/src/main/resources/haskell-servant/API.mustache index ffe1ed1f64e0..6d613496c9cf 100644 --- a/modules/openapi-generator/src/main/resources/haskell-servant/API.mustache +++ b/modules/openapi-generator/src/main/resources/haskell-servant/API.mustache @@ -221,7 +221,7 @@ requestMiddlewareId a = a run{{title}}Server :: (MonadIO m, MonadThrow m) => Config -> {{title}}Backend (ExceptT ServerError IO) -> m () - run{{title}}Server config backend = run{{title}}MiddlewareServer config requestMiddlewareId backend +run{{title}}MiddlewareServer config backend = run{{title}}MiddlewareServer config requestMiddlewareId backend -- | Run the {{title}} server at the provided host and port. run{{title}}MiddlewareServer diff --git a/samples/server/petstore/haskell-servant/lib/OpenAPIPetstore/API.hs b/samples/server/petstore/haskell-servant/lib/OpenAPIPetstore/API.hs index 20d1ceba2ecb..008126d8508d 100644 --- a/samples/server/petstore/haskell-servant/lib/OpenAPIPetstore/API.hs +++ b/samples/server/petstore/haskell-servant/lib/OpenAPIPetstore/API.hs @@ -273,7 +273,7 @@ requestMiddlewareId a = a runOpenAPIPetstoreServer :: (MonadIO m, MonadThrow m) => Config -> OpenAPIPetstoreBackend (ExceptT ServerError IO) -> m () - runOpenAPIPetstoreServer config backend = runOpenAPIPetstoreMiddlewareServer config requestMiddlewareId backend +runOpenAPIPetstoreServer config backend = runOpenAPIPetstoreMiddlewareServer config requestMiddlewareId backend -- | Run the OpenAPIPetstore server at the provided host and port. runOpenAPIPetstoreMiddlewareServer From d889fd6ba585b61b45bb858ed560264126ea8339 Mon Sep 17 00:00:00 2001 From: Raphael Tiersch Date: Thu, 14 Nov 2019 18:19:23 +0100 Subject: [PATCH 3/4] Import for application was still missing --- .../src/main/resources/haskell-servant/API.mustache | 2 +- .../server/petstore/haskell-servant/lib/OpenAPIPetstore/API.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/haskell-servant/API.mustache b/modules/openapi-generator/src/main/resources/haskell-servant/API.mustache index 6d613496c9cf..16d9df8fc7c7 100644 --- a/modules/openapi-generator/src/main/resources/haskell-servant/API.mustache +++ b/modules/openapi-generator/src/main/resources/haskell-servant/API.mustache @@ -61,7 +61,7 @@ import Servant.Client (ClientEnv, Scheme (Http), C mkClientEnv, parseBaseUrl) import Servant.Client.Core (baseUrlPort, baseUrlHost) import Servant.Client.Internal.HttpClient (ClientM (..)) -import Servant.Server (Handler (..)){{#serveStatic}} +import Servant.Server (Handler (..), Application){{#serveStatic}} import Servant.Server.StaticFiles (serveDirectoryFileServer){{/serveStatic}} import Web.FormUrlEncoded import Web.HttpApiData diff --git a/samples/server/petstore/haskell-servant/lib/OpenAPIPetstore/API.hs b/samples/server/petstore/haskell-servant/lib/OpenAPIPetstore/API.hs index 008126d8508d..a70eb607c7aa 100644 --- a/samples/server/petstore/haskell-servant/lib/OpenAPIPetstore/API.hs +++ b/samples/server/petstore/haskell-servant/lib/OpenAPIPetstore/API.hs @@ -61,7 +61,7 @@ import Servant.Client (ClientEnv, Scheme (Http), C mkClientEnv, parseBaseUrl) import Servant.Client.Core (baseUrlPort, baseUrlHost) import Servant.Client.Internal.HttpClient (ClientM (..)) -import Servant.Server (Handler (..)) +import Servant.Server (Handler (..), Application) import Servant.Server.StaticFiles (serveDirectoryFileServer) import Web.FormUrlEncoded import Web.HttpApiData From d7ed3afd72906de9ad406a65e50d76452cdacfa7 Mon Sep 17 00:00:00 2001 From: Raphael Tiersch Date: Thu, 14 Nov 2019 18:32:57 +0100 Subject: [PATCH 4/4] some middleware got in the runServer name --- .../src/main/resources/haskell-servant/API.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/haskell-servant/API.mustache b/modules/openapi-generator/src/main/resources/haskell-servant/API.mustache index 16d9df8fc7c7..684c469d33e3 100644 --- a/modules/openapi-generator/src/main/resources/haskell-servant/API.mustache +++ b/modules/openapi-generator/src/main/resources/haskell-servant/API.mustache @@ -221,7 +221,7 @@ requestMiddlewareId a = a run{{title}}Server :: (MonadIO m, MonadThrow m) => Config -> {{title}}Backend (ExceptT ServerError IO) -> m () -run{{title}}MiddlewareServer config backend = run{{title}}MiddlewareServer config requestMiddlewareId backend +run{{title}}Server config backend = run{{title}}MiddlewareServer config requestMiddlewareId backend -- | Run the {{title}} server at the provided host and port. run{{title}}MiddlewareServer