From 8e72c70767f041a7d306228da7cafaf4052cfe15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Hahn?= Date: Fri, 7 Nov 2014 11:58:41 +0800 Subject: [PATCH] moved S.Client.BaseUrl to S.Utils.BaseUrl --- example/greet.hs | 2 +- servant.cabal | 14 +++++++------- src/Servant.hs | 4 ++-- src/Servant/API/Delete.hs | 2 +- src/Servant/API/Get.hs | 2 +- src/Servant/API/Post.hs | 2 +- src/Servant/API/Put.hs | 2 +- src/Servant/Client.hs | 2 +- src/Servant/{Client => Utils}/BaseUrl.hs | 2 +- src/Servant/Utils/Client.hs | 2 +- test/Servant/Client/BaseUrlSpec.hs | 2 +- test/Servant/ClientSpec.hs | 2 +- 12 files changed, 19 insertions(+), 19 deletions(-) rename src/Servant/{Client => Utils}/BaseUrl.hs (97%) diff --git a/example/greet.hs b/example/greet.hs index 8855806a..09a95abc 100644 --- a/example/greet.hs +++ b/example/greet.hs @@ -20,9 +20,9 @@ import Network.Wai.Handler.Warp import Servant.API import Servant.Client -import Servant.Client.BaseUrl import Servant.Docs import Servant.Server +import Servant.Utils.BaseUrl -- * Example diff --git a/servant.cabal b/servant.cabal index 017a57e8..ff5b1bda 100644 --- a/servant.cabal +++ b/servant.cabal @@ -14,23 +14,23 @@ cabal-version: >=1.10 library exposed-modules: Servant - Servant.Client - Servant.Client.BaseUrl - Servant.Docs - Servant.Server Servant.API + Servant.API.Alternative Servant.API.Capture Servant.API.Delete Servant.API.Elem Servant.API.Get Servant.API.Post Servant.API.Put - Servant.API.QueryParam - Servant.API.ReqBody Servant.API.QQ + Servant.API.QueryParam Servant.API.Raw + Servant.API.ReqBody Servant.API.Sub - Servant.API.Alternative + Servant.Client + Servant.Docs + Servant.Server + Servant.Utils.BaseUrl Servant.Utils.Client Servant.Utils.Text build-depends: diff --git a/src/Servant.hs b/src/Servant.hs index 26d2b5c8..cc614531 100644 --- a/src/Servant.hs +++ b/src/Servant.hs @@ -7,7 +7,7 @@ module Servant ( module Servant.Server, -- | For accessing servant APIs as API clients. module Servant.Client, - module Servant.Client.BaseUrl, + module Servant.Utils.BaseUrl, -- | For generating documentation for servant APIs. module Servant.Docs, -- | Helper module @@ -16,7 +16,7 @@ module Servant ( import Servant.API import Servant.Client -import Servant.Client.BaseUrl import Servant.Docs import Servant.Server +import Servant.Utils.BaseUrl import Servant.Utils.Text diff --git a/src/Servant/API/Delete.hs b/src/Servant/API/Delete.hs index ae7a4239..f3352285 100644 --- a/src/Servant/API/Delete.hs +++ b/src/Servant/API/Delete.hs @@ -11,9 +11,9 @@ import Data.Typeable import Network.HTTP.Types import Network.Wai import Servant.Client -import Servant.Client.BaseUrl import Servant.Docs import Servant.Server +import Servant.Utils.BaseUrl import Servant.Utils.Client -- | Endpoint for DELETE requests. diff --git a/src/Servant/API/Get.hs b/src/Servant/API/Get.hs index c9494427..55e43686 100644 --- a/src/Servant/API/Get.hs +++ b/src/Servant/API/Get.hs @@ -12,9 +12,9 @@ import Data.Typeable import Network.HTTP.Types import Network.Wai import Servant.Client -import Servant.Client.BaseUrl import Servant.Docs import Servant.Server +import Servant.Utils.BaseUrl import Servant.Utils.Client -- | Endpoint for simple GET requests. The server doesn't receive any arguments diff --git a/src/Servant/API/Post.hs b/src/Servant/API/Post.hs index 96314c98..564f175a 100644 --- a/src/Servant/API/Post.hs +++ b/src/Servant/API/Post.hs @@ -12,9 +12,9 @@ import Data.Typeable import Network.HTTP.Types import Network.Wai import Servant.Client -import Servant.Client.BaseUrl import Servant.Docs import Servant.Server +import Servant.Utils.BaseUrl import Servant.Utils.Client -- | Endpoint for POST requests. The type variable represents the type of the diff --git a/src/Servant/API/Put.hs b/src/Servant/API/Put.hs index e5cb73b1..d522dbc4 100644 --- a/src/Servant/API/Put.hs +++ b/src/Servant/API/Put.hs @@ -12,9 +12,9 @@ import Data.Typeable import Network.HTTP.Types import Network.Wai import Servant.Client -import Servant.Client.BaseUrl import Servant.Docs import Servant.Server +import Servant.Utils.BaseUrl import Servant.Utils.Client -- | Endpoint for PUT requests. diff --git a/src/Servant/Client.hs b/src/Servant/Client.hs index 8c432504..acc7d301 100644 --- a/src/Servant/Client.hs +++ b/src/Servant/Client.hs @@ -12,7 +12,7 @@ import Network.HTTP.Types import Network.URI import System.IO.Unsafe -import Servant.Client.BaseUrl +import Servant.Utils.BaseUrl -- * Accessing APIs as a Client diff --git a/src/Servant/Client/BaseUrl.hs b/src/Servant/Utils/BaseUrl.hs similarity index 97% rename from src/Servant/Client/BaseUrl.hs rename to src/Servant/Utils/BaseUrl.hs index fc5b72eb..200e00f3 100644 --- a/src/Servant/Client/BaseUrl.hs +++ b/src/Servant/Utils/BaseUrl.hs @@ -1,6 +1,6 @@ {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE ViewPatterns #-} -module Servant.Client.BaseUrl where +module Servant.Utils.BaseUrl where import Data.List import GHC.Generics diff --git a/src/Servant/Utils/Client.hs b/src/Servant/Utils/Client.hs index 62a391e2..7012e6f6 100644 --- a/src/Servant/Utils/Client.hs +++ b/src/Servant/Utils/Client.hs @@ -14,7 +14,7 @@ import Data.ByteString.Lazy import Data.String.Conversions import Network.HTTP.Types import Servant.Client -import Servant.Client.BaseUrl +import Servant.Utils.BaseUrl import qualified Network.HTTP.Client as Client diff --git a/test/Servant/Client/BaseUrlSpec.hs b/test/Servant/Client/BaseUrlSpec.hs index 1f75b697..d8773084 100644 --- a/test/Servant/Client/BaseUrlSpec.hs +++ b/test/Servant/Client/BaseUrlSpec.hs @@ -6,7 +6,7 @@ import Control.DeepSeq import Test.Hspec import Test.QuickCheck -import Servant.Client.BaseUrl +import Servant.Utils.BaseUrl spec :: Spec spec = do diff --git a/test/Servant/ClientSpec.hs b/test/Servant/ClientSpec.hs index f0c11760..fbd034d6 100644 --- a/test/Servant/ClientSpec.hs +++ b/test/Servant/ClientSpec.hs @@ -21,8 +21,8 @@ import Test.QuickCheck import Servant.API import Servant.Client -import Servant.Client.BaseUrl import Servant.Server +import Servant.Utils.BaseUrl import Servant.ServerSpec