Replace function references by MFAs

Author: dcorbacho

deps/rabbitmq_shovel/src/rabbit_amqp091_shovel.erl

@@ -39,7 +39,8 @@
 %% from and can break with the next upgrade. It should not be used by
 %% another one that the one who created it or survive a node restart.
 %% Thus, function references have been replace by the following MFA.
--export([decl_fun/3, publish_fun/4]).
+-export([decl_fun/3, publish_fun/4, props_fun_timestamp_header/4,
+         props_fun_forward_header/5]).
 
 -define(MAX_CONNECTION_CLOSE_TIMEOUT, 10000).
 
@@ -559,23 +560,25 @@ field_map(Fields, Idx0) ->
 fail(Reason) -> throw({error, Reason}).
 
 add_forward_headers_fun(Name, true, PubProps) ->
-    fun(SrcUri, DestUri, Props) ->
-            rabbit_shovel_util:update_headers(
-              [{<<"shovelled-by">>, rabbit_nodes:cluster_name()},
-               {<<"shovel-type">>,  <<"static">>},
-               {<<"shovel-name">>,  list_to_binary(atom_to_list(Name))}],
-              [], SrcUri, DestUri, PubProps(SrcUri, DestUri, Props))
-    end;
+   {?MODULE, props_fun_forward_header, [Name, PubProps]};
 add_forward_headers_fun(_Name, false, PubProps) ->
     PubProps.
 
+props_fun_forward_header(Name, {M, F, Args}, SrcUri, DestUri, Props) ->
+    rabbit_shovel_util:update_headers(
+      [{<<"shovelled-by">>, rabbit_nodes:cluster_name()},
+       {<<"shovel-type">>,  <<"static">>},
+       {<<"shovel-name">>,  list_to_binary(atom_to_list(Name))}],
+      [], SrcUri, DestUri, apply(M, F, Args ++ [SrcUri, DestUri, Props])).
+
 add_timestamp_header_fun(true, PubProps) ->
-    fun(SrcUri, DestUri, Props) ->
-        rabbit_shovel_util:add_timestamp_header(
-            PubProps(SrcUri, DestUri, Props))
-    end;
+    {?MODULE, props_fun_timestamp_header, [PubProps]};
 add_timestamp_header_fun(false, PubProps) -> PubProps.
 
+props_fun_timestamp_header({M, F, Args}, SrcUri, DestUri, Props) ->
+    rabbit_shovel_util:add_timestamp_header(
+      apply(M, F, Args ++ [SrcUri, DestUri, Props])).
+
 parse_declaration({[], Acc}) ->
     Acc;
 parse_declaration({[{Method, Props} | Rest], Acc}) when is_list(Props) ->

deps/rabbitmq_shovel/test/parameters_SUITE.erl

@@ -159,7 +159,7 @@ test_parse_amqp091(Params) ->
       reconnect_delay := 1001,
       dest := #{module := rabbit_amqp091_shovel,
                 uris := ["amqp://remotehost:5672"],
-                props_fun := PropsFun
+                props_fun := {M, F, Args}
                },
       source := #{module := rabbit_amqp091_shovel,
                   uris := ["amqp://localhost:5672"],
@@ -170,9 +170,9 @@ test_parse_amqp091(Params) ->
 
     #'P_basic'{headers = ActualHeaders,
                delivery_mode = 2,
-               cluster_id = <<"x">>} = PropsFun("amqp://localhost:5672",
-                                                "amqp://remotehost:5672",
-                                                #'P_basic'{headers = undefined}),
+               cluster_id = <<"x">>} = apply(M, F, Args ++ ["amqp://localhost:5672",
+                                                            "amqp://remotehost:5672",
+                                                            #'P_basic'{headers = undefined}]),
     assert_amqp901_headers(ActualHeaders),
     ok.
 
@@ -185,7 +185,7 @@ test_parse_amqp091_with_blank_proprties(Params) ->
       reconnect_delay := 1001,
       dest := #{module := rabbit_amqp091_shovel,
                 uris := ["amqp://remotehost:5672"],
-                props_fun := PropsFun
+                props_fun := {M, F, Args}
                },
       source := #{module := rabbit_amqp091_shovel,
                   uris := ["amqp://localhost:5672"],
@@ -194,9 +194,9 @@ test_parse_amqp091_with_blank_proprties(Params) ->
                   delete_after := 'queue-length'}
      } = Result,
 
-    #'P_basic'{headers = ActualHeaders} = PropsFun("amqp://localhost:5672",
-                                                   "amqp://remotehost:5672",
-                                                   #'P_basic'{headers = undefined}),
+    #'P_basic'{headers = ActualHeaders} = apply(M, F, Args ++ ["amqp://localhost:5672",
+                                                               "amqp://remotehost:5672",
+                                                               #'P_basic'{headers = undefined}]),
     assert_amqp901_headers(ActualHeaders),
     ok.