typeable/bloodhound
1
0
Fork 0
mirror of https://github.com/typeable/bloodhound.git synced 2024-12-04 08:47:36 +03:00
Code Issues Projects Releases Wiki Activity

Clean up TODOs

Browse Source
This commit is contained in:
Michael Xavier 2016-08-09 10:19:07 -07:00
parent 42d8bb4988
commit 69eeed43dc
3 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/Database/Bloodhound/Client.hs
View File

@ -92,34 +92,32 @@ module Database.Bloodhound.Client
)
where
import qualified Blaze.ByteString.Builder as BB
import Control.Applicative as A
import qualified Blaze.ByteString.Builder as BB
import Control.Applicative as A
import Control.Monad
import Control.Monad.Catch
import Control.Monad.IO.Class
import Data.Aeson
import Data.ByteString.Lazy.Builder
import qualified Data.ByteString.Lazy.Char8 as L
import Data.Foldable (toList)
import qualified Data.HashMap.Strict as HM
import qualified Data.ByteString.Lazy.Char8 as L
import Data.Foldable (toList)
import qualified Data.HashMap.Strict as HM
import Data.Ix
import qualified Data.List as LS (filter, foldl')
import Data.List.NonEmpty (NonEmpty (..))
import Data.Maybe (catMaybes, fromMaybe,
isJust)
import qualified Data.List as LS (filter, foldl')
import Data.List.NonEmpty (NonEmpty (..))
import Data.Maybe (catMaybes, fromMaybe, isJust)
import Data.Monoid
import Data.Text (Text)
import qualified Data.Text as T
import qualified Data.Text.Encoding as T
import Data.Text (Text)
import qualified Data.Text as T
import qualified Data.Text.Encoding as T
import Data.Time.Clock
import qualified Data.Vector as V
import Debug.Trace
import qualified Data.Vector as V
import Network.HTTP.Client
import qualified Network.HTTP.Types.Method as NHTM
import qualified Network.HTTP.Types.Status as NHTS
import qualified Network.HTTP.Types.URI as NHTU
import qualified Network.URI as URI
import Prelude hiding (filter, head)
import qualified Network.HTTP.Types.Method as NHTM
import qualified Network.HTTP.Types.Status as NHTS
import qualified Network.HTTP.Types.URI as NHTU
import qualified Network.URI as URI
import Prelude hiding (filter, head)
import Database.Bloodhound.Types
@ -590,13 +588,13 @@ parseEsResponse :: (MonadThrow m, FromJSON a) => Reply
parseEsResponse reply
| respIsTwoHunna reply = case eitherDecode body of
Right a -> return (Right a)
Left e -> traceShow e tryParseError
Left _ -> tryParseError
| otherwise = tryParseError
where body = responseBody reply
tryParseError = case eitherDecode body of
Right e -> return (Left e)
-- this case should not be possible
Left e -> traceShow e explode
Left _ -> explode
explode = throwM (EsProtocolException body)
-- | 'indexExists' enables you to check if an index exists. Returns 'Bool'

6
src/Database/Bloodhound/Types.hs
View File

@ -3892,7 +3892,7 @@ data NodeHTTPInfo = NodeHTTPInfo {
} deriving (Eq, Show, Generic, Typeable)
data NodeTransportInfo = NodeTransportInfo {
nodeTransportProfiles :: [BoundTransportAddress] --TODO: bound transport/publish addresses, paper over NULL meaning []
nodeTransportProfiles :: [BoundTransportAddress]
, nodeTransportAddress :: BoundTransportAddress
} deriving (Eq, Show, Generic, Typeable)
@ -3952,7 +3952,7 @@ data ThreadPoolSize = ThreadPoolBounded Int
data ThreadPoolType = ThreadPoolScaling
| ThreadPoolFixed
| ThreadPoolCached --TODO: are there others
| ThreadPoolCached
deriving (Eq, Show, Generic, Typeable)
data NodeJVMInfo = NodeJVMInfo {
@ -3964,7 +3964,7 @@ data NodeJVMInfo = NodeJVMInfo {
, nodeJVMVMVersion :: VersionNumber
-- ^ JVM doesn't seme to follow normal version conventions
, nodeJVMVMName :: Text
, nodeJVMVersion :: VersionNumber --TODO: normalize underscores
, nodeJVMVersion :: VersionNumber
, nodeJVMPID :: PID
} deriving (Eq, Show, Generic, Typeable)

1
tests/tests.hs
View File

@ -1573,7 +1573,6 @@ main = hspec $ do
-- parsing. Node info is so variable, there's not much I can
-- assert here.
Right NodesInfo {..} -> length nodesInfo `shouldBe` 1
--TODO: more assertions if possible
Left e -> expectationFailure ("Expected NodesInfo but got " <> show e)
describe "Enum DocVersion" $ do