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

fix(json): fix decoding/encoding empty object error

This commit is contained in:
JianBo He 2020-10-24 11:26:56 +08:00 committed by JianBo He
parent b883e238bf
commit 139306b61c
2 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/emqx_json.erl
View File

@ -103,6 +103,8 @@ safe_decode(Json, Opts) ->
, from_ejson/1
]}).
to_ejson([{}]) ->
{[]};
to_ejson([{_, _}|_] = L) ->
{[{K, to_ejson(V)} || {K, V} <- L ]};
to_ejson(L) when is_list(L) ->
@ -111,6 +113,8 @@ to_ejson(T) -> T.
from_ejson(L) when is_list(L) ->
[from_ejson(E) || E <- L];
from_ejson({[]}) ->
[{}];
from_ejson({L}) ->
[{Name, from_ejson(Value)} || {Name, Value} <- L];
from_ejson(T) -> T.
@ -118,4 +122,3 @@ from_ejson(T) -> T.
to_binary(B) when is_binary(B) -> B;
to_binary(L) when is_list(L) ->
iolist_to_binary(L).

36
test/emqx_json_SUITE.erl
View File

@ -27,6 +27,7 @@
, decode/2
]).
%% copied jiffy/readme
%%--------------------------------------------------------------------
%% Erlang JSON Erlang
%% -------------------------------------------------------------------
@ -45,10 +46,27 @@
%% {[{foo, bar}]} -> {"foo": "bar"} -> {[{<<"foo">>, <<"bar">>}]}
%% {[{<<"foo">>, <<"bar">>}]} -> {"foo": "bar"} -> {[{<<"foo">>, <<"bar">>}]}
%% #{<<"foo">> => <<"bar">>} -> {"foo": "bar"} -> #{<<"foo">> => <<"bar">>}
%%--------------------------------------------------------------------
%% but in emqx_json, we use the jsx style for it:
%%--------------------------------------------------------------------
%% Erlang JSON Erlang
%% -------------------------------------------------------------------
%%
%% Extension:
%% [{<<"foo">>, <<"bar">>}] -> {"foo": "bar"} -> [{<<"foo">>, <<"bar">>}]
%%
%% null -> null -> null
%% true -> true -> true
%% false -> false -> false
%% "hi" -> [104, 105] -> [104, 105]
%% <<"hi">> -> "hi" -> <<"hi">>
%% hi -> "hi" -> <<"hi">>
%% 1 -> 1 -> 1
%% 1.25 -> 1.25 -> 1.25
%% [] -> [] -> []
%% [true, 1.0] -> [true, 1.0] -> [true, 1.0]
%m [{}] -> {} -> [{}]
%a [{<<"foo">>, <<"bar">>}] -> {"foo": "bar"} -> [{<<"foo">>, <<"bar">>}]
%% #{<<"foo">> => <<"bar">>} -> {"foo": "bar"} -> #{<<"foo">> => <<"bar">>}
%m #{<<"foo">> => [{}]} NOT SUPPORT
%%--------------------------------------------------------------------
all() -> emqx_ct:all(?MODULE).
@ -63,9 +81,8 @@ t_decode_encode(_) ->
1.25 = decode(encode(1.25)),
[] = decode(encode([])),
[true, 1] = decode(encode([true, 1])),
[] = decode(encode({[]})),
[{<<"foo">>, <<"bar">>}] = decode(encode({[{foo, bar}]})),
[{<<"foo">>, <<"bar">>}] = decode(encode({[{<<"foo">>, <<"bar">>}]})),
[{}] = decode(encode([{}])),
[{<<"foo">>, <<"bar">>}] = decode(encode([{foo, bar}])),
[{<<"foo">>, <<"bar">>}] = decode(encode([{<<"foo">>, <<"bar">>}])),
[[{<<"foo">>, <<"bar">>}]] = decode(encode([[{<<"foo">>, <<"bar">>}]])),
[[{<<"foo">>, <<"bar">>},
@ -92,10 +109,10 @@ t_safe_decode_encode(_) ->
1.25 = safe_encode_decode(1.25),
[] = safe_encode_decode([]),
[true, 1] = safe_encode_decode([true, 1]),
[] = safe_encode_decode({[]}),
[{<<"foo">>, <<"bar">>}] = safe_encode_decode({[{foo, bar}]}),
[{<<"foo">>, <<"bar">>}] = safe_encode_decode({[{<<"foo">>, <<"bar">>}]}),
[{}] = decode(encode([{}])),
[{<<"foo">>, <<"bar">>}] = safe_encode_decode([{foo, bar}]),
[{<<"foo">>, <<"bar">>}] = safe_encode_decode([{<<"foo">>, <<"bar">>}]),
[[{<<"foo">>, <<"bar">>}]] = safe_encode_decode([[{<<"foo">>, <<"bar">>}]]),
{ok, Json} = emqx_json:safe_encode(#{<<"foo">> => <<"bar">>}),
{ok, #{<<"foo">> := <<"bar">>}} = emqx_json:safe_decode(Json, [return_maps]).
@ -105,4 +122,3 @@ safe_encode_decode(Term) ->
{ok, {NTerm}} -> NTerm;
{ok, NTerm} -> NTerm
end.