@@ -172,10 +172,10 @@ import Data.Aeson.Types (parseMaybe)
172172import qualified Data.ByteString.Lazy.Char8 as L
173173import Data.List (nub)
174174import Data.List.NonEmpty (NonEmpty (..))
175+import qualified Data.Map.Strict as M
175176import Data.Monoid
176177import Data.Text (Text)
177178import qualified Data.Text as T
178−import qualified Data.Map.Strict as M
179179import Data.Time.Clock (UTCTime)
180180import qualified Data.Vector as V
181181import GHC.Generics (Generic)
@@ -496,10 +496,10 @@ type TrackSortScores = Bool
496496type From = Int
497497type Size = Int
498498
499−data Search = Search { queryBody :: Maybe Query
500− , filterBody :: Maybe Filter
501− , sortBody :: Maybe Sort
502− , aggBody :: Maybe Aggregations
499+data Search = Search { queryBody :: Maybe Query
500+ , filterBody :: Maybe Filter
501+ , sortBody :: Maybe Sort
502+ , aggBody :: Maybe Aggregations
503503 -- default False
504504 , trackSortScores :: TrackSortScores
505505 , from :: From
@@ -1003,7 +1003,7 @@ data Interval = Year
10031003 | Day
10041004 | Hour
10051005 | Minute
1006− | Second
1006+ | Second
10071007 | FractionalInterval Float TimeInterval deriving (Eq, Show)
10081008
10091009data Aggregation = TermsAgg TermsAggregation
@@ -1022,14 +1022,14 @@ data TermsAggregation = TermsAggregation { term :: Either Text Text
10221022 , termAggs :: Maybe Aggregations
10231023 } deriving (Eq, Show)
10241024
1025−data DateHistogramAggregation = DateHistogramAggregation { dateField :: FieldName
1026− , dateInterval :: Interval
1027− , dateFormat :: Maybe Text
1028− , datePreZone :: Maybe Text
1029− , datePostZone :: Maybe Text
1030− , datePreOffset :: Maybe Text
1031− , datePostOffset :: Maybe Text
1032− , dateAggs :: Maybe Aggregations
1025+data DateHistogramAggregation = DateHistogramAggregation { dateField :: FieldName
1026+ , dateInterval :: Interval
1027+ , dateFormat :: Maybe Text
1028+ , datePreZone :: Maybe Text
1029+ , datePostZone :: Maybe Text
1030+ , datePreOffset :: Maybe Text
1031+ , datePostOffset :: Maybe Text
1032+ , dateAggs :: Maybe Aggregations
10331033 } deriving (Eq, Show)
10341034
10351035
@@ -1053,7 +1053,7 @@ instance ToJSON TermInclusion where
10531053instance ToJSON CollectionMode where
10541054 toJSON BreadthFirst = "breadth_first"
10551055 toJSON DepthFirst = "depth_first"
1056−
1056+
10571057instance ToJSON ExecutionHint where
10581058 toJSON Ordinals = "ordinals"
10591059 toJSON GlobalOrdinals = "global_ordinals"
@@ -1083,7 +1083,7 @@ instance ToJSON Aggregation where
10831083 toJSON (TermsAgg (TermsAggregation term include exclude order minDocCount size shardSize collectMode executionHint aggs)) =
10841084 omitNulls ["terms" .= omitNulls [ toJSON' term,
10851085 "include" .= toJSON include,
1086− "exclude" .= toJSON exclude,
1086+ "exclude" .= toJSON exclude,
10871087 "order" .= toJSON order,
10881088 "min_doc_count" .= toJSON minDocCount,
10891089 "size" .= toJSON size,
@@ -1116,10 +1116,10 @@ class BucketAggregation a where
11161116
11171117data (FromJSON a, BucketAggregation a) => Bucket a = Bucket { buckets :: [a]} deriving (Show)
11181118
1119−data TermsResult = TermsResult { termKey :: Text
1120− , termsDocCount :: Int
1121− , termsAggs :: Maybe AggregationResults } deriving (Show)
1122−
1119+data TermsResult = TermsResult { termKey :: Text
1120+ , termsDocCount :: Int
1121+ , termsAggs :: Maybe AggregationResults } deriving (Show)
1122+
11231123data DateHistogramResult = DateHistogramResult { dateKey :: Int
11241124 , dateKeyStr :: Maybe Text
11251125 , dateDocCount :: Int
@@ -1157,7 +1157,7 @@ instance FromJSON TermsResult where
11571157instance FromJSON DateHistogramResult where
11581158 parseJSON (Object v) = DateHistogramResult <$>
11591159 v .: "key" <*>
1160− v .:? "key_as_string" <*>
1160+ v .:? "key_as_string" <*>
11611161 v .: "doc_count" <*>
11621162 v .:? "aggregations"
11631163
@@ -1302,7 +1302,7 @@ instance ToJSON Query where
13021302 object [ "match" .= toJSON matchQuery ]
13031303
13041304 toJSON (QueryMultiMatchQuery multiMatchQuery) =
1305− object [ "multi_match" .= toJSON multiMatchQuery ]
1305+ toJSON multiMatchQuery
13061306
13071307 toJSON (QueryBoolQuery boolQuery) =
13081308 object [ "bool" .= toJSON boolQuery ]