From 743a533c65da800a60cfa4ddc07fc25ae105dc1f Mon Sep 17 00:00:00 2001 From: wing328 Date: Tue, 2 Feb 2016 22:37:01 +0800 Subject: [PATCH] minor fix to template location for haskell --- .../swagger/codegen/languages/HaskellServantCodegen.java | 4 ++-- samples/server/petstore/haskell-servant/client/Main.hs | 2 +- .../haskell-servant/haskell-servant-codegen.cabal | 8 ++------ .../server/petstore/haskell-servant/lib/Api/PetApi.hs | 9 +++++++++ samples/server/petstore/haskell-servant/lib/Apis.hs | 4 ++-- 5 files changed, 16 insertions(+), 11 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/HaskellServantCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/HaskellServantCodegen.java index f70e416a299..bcc4dff81fd 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/HaskellServantCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/HaskellServantCodegen.java @@ -74,7 +74,7 @@ public class HaskellServantCodegen extends DefaultCodegen implements CodegenConf * Template Location. This is the location which templates will be read from. The generator * will use the resource stream to attempt to read the templates. */ - embeddedTemplateDir = templateDir = "haskell"; + embeddedTemplateDir = templateDir = "haskell-servant"; /** * Api Package. Optional, if needed, this can be used in templates @@ -342,4 +342,4 @@ public class HaskellServantCodegen extends DefaultCodegen implements CodegenConf return op; } -} \ No newline at end of file +} diff --git a/samples/server/petstore/haskell-servant/client/Main.hs b/samples/server/petstore/haskell-servant/client/Main.hs index d0094c5f52e..718a8587989 100644 --- a/samples/server/petstore/haskell-servant/client/Main.hs +++ b/samples/server/petstore/haskell-servant/client/Main.hs @@ -21,8 +21,8 @@ import Model.Pet import Model.Tag import Model.Order import Api.UserApi -import Api.StoreApi import Api.PetApi +import Api.StoreApi -- userClient :: IO () -- userClient = do diff --git a/samples/server/petstore/haskell-servant/haskell-servant-codegen.cabal b/samples/server/petstore/haskell-servant/haskell-servant-codegen.cabal index 2693b3dd93b..9347cee563c 100644 --- a/samples/server/petstore/haskell-servant/haskell-servant-codegen.cabal +++ b/samples/server/petstore/haskell-servant/haskell-servant-codegen.cabal @@ -2,7 +2,7 @@ name: haskell-servant-codegen version: 0.1.0.0 synopsis: Swagger-codegen example for Haskell servant description: Please see README.md -homepage: http://github.com/algas/haskell-servant-codegen#readme +homepage: https://github.com/swagger-api/swagger-codegen#readme license: Apache-2.0 license-file: LICENSE author: Masahiro Yamauchi @@ -22,8 +22,8 @@ library , Model.Tag , Model.Order , Api.UserApi - , Api.StoreApi , Api.PetApi + , Api.StoreApi , Apis ghc-options: -Wall build-depends: base @@ -62,7 +62,3 @@ executable server , servant-mock , haskell-servant-codegen default-language: Haskell2010 - -source-repository head - type: git - location: https://github.com/algas/haskell-servant-codegen diff --git a/samples/server/petstore/haskell-servant/lib/Api/PetApi.hs b/samples/server/petstore/haskell-servant/lib/Api/PetApi.hs index 497ea240577..62c71f26ec9 100644 --- a/samples/server/petstore/haskell-servant/lib/Api/PetApi.hs +++ b/samples/server/petstore/haskell-servant/lib/Api/PetApi.hs @@ -14,6 +14,8 @@ module Api.PetApi ( , updatePetWithForm , deletePet , uploadFile + , getPetByIdWithByteArray + , addPetUsingByteArray , proxyPetApi , PetApi ) where @@ -30,6 +32,7 @@ import qualified Data.Text as T import Utils import Test.QuickCheck import Model.Pet +import Model.Binary @@ -62,6 +65,8 @@ instance Arbitrary FormadditionalMetadatafile where arbitrary = FormadditionalMetadatafile <$> arbitrary <*> arbitrary + + type PetApi = "pet" :> ReqBody '[JSON] Pet :> Put '[JSON] () -- updatePet :<|> "pet" :> ReqBody '[JSON] Pet :> Post '[JSON] () -- addPet :<|> "pet" :> "findByStatus" :> QueryParam "status" [String] :> Get '[JSON] [Pet] -- findPetsByStatus @@ -70,6 +75,8 @@ type PetApi = "pet" :> ReqBody '[JSON] Pet :> Put '[JSON] () -- updatePet :<|> "pet" :> Capture "petId" String :> ReqBody '[FormUrlEncoded] Formnamestatus :> Post '[JSON] () -- updatePetWithForm :<|> "pet" :> Capture "petId" Integer :> Header "api_key" String :> Delete '[JSON] () -- deletePet :<|> "pet" :> Capture "petId" Integer :> "uploadImage" :> ReqBody '[FormUrlEncoded] FormadditionalMetadatafile :> Post '[JSON] () -- uploadFile + :<|> "pet" :> Capture "petId" Integer?testing_byte_array=true :> Get '[JSON] Binary -- getPetByIdWithByteArray + :<|> "pet?testing_byte_array=true" :> ReqBody '[JSON] Binary :> Post '[JSON] () -- addPetUsingByteArray proxyPetApi :: Proxy PetApi proxyPetApi = Proxy @@ -101,4 +108,6 @@ updatePet :<|> updatePetWithForm :<|> deletePet :<|> uploadFile + :<|> getPetByIdWithByteArray + :<|> addPetUsingByteArray = client proxyPetApi $ BaseUrl Http host port diff --git a/samples/server/petstore/haskell-servant/lib/Apis.hs b/samples/server/petstore/haskell-servant/lib/Apis.hs index f8d61d2608a..1add14160d4 100644 --- a/samples/server/petstore/haskell-servant/lib/Apis.hs +++ b/samples/server/petstore/haskell-servant/lib/Apis.hs @@ -9,8 +9,8 @@ module Apis ( ) where import Api.UserApi (UserApi) -import Api.StoreApi (StoreApi) import Api.PetApi (PetApi) +import Api.StoreApi (StoreApi) import Data.Proxy import Servant.API @@ -18,7 +18,7 @@ import Test.QuickCheck import qualified Data.Map as Map import Utils -type API = UserApi :<|> StoreApi :<|> PetApi +type API = UserApi :<|> PetApi :<|> StoreApi api :: Proxy API api = Proxy