Remove a Shovel JSON formatting function that's no longer necessary

It's been eight years since 28060d5 (cherry picked from commit d3ea758)
rabbitmq · Aug 18, 2024 · 5620dd9 · 5620dd9
1 parent 4d59248
commit 5620dd9
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 26 deletions.
diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_definitions.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_definitions.erl
@@ -107,8 +107,7 @@ vhost_definitions(ReqData, VHost, Context) ->
                             export_binding(B, QNames)],
     {ok, Vsn} = application:get_key(rabbit, vsn),
     Parameters = [strip_vhost(
-                    rabbit_mgmt_format:parameter(
-                      rabbit_mgmt_wm_parameters:fix_shovel_publish_properties(P)))
+                    rabbit_mgmt_format:parameter(P))
                   || P <- rabbit_runtime_parameters:list(VHost)],
     rabbit_mgmt_util:reply(
       [{rabbit_version, rabbit_data_coercion:to_binary(Vsn)}] ++

diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_parameter.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_parameter.erl
@@ -40,8 +40,7 @@ resource_exists(ReqData, Context) ->
      end, ReqData, Context}.
 
 to_json(ReqData, Context) ->
-    rabbit_mgmt_util:reply(rabbit_mgmt_format:parameter(
-        rabbit_mgmt_wm_parameters:fix_shovel_publish_properties(parameter(ReqData))),
+    rabbit_mgmt_util:reply(rabbit_mgmt_format:parameter(parameter(ReqData)),
                            ReqData, Context).
 
 accept_content(ReqData0, Context = #context{user = User}) ->

diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_parameters.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_parameters.erl
@@ -9,7 +9,6 @@
 
 -export([init/2, to_json/2, content_types_provided/2, is_authorized/2,
          resource_exists/2, basic/1]).
--export([fix_shovel_publish_properties/1]).
 -export([variances/2]).
 
 -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl").
@@ -40,24 +39,6 @@ is_authorized(ReqData, Context) ->
 
 %%--------------------------------------------------------------------
 
-%% Hackish fix to make sure we return a JSON object instead of an empty list
-%% when the publish-properties value is empty.
-fix_shovel_publish_properties(P) ->
-    case lists:keyfind(component, 1, P) of
-        {_, <<"shovel">>} ->
-            case lists:keytake(value, 1, P) of
-                {value, {_, Values}, P2} ->
-                    case lists:keytake(<<"publish-properties">>, 1, Values) of
-                        {_, {_, []}, Values2} ->
-                            P2 ++ [{value, Values2 ++ [{<<"publish-properties">>, empty_struct}]}];
-                        _ ->
-                            P
-                    end;
-                _ -> P
-            end;
-        _ -> P
-    end.
-
 basic(ReqData) ->
     Raw = case rabbit_mgmt_util:id(component, ReqData) of
               none -> rabbit_runtime_parameters:list();
@@ -71,5 +52,5 @@ basic(ReqData) ->
           end,
     case Raw of
         not_found -> not_found;
-        _         -> [rabbit_mgmt_format:parameter(fix_shovel_publish_properties(P)) || P <- Raw]
+        _         -> [rabbit_mgmt_format:parameter(P) || P <- Raw]
     end.
diff --git a/deps/rabbitmq_shovel_management/src/rabbit_shovel_mgmt_shovel.erl b/deps/rabbitmq_shovel_management/src/rabbit_shovel_mgmt_shovel.erl
@@ -66,8 +66,7 @@ resource_exists(ReqData, Context) ->
 
 to_json(ReqData, Context) ->
     Shovel = parameter(ReqData),
-    rabbit_mgmt_util:reply(rabbit_mgmt_format:parameter(
-        rabbit_mgmt_wm_parameters:fix_shovel_publish_properties(Shovel)),
+    rabbit_mgmt_util:reply(rabbit_mgmt_format:parameter(Shovel),
         ReqData, Context).
 
 is_authorized(ReqData, Context) ->