git.iko.soy/typeable/katip
on master help sign in
Shorten type annotations
commit23c765d036763e509b0e8cf7284b36afa562630d authorMichael Xavier <michael@michaelxavier.net> dateWed 3 Jun 2015, 08:35 (11 years ago) parent7833eb9
2 files changed+12−12
compare with master
unifiedsplit
katip-elasticsearch/src/Katip/Scribes/ElasticSearch/Annotations.hs+5−5 katip-elasticsearch/test/Main.hs+7−7
katip-elasticsearch/src/Katip/Scribes/ElasticSearch/Annotations.hs+5−5
@@ -96,16 +96,16 @@ deannotateKeys = HM.fromList . map go . HM.toList
9696
9797
9898stringAnn :: Text
99−stringAnn = "::string"
99+stringAnn = "::s"
100100
101101doubleAnn :: Text
102−doubleAnn = "::double"
102+doubleAnn = "::d"
103103
104104longAnn :: Text
105−longAnn = "::long"
105+longAnn = "::l"
106106
107107booleanAnn :: Text
108−booleanAnn = "::boolean"
108+booleanAnn = "::b"
109109
110110nullAnn :: Text
111−nullAnn = "::null"
111+nullAnn = "::n"
katip-elasticsearch/test/Main.hs+7−7
@@ -67,7 +67,7 @@ esTests setup = testGroup "elasticsearch scribe"
6767 length logs @?= 1
6868 let l = head logs
6969 l ^? key "_source" . key "msg" . _String @?= Just "A test message"
70− l ^? key "_source" . key "data" . key "whatever::boolean" . _Bool @?= Just True
70+ l ^? key "_source" . key "data" . key "whatever::b" . _Bool @?= Just True
7171 ]
7272
7373
@@ -120,12 +120,12 @@ annotatedExampleValue = Array $ V.fromList
120120 Null
121121 , Object $ HM.fromList
122122 [
123− ("a map",Object $ HM.fromList [("baz::boolean", Bool True)])
124− , ("a bool::boolean", Bool False)
125− , ("a null::null", Null)
126− , ("a string::string", String "s")
127− , ("a double::double", Number 52.3)
128− , ("a long::long", Number 24.0)
123+ ("a map",Object $ HM.fromList [("baz::b", Bool True)])
124+ , ("a bool::b", Bool False)
125+ , ("a null::n", Null)
126+ , ("a string::s", String "s")
127+ , ("a double::d", Number 52.3)
128+ , ("a long::l", Number 24.0)
129129 ]
130130 ]
131131