@@ -2020,14 +2020,14 @@ instance ToJSON IndexSettings where
20202020 toJSON (IndexSettings s r) = object ["settings" .= object ["shards" .= s, "replicas" .= r]]
20212021
20222022instance ToJSON IndexTemplate where
2023− toJSON (IndexTemplate p s m) =
2024− objectNoNulls [ "template" .= p
2025− , "settings" .= s
2026− , "mappings" .= foldl' merge (object []) m
2027− ]
2023+ toJSON (IndexTemplate p s m) = merge
2024+ (object [ "template" .= p
2025+ , "mappings" .= foldl' merge (object []) m
2026+ ])
2027+ (toJSON s)
20282028 where
2029− objectNoNulls = object . filter (\(_, v) -> v /= Null)
20302029 merge (Object o1) (Object o2) = toJSON $ HM.union o1 o2
2030+ merge o Null = o
20312031 merge _ _ = undefined
20322032
20332033instance (FromJSON a) => FromJSON (EsResult a) where