rabbitmq · michaelklishin · May 23, 2024 · May 22, 2024 · May 23, 2024
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -2,3 +2,5 @@
 209f23fa2f58e0240116b3e8e5be9cd54d34b569
 # Format MQTT code with erlfmt
 1de9fcf582def91d1cee6bea457dd24e8a53a431
+# Remove unsed imports
+cfa3de4b2b1a07e9f4ef90d0aa6b22252238bc47
diff --git a/deps/amqp10_client/test/msg_SUITE.erl b/deps/amqp10_client/test/msg_SUITE.erl
@@ -7,7 +7,6 @@
 
 -module(msg_SUITE).
 
--include_lib("common_test/include/ct.hrl").
 -include_lib("eunit/include/eunit.hrl").
 
 -include_lib("amqp10_common/include/amqp10_framing.hrl").

diff --git a/deps/amqp10_common/test/binary_parser_SUITE.erl b/deps/amqp10_common/test/binary_parser_SUITE.erl
@@ -5,7 +5,6 @@
 -export([
          ]).
 
--include_lib("common_test/include/ct.hrl").
 -include_lib("eunit/include/eunit.hrl").
 
 %%%===================================================================

diff --git a/deps/amqp_client/src/amqp_channel_sup_sup.erl b/deps/amqp_client/src/amqp_channel_sup_sup.erl
@@ -8,8 +8,6 @@
 %% @private
 -module(amqp_channel_sup_sup).
 
--include("amqp_client.hrl").
-
 -behaviour(supervisor).
 
 -export([start_link/3, start_channel_sup/4]).

diff --git a/deps/amqp_client/src/amqp_direct_consumer.erl b/deps/amqp_client/src/amqp_direct_consumer.erl
@@ -31,8 +31,6 @@
 %% This module has no public functions.
 -module(amqp_direct_consumer).
 
--include("amqp_gen_consumer_spec.hrl").
-
 -behaviour(amqp_gen_consumer).
 
 -export([init/1, handle_consume_ok/3, handle_consume/3, handle_cancel_ok/3,

diff --git a/deps/oauth2_client/src/oauth2_client.erl b/deps/oauth2_client/src/oauth2_client.erl
@@ -12,8 +12,6 @@
         ]).
 
 -include("oauth2_client.hrl").
--include_lib("public_key/include/public_key.hrl").
-
 -spec get_access_token(oauth_provider_id() | oauth_provider(), access_token_request()) ->
     {ok, successful_access_token_response()} | {error, unsuccessful_access_token_response() | any()}.
 get_access_token(OAuth2ProviderId, Request) when is_binary(OAuth2ProviderId) ->

diff --git a/deps/oauth2_client/test/oauth_http_mock.erl b/deps/oauth2_client/test/oauth_http_mock.erl
@@ -6,7 +6,6 @@
 %%
 
 -module(oauth_http_mock).
--include_lib("common_test/include/ct.hrl").
 -include_lib("eunit/include/eunit.hrl").
 
 -export([init/2]).

diff --git a/deps/rabbit/app.bzl b/deps/rabbit/app.bzl
@@ -884,7 +884,7 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
         outs = ["test/clustering_management_SUITE.beam"],
         app_name = "rabbit",
         erlc_opts = "//:test_erlc_opts",
