git.iko.soy/typeable/bloodhound
on master help sign in
Merge pull request #54 from centromere/template-fix
a155e19Chris Allen
src/Database/Bloodhound/Types.hs+6−6
compare with master
unifiedsplit
@@ -2020,14 +2020,14 @@ instance ToJSON IndexSettings where
2020 toJSON (IndexSettings s r) = object ["settings" .= object ["shards" .= s, "replicas" .= r]]
2020 toJSON (IndexSettings s r) = object ["settings" .= object ["shards" .= s, "replicas" .= r]]
2021
2021
2022instance ToJSON IndexTemplate where
2022instance ToJSON IndexTemplate where
2023− toJSON (IndexTemplate p s m) =
2023+ toJSON (IndexTemplate p s m) = merge
2024− objectNoNulls [ "template" .= p
2024+ (object [ "template" .= p
2025− , "settings" .= s
2026− , "mappings" .= foldl' merge (object []) m
2025+ , "mappings" .= foldl' merge (object []) m
2027− ]
2026+ ])
2027+ (toJSON s)
2028 where
2028 where
2029− objectNoNulls = object . filter (\(_, v) -> v /= Null)
2030 merge (Object o1) (Object o2) = toJSON $ HM.union o1 o2
2029 merge (Object o1) (Object o2) = toJSON $ HM.union o1 o2
2030+ merge o Null = o
2031 merge _ _ = undefined
2031 merge _ _ = undefined
2032
2032
2033instance (FromJSON a) => FromJSON (EsResult a) where
2033instance (FromJSON a) => FromJSON (EsResult a) where