Use rabbit_registry:(un)register_many helpers in rabbit_registry callers

deps/rabbit/src/rabbit_policies.erl

@@ -26,46 +26,46 @@
 register() ->
     %% Note: there are more validators registered from other modules,
     %% such as rabbit_quorum_queue
-    [rabbit_registry:register(Class, Name, ?MODULE) ||
-        {Class, Name} <- [{policy_validator, <<"alternate-exchange">>},
-                          {policy_validator, <<"consumer-timeout">>},
-                          {policy_validator, <<"dead-letter-exchange">>},
-                          {policy_validator, <<"dead-letter-routing-key">>},
-                          {policy_validator, <<"dead-letter-strategy">>},
-                          {policy_validator, <<"message-ttl">>},
-                          {policy_validator, <<"expires">>},
-                          {policy_validator, <<"max-length">>},
-                          {policy_validator, <<"max-length-bytes">>},
-                          {policy_validator, <<"max-in-memory-length">>},
-                          {policy_validator, <<"max-in-memory-bytes">>},
-                          {policy_validator, <<"queue-mode">>},
-                          {policy_validator, <<"queue-version">>},
-                          {policy_validator, <<"overflow">>},
-                          {policy_validator, <<"delivery-limit">>},
-                          {policy_validator, <<"max-age">>},
-                          {policy_validator, <<"stream-max-segment-size-bytes">>},
-                          {policy_validator, <<"stream-filter-size-bytes">>},
-                          {policy_validator, <<"queue-leader-locator">>},
-                          {policy_validator, <<"initial-cluster-size">>},
-                          {operator_policy_validator, <<"expires">>},
-                          {operator_policy_validator, <<"message-ttl">>},
-                          {operator_policy_validator, <<"max-length">>},
-                          {operator_policy_validator, <<"max-length-bytes">>},
-                          {operator_policy_validator, <<"max-in-memory-length">>},
-                          {operator_policy_validator, <<"max-in-memory-bytes">>},
-                          {operator_policy_validator, <<"delivery-limit">>},
-                          {operator_policy_validator, <<"queue-version">>},
-                          {operator_policy_validator, <<"overflow">>},
-                          {policy_merge_strategy, <<"expires">>},
-                          {policy_merge_strategy, <<"message-ttl">>},
-                          {policy_merge_strategy, <<"max-length">>},
-                          {policy_merge_strategy, <<"max-length-bytes">>},
-                          {policy_merge_strategy, <<"max-in-memory-length">>},
-                          {policy_merge_strategy, <<"max-in-memory-bytes">>},
-                          {policy_merge_strategy, <<"delivery-limit">>},
-                          {policy_merge_strategy, <<"queue-version">>},
-                          {policy_merge_strategy, <<"overflow">>}]],
-    ok.
+    rabbit_registry:register_many(
+      [{policy_validator, <<"alternate-exchange">>},
+       {policy_validator, <<"consumer-timeout">>},
+       {policy_validator, <<"dead-letter-exchange">>},
+       {policy_validator, <<"dead-letter-routing-key">>},
+       {policy_validator, <<"dead-letter-strategy">>},
+       {policy_validator, <<"message-ttl">>},
+       {policy_validator, <<"expires">>},
+       {policy_validator, <<"max-length">>},
+       {policy_validator, <<"max-length-bytes">>},
+       {policy_validator, <<"max-in-memory-length">>},
+       {policy_validator, <<"max-in-memory-bytes">>},
+       {policy_validator, <<"queue-mode">>},
+       {policy_validator, <<"queue-version">>},
+       {policy_validator, <<"overflow">>},
+       {policy_validator, <<"delivery-limit">>},
+       {policy_validator, <<"max-age">>},
+       {policy_validator, <<"stream-max-segment-size-bytes">>},
+       {policy_validator, <<"stream-filter-size-bytes">>},
+       {policy_validator, <<"queue-leader-locator">>},
+       {policy_validator, <<"initial-cluster-size">>},
+       {operator_policy_validator, <<"expires">>},
+       {operator_policy_validator, <<"message-ttl">>},
+       {operator_policy_validator, <<"max-length">>},
+       {operator_policy_validator, <<"max-length-bytes">>},
+       {operator_policy_validator, <<"max-in-memory-length">>},
+       {operator_policy_validator, <<"max-in-memory-bytes">>},
+       {operator_policy_validator, <<"delivery-limit">>},
+       {operator_policy_validator, <<"queue-version">>},
+       {operator_policy_validator, <<"overflow">>},
+       {policy_merge_strategy, <<"expires">>},
+       {policy_merge_strategy, <<"message-ttl">>},
+       {policy_merge_strategy, <<"max-length">>},
+       {policy_merge_strategy, <<"max-length-bytes">>},
+       {policy_merge_strategy, <<"max-in-memory-length">>},
+       {policy_merge_strategy, <<"max-in-memory-bytes">>},
+       {policy_merge_strategy, <<"delivery-limit">>},
+       {policy_merge_strategy, <<"queue-version">>},
+       {policy_merge_strategy, <<"overflow">>}
+      ], ?MODULE).
 
 -spec validate_policy([{binary(), term()}]) -> rabbit_policy_validator:validate_results().
 

deps/rabbit/src/rabbit_policy.erl

@@ -51,8 +51,10 @@
                     {enables, recovery}]}).
 
 register() ->
