Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[FIX][Haskell-servant] missing indent on the new feature pull request. #4490

Merged
merged 4 commits into from
Nov 20, 2019
Merged

[FIX][Haskell-servant] missing indent on the new feature pull request. #4490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1b9d010
missing indent on the new feature pull request.
Fjolnir-Dvorak Nov 14, 2019
262e5d8
One indentation to much
Fjolnir-Dvorak Nov 14, 2019
d889fd6
Import for application was still missing
Fjolnir-Dvorak Nov 14, 2019
d7ed3af
some middleware got in the runServer name
Fjolnir-Dvorak Nov 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions modules/openapi-generator/src/main/resources/haskell-servant/API.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -219,8 +219,8 @@ 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 ()
:: (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.
Expand Down
6 changes: 3 additions & 3 deletions samples/server/petstore/haskell-servant/lib/OpenAPIPetstore/API.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -271,8 +271,8 @@ requestMiddlewareId a = a

-- | Run the OpenAPIPetstore server at the provided host and port.
runOpenAPIPetstoreServer
:: (MonadIO m, MonadThrow m)
=> Config -> OpenAPIPetstoreBackend (ExceptT ServerError IO) -> m ()
:: (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.
Expand Down