-        deps = ["//deps/amqp_client:erlang_app", "//deps/rabbitmq_ct_helpers:erlang_app"],
+        deps = ["//deps/amqp_client:erlang_app"],
     )
     erlang_bytecode(
         name = "test_clustering_utils_beam",
@@ -954,7 +954,7 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
         outs = ["test/definition_import_SUITE.beam"],
         app_name = "rabbit",
         erlc_opts = "//:test_erlc_opts",
-        deps = ["//deps/rabbit_common:erlang_app", "//deps/rabbitmq_ct_helpers:erlang_app"],
+        deps = ["//deps/rabbitmq_ct_helpers:erlang_app"],
     )
     erlang_bytecode(
         name = "deprecated_features_SUITE_beam_files",
@@ -1033,7 +1033,6 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
         outs = ["test/feature_flags_v2_SUITE.beam"],
         app_name = "rabbit",
         erlc_opts = "//:test_erlc_opts",
-        deps = ["//deps/rabbit_common:erlang_app"],
     )
     erlang_bytecode(
         name = "feature_flags_with_unpriveleged_user_SUITE_beam_files",
@@ -1140,7 +1139,7 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
         outs = ["test/peer_discovery_classic_config_SUITE.beam"],
         app_name = "rabbit",
         erlc_opts = "//:test_erlc_opts",
-        deps = ["//deps/amqp_client:erlang_app", "//deps/rabbitmq_ct_helpers:erlang_app"],
+        deps = ["//deps/rabbitmq_ct_helpers:erlang_app"],
     )
     erlang_bytecode(
         name = "peer_discovery_dns_SUITE_beam_files",
@@ -1371,7 +1370,7 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
         testonly = True,
         srcs = ["test/rabbit_fifo_dlx_SUITE.erl"],
         outs = ["test/rabbit_fifo_dlx_SUITE.beam"],
-        hdrs = ["src/rabbit_fifo.hrl", "src/rabbit_fifo_dlx.hrl"],
+        hdrs = ["src/rabbit_fifo.hrl"],
         app_name = "rabbit",
         erlc_opts = "//:test_erlc_opts",
         deps = ["//deps/rabbit_common:erlang_app"],
@@ -1477,7 +1476,6 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
         outs = ["test/rabbitmqctl_shutdown_SUITE.beam"],
         app_name = "rabbit",
         erlc_opts = "//:test_erlc_opts",
-        deps = ["//deps/amqp_client:erlang_app"],
     )
     erlang_bytecode(
         name = "signal_handling_SUITE_beam_files",
@@ -1521,7 +1519,7 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
         outs = ["test/term_to_binary_compat_prop_SUITE.beam"],
         app_name = "rabbit",
         erlc_opts = "//:test_erlc_opts",
-        deps = ["//deps/rabbit_common:erlang_app", "@proper//:erlang_app"],
+        deps = ["@proper//:erlang_app"],
     )
     erlang_bytecode(
         name = "test_channel_operation_timeout_test_queue_beam",
@@ -1823,7 +1821,6 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
         testonly = True,
         srcs = ["test/unit_gm_SUITE.erl"],
         outs = ["test/unit_gm_SUITE.beam"],
-        hdrs = ["include/gm_specs.hrl"],
         app_name = "rabbit",
         beam = ["ebin/gm.beam"],
         erlc_opts = "//:test_erlc_opts",
@@ -2007,7 +2004,6 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
         outs = ["test/rabbit_db_msup_SUITE.beam"],
         app_name = "rabbit",
         erlc_opts = "//:test_erlc_opts",
-        deps = ["//deps/rabbit_common:erlang_app"],
     )
     erlang_bytecode(
         name = "rabbit_db_policy_SUITE_beam_files",
@@ -2088,7 +2084,7 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
         outs = ["test/quorum_queue_member_reconciliation_SUITE.beam"],
         app_name = "rabbit",
         erlc_opts = "//:test_erlc_opts",
-        deps = ["//deps/amqp_client:erlang_app", "//deps/rabbitmq_ct_helpers:erlang_app"],
+        deps = ["//deps/amqp_client:erlang_app"],
     )
 
     erlang_bytecode(
@@ -2098,7 +2094,7 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
         outs = ["test/cluster_limit_SUITE.beam"],
         app_name = "rabbit",
         erlc_opts = "//:test_erlc_opts",
-        deps = ["//deps/amqp_client:erlang_app", "//deps/rabbitmq_ct_helpers:erlang_app"],
+        deps = ["//deps/amqp_client:erlang_app"],
     )
     erlang_bytecode(
         name = "metadata_store_clustering_SUITE_beam_files",
@@ -2107,7 +2103,7 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
         outs = ["test/metadata_store_clustering_SUITE.beam"],
         app_name = "rabbit",
         erlc_opts = "//:test_erlc_opts",
-        deps = ["//deps/amqp_client:erlang_app", "//deps/rabbitmq_ct_helpers:erlang_app"],
+        deps = ["//deps/amqp_client:erlang_app"],
     )
     erlang_bytecode(
         name = "metadata_store_migration_SUITE_beam_files",

diff --git a/deps/rabbit/src/internal_user.erl b/deps/rabbit/src/internal_user.erl
@@ -7,8 +7,6 @@
 
 -module(internal_user).
 
--include_lib("rabbit_common/include/rabbit.hrl").
-
 -export([
   new/0,
   new/1,

diff --git a/deps/rabbit/src/rabbit.erl b/deps/rabbit/src/rabbit.erl
@@ -275,7 +275,6 @@
 
 %%---------------------------------------------------------------------------
 
--include_lib("rabbit_common/include/rabbit_framing.hrl").
 -include_lib("rabbit_common/include/rabbit.hrl").
 
 -define(APPS, [os_mon, mnesia, rabbit_common, rabbitmq_prelaunch, ra, sysmon_handler, rabbit, osiris]).

diff --git a/deps/rabbit/src/rabbit_amqqueue_process.erl b/deps/rabbit/src/rabbit_amqqueue_process.erl
@@ -7,7 +7,6 @@
 
 -module(rabbit_amqqueue_process).
 -include_lib("rabbit_common/include/rabbit.hrl").
--include_lib("rabbit_common/include/rabbit_framing.hrl").
 -include("amqqueue.hrl").
 
 -behaviour(gen_server2).

diff --git a/deps/rabbit/src/rabbit_auth_mechanism_amqplain.erl b/deps/rabbit/src/rabbit_auth_mechanism_amqplain.erl
@@ -6,8 +6,6 @@
 %%
 
 -module(rabbit_auth_mechanism_amqplain).
--include_lib("rabbit_common/include/rabbit.hrl").
-
 -behaviour(rabbit_auth_mechanism).
 
 -export([description/0, should_offer/1, init/1, handle_response/2]).

diff --git a/deps/rabbit/src/rabbit_auth_mechanism_cr_demo.erl b/deps/rabbit/src/rabbit_auth_mechanism_cr_demo.erl
@@ -6,8 +6,6 @@
 %%
 
 -module(rabbit_auth_mechanism_cr_demo).
--include_lib("rabbit_common/include/rabbit.hrl").
-
 -behaviour(rabbit_auth_mechanism).
 
 -export([description/0, should_offer/1, init/1, handle_response/2]).

diff --git a/deps/rabbit/src/rabbit_auth_mechanism_plain.erl b/deps/rabbit/src/rabbit_auth_mechanism_plain.erl
@@ -6,8 +6,6 @@
 %%
 
 -module(rabbit_auth_mechanism_plain).
--include_lib("rabbit_common/include/rabbit.hrl").
-
 -behaviour(rabbit_auth_mechanism).
 
 -export([description/0, should_offer/1, init/1, handle_response/2]).

diff --git a/deps/rabbit/src/rabbit_channel_interceptor.erl b/deps/rabbit/src/rabbit_channel_interceptor.erl
@@ -7,7 +7,6 @@
 
 -module(rabbit_channel_interceptor).
 
--include_lib("rabbit_common/include/rabbit_framing.hrl").
 -include_lib("rabbit_common/include/rabbit.hrl").
 
 -export([init/1, intercept_in/3]).

diff --git a/deps/rabbit/src/rabbit_classic_queue_index_v2.erl b/deps/rabbit/src/rabbit_classic_queue_index_v2.erl
@@ -51,8 +51,6 @@
 -define(STORE_FD_RESERVATIONS, 2).
 
 -include_lib("rabbit_common/include/rabbit.hrl").
--include_lib("kernel/include/file.hrl").
-
 %% Set to true to get an awful lot of debug logs.
 -if(false).
 -define(DEBUG(X,Y), logger:debug("~0p: " ++ X, [?FUNCTION_NAME|Y])).

diff --git a/deps/rabbit/src/rabbit_credential_validation.erl b/deps/rabbit/src/rabbit_credential_validation.erl
@@ -7,8 +7,6 @@
 
 -module(rabbit_credential_validation).
 
--include_lib("rabbit_common/include/rabbit.hrl").
-
 %% used for backwards compatibility
 -define(DEFAULT_BACKEND, rabbit_credential_validator_accept_everything).
 

diff --git a/deps/rabbit/src/rabbit_credential_validator.erl b/deps/rabbit/src/rabbit_credential_validator.erl
@@ -7,8 +7,6 @@
 
 -module(rabbit_credential_validator).
 
--include_lib("rabbit_common/include/rabbit.hrl").
-
 %% Validates a password. Used by `rabbit_auth_backend_internal`.
 %%
 %% Possible return values:

diff --git a/deps/rabbit/src/rabbit_credential_validator_accept_everything.erl b/deps/rabbit/src/rabbit_credential_validator_accept_everything.erl
@@ -7,8 +7,6 @@
 
 -module(rabbit_credential_validator_accept_everything).
 
--include_lib("rabbit_common/include/rabbit.hrl").
-
 -behaviour(rabbit_credential_validator).
 
 %%

diff --git a/deps/rabbit/src/rabbit_credential_validator_min_password_length.erl b/deps/rabbit/src/rabbit_credential_validator_min_password_length.erl
@@ -7,8 +7,6 @@
 
 -module(rabbit_credential_validator_min_password_length).
 
--include_lib("rabbit_common/include/rabbit.hrl").
-
 -behaviour(rabbit_credential_validator).
 
 %% accommodates default (localhost-only) user credentials,

diff --git a/deps/rabbit/src/rabbit_credential_validator_password_regexp.erl b/deps/rabbit/src/rabbit_credential_validator_password_regexp.erl
@@ -10,8 +10,6 @@
 %% password against a pre-configured regular expression.
 -module(rabbit_credential_validator_password_regexp).
 
--include_lib("rabbit_common/include/rabbit.hrl").
-
 -behaviour(rabbit_credential_validator).
 
 %%

diff --git a/deps/rabbit/src/rabbit_db.erl b/deps/rabbit/src/rabbit_db.erl
@@ -7,8 +7,6 @@
 
 -module(rabbit_db).
 
--include_lib("khepri/include/khepri.hrl").
-
 -include_lib("kernel/include/logger.hrl").
 -include_lib("stdlib/include/assert.hrl").
 

diff --git a/deps/rabbit/src/rabbit_db_binding_m2k_converter.erl b/deps/rabbit/src/rabbit_db_binding_m2k_converter.erl
@@ -10,7 +10,6 @@
 -behaviour(mnesia_to_khepri_converter).
 
 -include_lib("kernel/include/logger.hrl").
--include_lib("khepri/include/khepri.hrl").
 -include_lib("khepri_mnesia_migration/src/kmm_logging.hrl").
 -include_lib("rabbit_common/include/rabbit.hrl").
 

diff --git a/deps/rabbit/src/rabbit_db_m2k_converter.erl b/deps/rabbit/src/rabbit_db_m2k_converter.erl
@@ -9,7 +9,6 @@
 
 -behaviour(mnesia_to_khepri_converter).
 
--include_lib("kernel/include/logger.hrl").
 -include_lib("khepri/include/khepri.hrl").
 -include_lib("khepri_mnesia_migration/src/kmm_logging.hrl").
 -include_lib("rabbit_common/include/rabbit.hrl").

diff --git a/deps/rabbit/src/rabbit_db_maintenance_m2k_converter.erl b/deps/rabbit/src/rabbit_db_maintenance_m2k_converter.erl
@@ -10,7 +10,6 @@
 -behaviour(mnesia_to_khepri_converter).
 
 -include_lib("kernel/include/logger.hrl").
--include_lib("khepri/include/khepri.hrl").
 -include_lib("khepri_mnesia_migration/src/kmm_logging.hrl").
 -include_lib("rabbit_common/include/rabbit.hrl").
 

diff --git a/deps/rabbit/src/rabbit_db_msup_m2k_converter.erl b/deps/rabbit/src/rabbit_db_msup_m2k_converter.erl
@@ -10,7 +10,6 @@
 -behaviour(mnesia_to_khepri_converter).
 
 -include_lib("kernel/include/logger.hrl").
--include_lib("khepri/include/khepri.hrl").
 -include_lib("khepri_mnesia_migration/src/kmm_logging.hrl").
 -include_lib("rabbit_common/include/rabbit.hrl").
 -include("mirrored_supervisor.hrl").

diff --git a/deps/rabbit/src/rabbit_db_queue.erl b/deps/rabbit/src/rabbit_db_queue.erl
@@ -7,7 +7,6 @@
 
 -module(rabbit_db_queue).
 
--include_lib("kernel/include/logger.hrl").
 -include_lib("stdlib/include/qlc.hrl").
 
 -include_lib("khepri/include/khepri.hrl").

diff --git a/deps/rabbit/src/rabbit_db_queue_m2k_converter.erl b/deps/rabbit/src/rabbit_db_queue_m2k_converter.erl
@@ -10,7 +10,6 @@
 -behaviour(mnesia_to_khepri_converter).
 
 -include_lib("kernel/include/logger.hrl").
--include_lib("khepri/include/khepri.hrl").
 -include_lib("khepri_mnesia_migration/src/kmm_logging.hrl").
 -include_lib("rabbit_common/include/rabbit.hrl").
 -include("amqqueue.hrl").

diff --git a/deps/rabbit/src/rabbit_db_rtparams_m2k_converter.erl b/deps/rabbit/src/rabbit_db_rtparams_m2k_converter.erl
@@ -10,7 +10,6 @@
 -behaviour(mnesia_to_khepri_converter).
 
 -include_lib("kernel/include/logger.hrl").
--include_lib("khepri/include/khepri.hrl").
 -include_lib("khepri_mnesia_migration/src/kmm_logging.hrl").
 -include_lib("rabbit_common/include/rabbit.hrl").
 

diff --git a/deps/rabbit/src/rabbit_db_vhost.erl b/deps/rabbit/src/rabbit_db_vhost.erl
@@ -7,7 +7,6 @@
 
 -module(rabbit_db_vhost).
 
--include_lib("kernel/include/logger.hrl").
 -include_lib("stdlib/include/assert.hrl").
 -include_lib("rabbit_common/include/logging.hrl").
 -include_lib("khepri/include/khepri.hrl").

diff --git a/deps/rabbit/src/rabbit_db_vhost_m2k_converter.erl b/deps/rabbit/src/rabbit_db_vhost_m2k_converter.erl
@@ -10,7 +10,6 @@
 -behaviour(mnesia_to_khepri_converter).
 
 -include_lib("kernel/include/logger.hrl").
--include_lib("khepri/include/khepri.hrl").
 -include_lib("khepri_mnesia_migration/src/kmm_logging.hrl").
 -include_lib("rabbit_common/include/rabbit.hrl").
 -include("vhost.hrl").

diff --git a/deps/rabbit/src/rabbit_definitions_import_https.erl b/deps/rabbit/src/rabbit_definitions_import_https.erl
@@ -14,8 +14,6 @@
 %%  * rabbit_definitions_import_local_filesystem
 %%  * rabbit_definitions_hashing
 -module(rabbit_definitions_import_https).
--include_lib("rabbit_common/include/rabbit.hrl").
-
 -export([
     is_enabled/0,
     load/1,

diff --git a/deps/rabbit/src/rabbit_definitions_import_local_filesystem.erl b/deps/rabbit/src/rabbit_definitions_import_local_filesystem.erl
@@ -15,8 +15,6 @@
 %%  * rabbit_definitions_import_http
 %%  * rabbit_definitions_hashing
 -module(rabbit_definitions_import_local_filesystem).
--include_lib("rabbit_common/include/rabbit.hrl").
-
 -export([
     is_enabled/0,
     %% definition source options

diff --git a/deps/rabbit/src/rabbit_logger_exchange_h.erl b/deps/rabbit/src/rabbit_logger_exchange_h.erl
@@ -12,8 +12,6 @@
 -include_lib("rabbit_common/include/rabbit.hrl").
 -include_lib("rabbit_common/include/rabbit_framing.hrl").
 -include_lib("rabbit_common/include/logging.hrl").
--include_lib("rabbit/include/mc.hrl").
-
 %% logger callbacks
 -export([log/2, adding_handler/1, removing_handler/1, changing_config/3,
          filter_config/1]).

diff --git a/deps/rabbit/src/rabbit_mirror_queue_mode_all.erl b/deps/rabbit/src/rabbit_mirror_queue_mode_all.erl
@@ -7,8 +7,6 @@
 
 -module(rabbit_mirror_queue_mode_all).
 
--include_lib("rabbit_common/include/rabbit.hrl").
-
 -behaviour(rabbit_mirror_queue_mode).
 
 -export([description/0, suggested_queue_nodes/5, validate_policy/1]).
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,8 +7,6 @@ @@
     -module(internal_user).
-    -include_lib("rabbit_common/include/rabbit.hrl").
     -export([
       new/0,
       new/1,
@@ Expand Down @@