rabbit_misc:pget/{2,3}: support maps

References rabbitmq/rabbitmq-federation#67, rabbitmq/rabbitmq-federation#70,
rabbitmq/rabbitmq-federation#73, rabbitmq/rabbitmq-federation#75.

Author: michaelklishin

src/rabbit_data_coercion.erl

@@ -25,8 +25,9 @@ to_binary(Val) when is_atom(Val)    -> atom_to_binary(Val, utf8);
 to_binary(Val) when is_integer(Val) -> integer_to_binary(Val);
 to_binary(Val)                      -> Val.
 
--spec to_list(Val :: integer() | list() | binary() | atom()) -> list().
+-spec to_list(Val :: integer() | list() | binary() | atom() | map()) -> list().
 to_list(Val) when is_list(Val)    -> Val;
+to_list(Val) when is_map(Val)     -> maps:to_list(Val);
 to_list(Val) when is_atom(Val)    -> atom_to_list(Val);
 to_list(Val) when is_binary(Val)  -> binary_to_list(Val);
 to_list(Val) when is_integer(Val) -> integer_to_list(Val).

src/rabbit_misc.erl

@@ -881,7 +881,15 @@ is_process_alive(Pid) ->
     lists:member(Node, [node() | nodes(connected)]) andalso
         rpc:call(Node, erlang, is_process_alive, [Pid]) =:= true.
 
--spec pget(term(), list()) -> term().
+-spec pget(term(), list() | map()) -> term().
+pget(K, M) when is_map(M) ->
+    case maps:find(K, M) of
+        {ok, V} ->
+            V;
+        _ ->
+            undefined
+    end;
+
 pget(K, P) ->
     case lists:keyfind(K, 1, P) of
         {K, V} ->
@@ -890,7 +898,15 @@ pget(K, P) ->
             undefined
     end.
 
--spec pget(term(), list(), term()) -> term().
+-spec pget(term(), list() | map(), term()) -> term().
+pget(K, M, D) when is_map(M) ->
+    case maps:find(K, M) of
+        {ok, V} ->
+            V;
+        _ ->
+            D
+    end;
+
 pget(K, P, D) ->
     case lists:keyfind(K, 1, P) of
         {K, V} ->
@@ -899,7 +915,13 @@ pget(K, P, D) ->
             D
     end.
 
--spec pget_or_die(term(), list()) -> term() | no_return().
+-spec pget_or_die(term(), list() | map()) -> term() | no_return().
+pget_or_die(K, M) when is_map(M) ->
+    case maps:find(K, M) of
+        error   -> exit({error, key_missing, K});
+        {ok, V} -> V
+    end;
+
 pget_or_die(K, P) ->
     case proplists:get_value(K, P) of
         undefined -> exit({error, key_missing, K});

test/unit_SUITE.erl

@@ -35,7 +35,9 @@ groups() ->
     [
         {parallel_tests, [parallel], [
             data_coercion_to_proplist,
+            data_coercion_to_list,
             data_coercion_to_map,
+            pget,
             encrypt_decrypt,
             encrypt_decrypt_term,
             version_equivalence,
@@ -292,6 +294,17 @@ data_coercion_to_proplist(_Config) ->
     ?assertEqual([{a, 1}], rabbit_data_coercion:to_proplist([{a, 1}])),
     ?assertEqual([{a, 1}], rabbit_data_coercion:to_proplist(#{a => 1})).
 
+data_coercion_to_list(_Config) ->
+    ?assertEqual([{a, 1}], rabbit_data_coercion:to_list([{a, 1}])),
+    ?assertEqual([{a, 1}], rabbit_data_coercion:to_list(#{a => 1})).
+
+pget(_Config) ->
+    ?assertEqual(1, rabbit_misc:pget(a, [{a, 1}])),
+    ?assertEqual(undefined, rabbit_misc:pget(b, [{a, 1}])),
+
+    ?assertEqual(1, rabbit_misc:pget(a, #{a => 1})),
+    ?assertEqual(undefined, rabbit_misc:pget(b, #{a => 1})).
+
 pid_decompose_compose(_Config) ->
     Pid = self(),
     {Node, Cre, Id, Ser} = rabbit_misc:decompose_pid(Pid),