git.iko.soy/typeable/bloodhound
on master help sign in
Clean up TODOs
commit69eeed43dcd22cdf6ea297fc40a63c286aa5cf97 authorMichael Xavier <michael@michaelxavier.net> dateTue 9 Aug 2016, 10:19 (10 years ago) parent42d8bb4
3 files changed+22−25
src/Database/Bloodhound/Client.hs+19−21 src/Database/Bloodhound/Types.hs+3−3 tests/tests.hs−1
src/Database/Bloodhound/Client.hs+19−21
@@ -92,34 +92,32 @@ module Database.Bloodhound.Client
9292 )
9393 where
9494
95−import qualified Blaze.ByteString.Builder as BB
96−import Control.Applicative as A
95+import qualified Blaze.ByteString.Builder as BB
96+import Control.Applicative as A
9797import Control.Monad
9898import Control.Monad.Catch
9999import Control.Monad.IO.Class
100100import Data.Aeson
101101import Data.ByteString.Lazy.Builder
102−import qualified Data.ByteString.Lazy.Char8 as L
103−import Data.Foldable (toList)
104−import qualified Data.HashMap.Strict as HM
102+import qualified Data.ByteString.Lazy.Char8 as L
103+import Data.Foldable (toList)
104+import qualified Data.HashMap.Strict as HM
105105import Data.Ix
106−import qualified Data.List as LS (filter, foldl')
107−import Data.List.NonEmpty (NonEmpty (..))
108−import Data.Maybe (catMaybes, fromMaybe,
109− isJust)
106+import qualified Data.List as LS (filter, foldl')
107+import Data.List.NonEmpty (NonEmpty (..))
108+import Data.Maybe (catMaybes, fromMaybe, isJust)
110109import Data.Monoid
111−import Data.Text (Text)
112−import qualified Data.Text as T
113−import qualified Data.Text.Encoding as T
110+import Data.Text (Text)
111+import qualified Data.Text as T
112+import qualified Data.Text.Encoding as T
114113import Data.Time.Clock
115−import qualified Data.Vector as V
116−import Debug.Trace
114+import qualified Data.Vector as V
117115import Network.HTTP.Client
118−import qualified Network.HTTP.Types.Method as NHTM
119−import qualified Network.HTTP.Types.Status as NHTS
120−import qualified Network.HTTP.Types.URI as NHTU
121−import qualified Network.URI as URI
122−import Prelude hiding (filter, head)
116+import qualified Network.HTTP.Types.Method as NHTM
117+import qualified Network.HTTP.Types.Status as NHTS
118+import qualified Network.HTTP.Types.URI as NHTU
119+import qualified Network.URI as URI
120+import Prelude hiding (filter, head)
123121
124122import Database.Bloodhound.Types
125123
@@ -590,13 +588,13 @@ parseEsResponse :: (MonadThrow m, FromJSON a) => Reply
590588parseEsResponse reply
591589 | respIsTwoHunna reply = case eitherDecode body of
592590 Right a -> return (Right a)
593− Left e -> traceShow e tryParseError
591+ Left _ -> tryParseError
594592 | otherwise = tryParseError
595593 where body = responseBody reply
596594 tryParseError = case eitherDecode body of
597595 Right e -> return (Left e)
598596 -- this case should not be possible
599− Left e -> traceShow e explode
597+ Left _ -> explode
600598 explode = throwM (EsProtocolException body)
601599
602600-- | 'indexExists' enables you to check if an index exists. Returns 'Bool'
src/Database/Bloodhound/Types.hs+3−3
@@ -3892,7 +3892,7 @@ data NodeHTTPInfo = NodeHTTPInfo {
38923892 } deriving (Eq, Show, Generic, Typeable)
38933893
38943894data NodeTransportInfo = NodeTransportInfo {
3895− nodeTransportProfiles :: [BoundTransportAddress] --TODO: bound transport/publish addresses, paper over NULL meaning []
3895+ nodeTransportProfiles :: [BoundTransportAddress]
38963896 , nodeTransportAddress :: BoundTransportAddress
38973897 } deriving (Eq, Show, Generic, Typeable)
38983898
@@ -3952,7 +3952,7 @@ data ThreadPoolSize = ThreadPoolBounded Int
39523952
39533953data ThreadPoolType = ThreadPoolScaling
39543954 | ThreadPoolFixed
3955− | ThreadPoolCached --TODO: are there others
3955+ | ThreadPoolCached
39563956 deriving (Eq, Show, Generic, Typeable)
39573957
39583958data NodeJVMInfo = NodeJVMInfo {
@@ -3964,7 +3964,7 @@ data NodeJVMInfo = NodeJVMInfo {
39643964 , nodeJVMVMVersion :: VersionNumber
39653965 -- ^ JVM doesn't seme to follow normal version conventions
39663966 , nodeJVMVMName :: Text
3967− , nodeJVMVersion :: VersionNumber --TODO: normalize underscores
3967+ , nodeJVMVersion :: VersionNumber
39683968 , nodeJVMPID :: PID
39693969 } deriving (Eq, Show, Generic, Typeable)
39703970
tests/tests.hs−1
@@ -1573,7 +1573,6 @@ main = hspec $ do
15731573 -- parsing. Node info is so variable, there's not much I can
15741574 -- assert here.
15751575 Right NodesInfo {..} -> length nodesInfo `shouldBe` 1
1576− --TODO: more assertions if possible
15771576 Left e -> expectationFailure ("Expected NodesInfo but got " <> show e)
15781577
15791578 describe "Enum DocVersion" $ do