-    rabbit_registry:register(runtime_parameter, <<"policy">>, ?MODULE),
-    rabbit_registry:register(runtime_parameter, <<"operator_policy">>, ?MODULE).
+    rabbit_registry:register_many(
+      [{runtime_parameter, <<"policy">>},
+       {runtime_parameter, <<"operator_policy">>}
+      ], ?MODULE).
 
 name(Q) when ?is_amqqueue(Q) ->
     Policy = amqqueue:get_policy(Q),

deps/rabbit/test/dummy_runtime_parameters.erl

@@ -40,16 +40,20 @@ notify_clear(_, _, _, _) -> ok.
 %----------------------------------------------------------------------------
 
 register_policy_validator() ->
-    rabbit_registry:register(operator_policy_validator, <<"testeven">>, ?MODULE),
-    rabbit_registry:register(operator_policy_validator, <<"testpos">>,  ?MODULE),
-    rabbit_registry:register(policy_validator, <<"testeven">>, ?MODULE),
-    rabbit_registry:register(policy_validator, <<"testpos">>,  ?MODULE).
+    rabbit_registry:register_many(
+      [{operator_policy_validator, <<"testeven">>},
+       {operator_policy_validator, <<"testpos">>},
+       {policy_validator, <<"testeven">>},
+       {policy_validator, <<"testpos">>}
+      ], ?MODULE).
 
 unregister_policy_validator() ->
-    rabbit_registry:unregister(operator_policy_validator, <<"testeven">>),
-    rabbit_registry:unregister(operator_policy_validator, <<"testpos">>),
-    rabbit_registry:unregister(policy_validator, <<"testeven">>),
-    rabbit_registry:unregister(policy_validator, <<"testpos">>).
+    rabbit_registry:unregister_many(
+      [{operator_policy_validator, <<"testeven">>},
+       {operator_policy_validator, <<"testpos">>},
+       {policy_validator, <<"testeven">>},
+       {policy_validator, <<"testpos">>}
+      ]).
 
 validate_policy([{<<"testeven">>, Terms}]) when is_list(Terms) ->
     case  length(Terms) rem 2 =:= 0 of

deps/rabbitmq_federation/src/rabbit_federation_parameters.erl

@@ -28,14 +28,10 @@
                     {enables, recovery}]}).
 
 register() ->
-    [rabbit_registry:register(Class, Name, ?MODULE) ||
-        {Class, Name} <- ?RUNTIME_PARAMETERS],
-    ok.
+    rabbit_registry:register_many(?RUNTIME_PARAMETERS, ?MODULE).
 
 unregister() ->
-    [rabbit_registry:unregister(Class, Name) ||
-        {Class, Name} <- ?RUNTIME_PARAMETERS],
-    ok.
+    rabbit_registry:unregister_many(?RUNTIME_PARAMETERS).
 
 validate(_VHost, <<"federation-upstream-set">>, Name, Term0, _User) ->
     Term = [rabbit_data_coercion:to_proplist(Upstream) || Upstream <- Term0],

deps/rabbitmq_management/test/rabbit_mgmt_runtime_parameters_util.erl

@@ -40,16 +40,19 @@ notify_clear(_, _, _, _) -> ok.
 %----------------------------------------------------------------------------
 
 register_policy_validator() ->
-    rabbit_registry:register(operator_policy_validator, <<"testeven">>, ?MODULE),
-    rabbit_registry:register(operator_policy_validator, <<"testpos">>,  ?MODULE),
-    rabbit_registry:register(policy_validator, <<"testeven">>, ?MODULE),
-    rabbit_registry:register(policy_validator, <<"testpos">>,  ?MODULE).
+    rabbit_registry:register_many(
+      [{operator_policy_validator, <<"testeven">>},
+       {operator_policy_validator, <<"testpos">>},
+       {policy_validator, <<"testeven">>},
+       {policy_validator, <<"testpos">>}
+      ], ?MODULE).
 
 unregister_policy_validator() ->
-    rabbit_registry:unregister(operator_policy_validator, <<"testeven">>),
-    rabbit_registry:unregister(operator_policy_validator, <<"testpos">>),
-    rabbit_registry:unregister(policy_validator, <<"testeven">>),
-    rabbit_registry:unregister(policy_validator, <<"testpos">>).
+    rabbit_registry:unregister_many(
+      [{operator_policy_validator, <<"testeven">>},
+       {operator_policy_validator, <<"testpos">>},
+       {policy_validator, <<"testeven">>},
+       {policy_validator, <<"testpos">>}]).
 
 validate_policy([{<<"testeven">>, Terms}]) when is_list(Terms) ->
     case  length(Terms) rem 2 =:= 0 of

deps/rabbitmq_sharding/src/rabbit_sharding_policy_validator.erl

@@ -18,10 +18,11 @@
                     {enables, recovery}]}).
 
 register() ->
-    [rabbit_registry:register(Class, Name, ?MODULE) ||
-        {Class, Name} <- [{policy_validator,  <<"shards-per-node">>},
-                          {policy_validator,  <<"routing-key">>}]],
-    ok.
+    rabbit_registry:register_many(
+      [{policy_validator,  <<"shards-per-node">>},
+       {policy_validator,  <<"routing-key">>}
+      ],
+      ?MODULE).
 
 validate_policy(KeyList) ->
     SPN = proplists:get_value(<<"shards-per-node">>, KeyList, none),