yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Decode/Encode json from nested proplist

This commit is contained in:
JianBo He 2020-02-06 11:23:34 +08:00 committed by JianBo He
parent 2858d828b1
commit b9bdb03005
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/emqx_json.erl
View File

@ -103,6 +103,8 @@ safe_decode(Json, Opts) ->
, from_ejson/1
]}).
to_ejson([[{_,_}]|_] = L) ->
[to_ejson(E) || E <- L];
to_ejson([{_, _}|_] = L) ->
lists:foldl(
fun({Name, Value}, Acc) ->
@ -110,6 +112,8 @@ to_ejson([{_, _}|_] = L) ->
end, #{}, L);
to_ejson(T) -> T.
from_ejson([{_}|_] = L) ->
[from_ejson(E) || E <- L];
from_ejson({L}) ->
[{Name, from_ejson(Value)} || {Name, Value} <- L];
from_ejson(T) -> T.

1
test/emqx_json_SUITE.erl
View File

@ -67,6 +67,7 @@ t_decode_encode(_) ->
[{<<"foo">>, <<"bar">>}] = decode(encode({[{foo, bar}]})),
[{<<"foo">>, <<"bar">>}] = decode(encode({[{<<"foo">>, <<"bar">>}]})),
[{<<"foo">>, <<"bar">>}] = decode(encode([{<<"foo">>, <<"bar">>}])),
[[{<<"foo">>, <<"bar">>}]] = decode(encode([[{<<"foo">>, <<"bar">>}]])),
#{<<"foo">> := <<"bar">>} = decode(encode(#{<<"foo">> => <<"bar">>}), [return_maps]),
JsonText = <<"{\"bool\":true,\"int\":10,\"foo\":\"bar\"}">>,
JsonMaps = #{<<"bool">> => true,