diff options
74 files changed, 93 insertions, 133 deletions
diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/auto_complete.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/auto_complete.ex index a62f1500d4..329a9824a6 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/auto_complete.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/auto_complete.ex @@ -15,8 +15,7 @@ defmodule Rabbitmq.CLI.AutoComplete do - alias RabbitMQ.CLI.Core.Parser, as: Parser - alias RabbitMQ.CLI.Core.CommandModules, as: CommandModules + alias RabbitMQ.CLI.Core.{CommandModules, Parser} @spec complete(String.t, [String.t]) :: [String.t] def complete(_, []) do diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/core/command_modules.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/core/command_modules.ex index b8c96c2e02..0dbedf3640 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/core/command_modules.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/core/command_modules.ex @@ -13,9 +13,8 @@ ## The Initial Developer of the Original Code is GoPivotal, Inc. ## Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. -alias RabbitMQ.CLI.Core.Config, as: Config +alias RabbitMQ.CLI.Core.{Config, Helpers} alias RabbitMQ.CLI.Plugins.Helpers, as: PluginsHelpers -alias RabbitMQ.CLI.Core.Helpers, as: Helpers defmodule RabbitMQ.CLI.Core.CommandModules do @commands_ns ~r/RabbitMQ.CLI.(.*).Commands/ diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/core/distribution.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/core/distribution.ex index c0106b38e0..c1f2e96ea4 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/core/distribution.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/core/distribution.ex @@ -13,7 +13,7 @@ ## The Initial Developer of the Original Code is Pivotal Software, Inc. ## Copyright (c) 2016-2017 Pivotal Software, Inc. All rights reserved. -alias RabbitMQ.CLI.Core.Config, as: Config +alias RabbitMQ.CLI.Core.Config defmodule RabbitMQ.CLI.Core.Distribution do diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/core/helpers.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/core/helpers.ex index 801ae7bae0..43027b7c99 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/core/helpers.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/core/helpers.ex @@ -16,7 +16,7 @@ # Small helper functions, mostly related to connecting to RabbitMQ and # handling memory units. -alias RabbitMQ.CLI.Core.Config, as: Config +alias RabbitMQ.CLI.Core.Config defmodule RabbitMQ.CLI.Core.Helpers do require Record diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/core/parser.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/core/parser.ex index 3eaaddbec4..e50920b373 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/core/parser.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/core/parser.ex @@ -13,8 +13,7 @@ ## The Initial Developer of the Original Code is GoPivotal, Inc. ## Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. -alias RabbitMQ.CLI.Core.CommandModules, as: CommandModules -alias RabbitMQ.CLI.Core.Config, as: Config +alias RabbitMQ.CLI.Core.{CommandModules, Config} defmodule RabbitMQ.CLI.Core.Parser do @@ -210,7 +209,7 @@ defmodule RabbitMQ.CLI.Core.Parser do {command, {:redefining_global_aliases, command_aliases}}}) end - + defp apply_if_exported(mod, fun, args, default) do case function_exported?(mod, fun, length(args)) do true -> apply(mod, fun, args); diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/core/validators.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/core/validators.ex index e25b85ecd5..d39d72dc8a 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/core/validators.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/core/validators.ex @@ -15,7 +15,7 @@ # Provides common validation functions. defmodule RabbitMQ.CLI.Core.Validators do - alias RabbitMQ.CLI.Core.Helpers, as: Helpers + alias RabbitMQ.CLI.Core.Helpers def chain([validator | rest], args) do case apply(validator, args) do diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/add_user_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/add_user_command.ex index 72ced4e36d..f0b6c2a15d 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/add_user_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/add_user_command.ex @@ -16,8 +16,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.AddUserCommand do - alias RabbitMQ.CLI.Core.Helpers, as: Helpers - alias RabbitMQ.CLI.Core.ExitCodes, as: ExitCodes + alias RabbitMQ.CLI.Core.{ExitCodes, Helpers} @behaviour RabbitMQ.CLI.CommandBehaviour diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/add_vhost_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/add_vhost_command.ex index 2ca5cd893d..fff01aa845 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/add_vhost_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/add_vhost_command.ex @@ -16,7 +16,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.AddVhostCommand do - alias RabbitMQ.CLI.Core.Helpers, as: Helpers + alias RabbitMQ.CLI.Core.Helpers @behaviour RabbitMQ.CLI.CommandBehaviour use RabbitMQ.CLI.DefaultOutput diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/change_password_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/change_password_command.ex index f4dfe05086..b11512e424 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/change_password_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/change_password_command.ex @@ -16,7 +16,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ChangePasswordCommand do - alias RabbitMQ.CLI.Core.Helpers, as: Helpers + alias RabbitMQ.CLI.Core.Helpers @behaviour RabbitMQ.CLI.CommandBehaviour use RabbitMQ.CLI.DefaultOutput diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/clear_global_parameter_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/clear_global_parameter_command.ex index 5b727e6819..7e1cff9e58 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/clear_global_parameter_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/clear_global_parameter_command.ex @@ -16,7 +16,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ClearGlobalParameterCommand do - alias RabbitMQ.CLI.Core.Helpers, as: Helpers + alias RabbitMQ.CLI.Core.Helpers @behaviour RabbitMQ.CLI.CommandBehaviour use RabbitMQ.CLI.DefaultOutput diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/clear_operator_policy_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/clear_operator_policy_command.ex index b84aec1406..d1517fea15 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/clear_operator_policy_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/clear_operator_policy_command.ex @@ -16,7 +16,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ClearOperatorPolicyCommand do - alias RabbitMQ.CLI.Core.Helpers, as: Helpers + alias RabbitMQ.CLI.Core.Helpers @behaviour RabbitMQ.CLI.CommandBehaviour use RabbitMQ.CLI.DefaultOutput diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/clear_parameter_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/clear_parameter_command.ex index 3d45479c55..c92f90cc61 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/clear_parameter_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/clear_parameter_command.ex @@ -16,7 +16,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ClearParameterCommand do - alias RabbitMQ.CLI.Core.Helpers, as: Helpers + alias RabbitMQ.CLI.Core.Helpers @behaviour RabbitMQ.CLI.CommandBehaviour use RabbitMQ.CLI.DefaultOutput diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/clear_password_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/clear_password_command.ex index 1ba032769d..1179d554d6 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/clear_password_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/clear_password_command.ex @@ -16,7 +16,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ClearPasswordCommand do - alias RabbitMQ.CLI.Core.Helpers, as: Helpers + alias RabbitMQ.CLI.Core.Helpers @behaviour RabbitMQ.CLI.CommandBehaviour use RabbitMQ.CLI.DefaultOutput diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/clear_permissions_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/clear_permissions_command.ex index 9d943297fc..201ca32692 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/clear_permissions_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/clear_permissions_command.ex @@ -15,7 +15,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ClearPermissionsCommand do - alias RabbitMQ.CLI.Core.Helpers, as: Helpers + alias RabbitMQ.CLI.Core.Helpers @behaviour RabbitMQ.CLI.CommandBehaviour use RabbitMQ.CLI.DefaultOutput diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/clear_policy_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/clear_policy_command.ex index 864abc382d..b0ec1535fd 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/clear_policy_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/clear_policy_command.ex @@ -15,7 +15,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ClearPolicyCommand do - alias RabbitMQ.CLI.Core.Helpers, as: Helpers + alias RabbitMQ.CLI.Core.Helpers @behaviour RabbitMQ.CLI.CommandBehaviour use RabbitMQ.CLI.DefaultOutput diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/clear_topic_permissions_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/clear_topic_permissions_command.ex index c3f54d4d35..3c9e2781b8 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/clear_topic_permissions_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/clear_topic_permissions_command.ex @@ -16,7 +16,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ClearTopicPermissionsCommand do - alias RabbitMQ.CLI.Core.Helpers, as: Helpers + alias RabbitMQ.CLI.Core.Helpers @behaviour RabbitMQ.CLI.CommandBehaviour use RabbitMQ.CLI.DefaultOutput diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/clear_vhost_limits_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/clear_vhost_limits_command.ex index df02b87348..752261cd41 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/clear_vhost_limits_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/clear_vhost_limits_command.ex @@ -15,7 +15,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ClearVhostLimitsCommand do - alias RabbitMQ.CLI.Core.Helpers, as: Helpers + alias RabbitMQ.CLI.Core.Helpers @behaviour RabbitMQ.CLI.CommandBehaviour use RabbitMQ.CLI.DefaultOutput diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/decode_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/decode_command.ex index 8c9494bdb6..463c1b21f6 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/decode_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/decode_command.ex @@ -13,7 +13,7 @@ ## The Initial Developer of the Original Code is GoPivotal, Inc. ## Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. -alias RabbitMQ.CLI.Core.Helpers, as: Helpers +alias RabbitMQ.CLI.Core.Helpers defmodule RabbitMQ.CLI.Ctl.Commands.DecodeCommand do @behaviour RabbitMQ.CLI.CommandBehaviour diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/delete_user_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/delete_user_command.ex index e0e26abf15..9a235255c4 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/delete_user_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/delete_user_command.ex @@ -15,7 +15,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.DeleteUserCommand do - alias RabbitMQ.CLI.Core.Helpers, as: Helpers + alias RabbitMQ.CLI.Core.Helpers @behaviour RabbitMQ.CLI.CommandBehaviour use RabbitMQ.CLI.DefaultOutput diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/delete_vhost_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/delete_vhost_command.ex index 1b1165d0f5..0a956c1618 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/delete_vhost_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/delete_vhost_command.ex @@ -15,19 +15,19 @@ defmodule RabbitMQ.CLI.Ctl.Commands.DeleteVhostCommand do - alias RabbitMQ.CLI.Core.Helpers, as: Helpers + alias RabbitMQ.CLI.Core.Helpers @behaviour RabbitMQ.CLI.CommandBehaviour use RabbitMQ.CLI.DefaultOutput def merge_defaults(args, opts), do: {args, opts} - + def validate([], _), do: {:validation_failure, :not_enough_args} def validate([_|_] = args, _) when length(args) > 1, do: {:validation_failure, :too_many_args} def validate([_], _), do: :ok use RabbitMQ.CLI.Core.RequiresRabbitAppRunning - + def run([arg], %{node: node_name}) do :rabbit_misc.rpc_call(node_name, :rabbit_vhost, :delete, [arg, Helpers.cli_acting_user()]) end @@ -36,4 +36,3 @@ defmodule RabbitMQ.CLI.Ctl.Commands.DeleteVhostCommand do def banner([arg], _), do: "Deleting vhost \"#{arg}\" ..." end - diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/encode_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/encode_command.ex index 5c8f5785c8..1e1de7ef8a 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/encode_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/encode_command.ex @@ -14,7 +14,7 @@ ## Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. defmodule RabbitMQ.CLI.Ctl.Commands.EncodeCommand do - alias RabbitMQ.CLI.Core.Helpers, as: Helpers + alias RabbitMQ.CLI.Core.Helpers @behaviour RabbitMQ.CLI.CommandBehaviour use RabbitMQ.CLI.DefaultOutput diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/force_boot_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/force_boot_command.ex index aa51d746ef..55abac31d2 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/force_boot_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/force_boot_command.ex @@ -13,7 +13,7 @@ ## The Initial Developer of the Original Code is GoPivotal, Inc. ## Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. -alias RabbitMQ.CLI.Core.Config, as: Config +alias RabbitMQ.CLI.Core.Config defmodule RabbitMQ.CLI.Ctl.Commands.ForceBootCommand do @behaviour RabbitMQ.CLI.CommandBehaviour diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/forget_cluster_node_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/forget_cluster_node_command.ex index 3fd3ec125f..46692d9e88 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/forget_cluster_node_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/forget_cluster_node_command.ex @@ -14,8 +14,7 @@ ## Copyright (c) 2016-2017 Pivotal Software, Inc. All rights reserved. defmodule RabbitMQ.CLI.Ctl.Commands.ForgetClusterNodeCommand do - alias RabbitMQ.CLI.Core.Validators, as: Validators - alias RabbitMQ.CLI.Core.Distribution, as: Distribution + alias RabbitMQ.CLI.Core.{Distribution, Validators} import Rabbitmq.Atom.Coerce @behaviour RabbitMQ.CLI.CommandBehaviour diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/help_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/help_command.ex index 862b5cf487..b39581f9d4 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/help_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/help_command.ex @@ -16,9 +16,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.HelpCommand do - alias RabbitMQ.CLI.Core.CommandModules, as: CommandModules - alias RabbitMQ.CLI.Core.ExitCodes, as: ExitCodes - alias RabbitMQ.CLI.Core.Config, as: Config + alias RabbitMQ.CLI.Core.{CommandModules, Config, ExitCodes} @behaviour RabbitMQ.CLI.CommandBehaviour diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/hipe_compile_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/hipe_compile_command.ex index 05681ddfac..72d9994d6d 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/hipe_compile_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/hipe_compile_command.ex @@ -14,7 +14,7 @@ ## Copyright (c) 2016-2017 Pivotal Software, Inc. All rights reserved. defmodule RabbitMQ.CLI.Ctl.Commands.HipeCompileCommand do - alias RabbitMQ.CLI.Core.Helpers, as: Helpers + alias RabbitMQ.CLI.Core.Helpers @behaviour RabbitMQ.CLI.CommandBehaviour use RabbitMQ.CLI.DefaultOutput diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/join_cluster_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/join_cluster_command.ex index 246528713b..76c37009fb 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/join_cluster_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/join_cluster_command.ex @@ -15,7 +15,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.JoinClusterCommand do - alias RabbitMQ.CLI.Core.Helpers, as: Helpers + alias RabbitMQ.CLI.Core.Helpers @behaviour RabbitMQ.CLI.CommandBehaviour diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_bindings_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_bindings_command.ex index 5c632d4fa1..b40410fadd 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_bindings_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_bindings_command.ex @@ -15,8 +15,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ListBindingsCommand do - alias RabbitMQ.CLI.Ctl.InfoKeys, as: InfoKeys - alias RabbitMQ.CLI.Ctl.RpcStream, as: RpcStream + alias RabbitMQ.CLI.Ctl.{InfoKeys, RpcStream} @behaviour RabbitMQ.CLI.CommandBehaviour use RabbitMQ.CLI.DefaultOutput diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_channels_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_channels_command.ex index 200db14acc..7fd558e142 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_channels_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_channels_command.ex @@ -16,9 +16,8 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ListChannelsCommand do - alias RabbitMQ.CLI.Core.Helpers, as: Helpers - alias RabbitMQ.CLI.Ctl.RpcStream, as: RpcStream - alias RabbitMQ.CLI.Ctl.InfoKeys, as: InfoKeys + alias RabbitMQ.CLI.Core.Helpers + alias RabbitMQ.CLI.Ctl.{InfoKeys, RpcStream} @behaviour RabbitMQ.CLI.CommandBehaviour use RabbitMQ.CLI.DefaultOutput diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_connections_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_connections_command.ex index c17fafbd82..657e594f98 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_connections_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_connections_command.ex @@ -15,9 +15,8 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ListConnectionsCommand do - alias RabbitMQ.CLI.Core.Helpers, as: Helpers - alias RabbitMQ.CLI.Ctl.InfoKeys, as: InfoKeys - alias RabbitMQ.CLI.Ctl.RpcStream, as: RpcStream + alias RabbitMQ.CLI.Core.Helpers + alias RabbitMQ.CLI.Ctl.{InfoKeys, RpcStream} @behaviour RabbitMQ.CLI.CommandBehaviour use RabbitMQ.CLI.DefaultOutput diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_consumers_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_consumers_command.ex index 1d60744a97..0477904a41 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_consumers_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_consumers_command.ex @@ -15,9 +15,8 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ListConsumersCommand do - alias RabbitMQ.CLI.Core.Helpers, as: Helpers - alias RabbitMQ.CLI.Ctl.InfoKeys, as: InfoKeys - alias RabbitMQ.CLI.Ctl.RpcStream, as: RpcStream + alias RabbitMQ.CLI.Core.Helpers + alias RabbitMQ.CLI.Ctl.{InfoKeys, RpcStream} @behaviour RabbitMQ.CLI.CommandBehaviour use RabbitMQ.CLI.DefaultOutput diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_exchanges_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_exchanges_command.ex index 720aad16ec..edd1176a76 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_exchanges_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_exchanges_command.ex @@ -15,8 +15,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ListExchangesCommand do - alias RabbitMQ.CLI.Ctl.InfoKeys, as: InfoKeys - alias RabbitMQ.CLI.Ctl.RpcStream, as: RpcStream + alias RabbitMQ.CLI.Ctl.{InfoKeys, RpcStream} @behaviour RabbitMQ.CLI.CommandBehaviour use RabbitMQ.CLI.DefaultOutput diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_queues_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_queues_command.ex index 6c39f56f25..b5848fb151 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_queues_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_queues_command.ex @@ -18,9 +18,8 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ListQueuesCommand do require RabbitMQ.CLI.Ctl.InfoKeys require RabbitMQ.CLI.Ctl.RpcStream - alias RabbitMQ.CLI.Ctl.InfoKeys, as: InfoKeys - alias RabbitMQ.CLI.Ctl.RpcStream, as: RpcStream - alias RabbitMQ.CLI.Core.Helpers, as: Helpers + alias RabbitMQ.CLI.Ctl.{InfoKeys, RpcStream} + alias RabbitMQ.CLI.Core.Helpers @behaviour RabbitMQ.CLI.CommandBehaviour use RabbitMQ.CLI.DefaultOutput diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_unresponsive_queues_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_unresponsive_queues_command.ex index a001406eb7..25eef14be0 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_unresponsive_queues_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_unresponsive_queues_command.ex @@ -18,9 +18,8 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ListUnresponsiveQueuesCommand do require RabbitMQ.CLI.Ctl.InfoKeys require RabbitMQ.CLI.Ctl.RpcStream - alias RabbitMQ.CLI.Ctl.InfoKeys, as: InfoKeys - alias RabbitMQ.CLI.Ctl.RpcStream, as: RpcStream - alias RabbitMQ.CLI.Core.Helpers, as: Helpers + alias RabbitMQ.CLI.Ctl.{InfoKeys, RpcStream} + alias RabbitMQ.CLI.Core.Helpers @behaviour RabbitMQ.CLI.CommandBehaviour use RabbitMQ.CLI.DefaultOutput diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_vhosts_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_vhosts_command.ex index b0c6790930..7a65d7b632 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_vhosts_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_vhosts_command.ex @@ -15,7 +15,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ListVhostsCommand do - alias RabbitMQ.CLI.Ctl.InfoKeys, as: InfoKeys + alias RabbitMQ.CLI.Ctl.InfoKeys @behaviour RabbitMQ.CLI.CommandBehaviour use RabbitMQ.CLI.DefaultOutput diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/rename_cluster_node_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/rename_cluster_node_command.ex index b348602e8f..ff2b7e642f 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/rename_cluster_node_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/rename_cluster_node_command.ex @@ -16,7 +16,7 @@ require Integer defmodule RabbitMQ.CLI.Ctl.Commands.RenameClusterNodeCommand do - alias RabbitMQ.CLI.Core.Validators, as: Validators + alias RabbitMQ.CLI.Core.Validators import Rabbitmq.Atom.Coerce @behaviour RabbitMQ.CLI.CommandBehaviour diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/report_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/report_command.ex index f6217ce23a..c1f18de563 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/report_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/report_command.ex @@ -15,17 +15,10 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ReportCommand do - alias RabbitMQ.CLI.Ctl.Commands.StatusCommand, as: StatusCommand - alias RabbitMQ.CLI.Ctl.Commands.ClusterStatusCommand, as: ClusterStatusCommand - alias RabbitMQ.CLI.Ctl.Commands.EnvironmentCommand, as: EnvironmentCommand - alias RabbitMQ.CLI.Ctl.Commands.ListConnectionsCommand, as: ListConnectionsCommand - alias RabbitMQ.CLI.Ctl.Commands.ListChannelsCommand, as: ListChannelsCommand - alias RabbitMQ.CLI.Ctl.Commands.ListQueuesCommand, as: ListQueuesCommand - alias RabbitMQ.CLI.Ctl.Commands.ListExchangesCommand, as: ListExchangesCommand - alias RabbitMQ.CLI.Ctl.Commands.ListBindingsCommand, as: ListBindingsCommand - alias RabbitMQ.CLI.Ctl.Commands.ListPermissionsCommand, as: ListPermissionsCommand - alias RabbitMQ.CLI.Ctl.Commands.ListPoliciesCommand, as: ListPoliciesCommand - alias RabbitMQ.CLI.Ctl.Commands.ListParametersCommand, as: ListParametersCommand + alias RabbitMQ.CLI.Ctl.Commands.{ClusterStatusCommand, EnvironmentCommand, + ListBindingsCommand, ListChannelsCommand, ListConnectionsCommand, + ListExchangesCommand, ListParametersCommand, ListPermissionsCommand, + ListPoliciesCommand, ListQueuesCommand, StatusCommand} @behaviour RabbitMQ.CLI.CommandBehaviour use RabbitMQ.CLI.DefaultOutput diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/restart_vhost_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/restart_vhost_command.ex index 24c70166c9..d4a9b1077a 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/restart_vhost_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/restart_vhost_command.ex @@ -13,7 +13,7 @@ ## The Initial Developer of the Original Code is GoPivotal, Inc. ## Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. -alias RabbitMQ.CLI.Core.ExitCodes, as: ExitCodes +alias RabbitMQ.CLI.Core.ExitCodes defmodule RabbitMQ.CLI.Ctl.Commands.RestartVhostCommand do @behaviour RabbitMQ.CLI.CommandBehaviour diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_cluster_name_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_cluster_name_command.ex index 6c870488e0..5bcd146c18 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_cluster_name_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_cluster_name_command.ex @@ -15,7 +15,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.SetClusterNameCommand do - alias RabbitMQ.CLI.Core.Helpers, as: Helpers + alias RabbitMQ.CLI.Core.Helpers @behaviour RabbitMQ.CLI.CommandBehaviour use RabbitMQ.CLI.DefaultOutput diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_disk_free_limit_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_disk_free_limit_command.ex index f701f5a204..a03593040c 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_disk_free_limit_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_disk_free_limit_command.ex @@ -15,7 +15,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.SetDiskFreeLimitCommand do - alias RabbitMQ.CLI.Core.Helpers, as: Helpers + alias RabbitMQ.CLI.Core.Helpers @behaviour RabbitMQ.CLI.CommandBehaviour use RabbitMQ.CLI.DefaultOutput diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_global_parameter_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_global_parameter_command.ex index c753dfb194..0dc43e3c14 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_global_parameter_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_global_parameter_command.ex @@ -15,7 +15,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.SetGlobalParameterCommand do - alias RabbitMQ.CLI.Core.Helpers, as: Helpers + alias RabbitMQ.CLI.Core.Helpers @behaviour RabbitMQ.CLI.CommandBehaviour use RabbitMQ.CLI.DefaultOutput diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_operator_policy_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_operator_policy_command.ex index d5c5c7af34..7cfafd7f3a 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_operator_policy_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_operator_policy_command.ex @@ -15,7 +15,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.SetOperatorPolicyCommand do - alias RabbitMQ.CLI.Core.Helpers, as: Helpers + alias RabbitMQ.CLI.Core.Helpers @behaviour RabbitMQ.CLI.CommandBehaviour use RabbitMQ.CLI.DefaultOutput diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_parameter_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_parameter_command.ex index dd21ec519f..f708437fa3 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_parameter_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_parameter_command.ex @@ -15,7 +15,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.SetParameterCommand do - alias RabbitMQ.CLI.Core.Helpers, as: Helpers + alias RabbitMQ.CLI.Core.Helpers @behaviour RabbitMQ.CLI.CommandBehaviour use RabbitMQ.CLI.DefaultOutput diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_permissions_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_permissions_command.ex index 27aa5e0487..728bc2358f 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_permissions_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_permissions_command.ex @@ -15,7 +15,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.SetPermissionsCommand do - alias RabbitMQ.CLI.Core.Helpers, as: Helpers + alias RabbitMQ.CLI.Core.Helpers @behaviour RabbitMQ.CLI.CommandBehaviour use RabbitMQ.CLI.DefaultOutput @@ -38,7 +38,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.SetPermissionsCommand do def validate(_, _), do: :ok use RabbitMQ.CLI.Core.RequiresRabbitAppRunning - + def run([user, conf, write, read], %{node: node_name, vhost: vhost}) do :rabbit_misc.rpc_call(node_name, :rabbit_auth_backend_internal, diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_policy_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_policy_command.ex index 1d97afa8ba..19de433f3c 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_policy_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_policy_command.ex @@ -15,7 +15,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.SetPolicyCommand do - alias RabbitMQ.CLI.Core.Helpers, as: Helpers + alias RabbitMQ.CLI.Core.Helpers @behaviour RabbitMQ.CLI.CommandBehaviour use RabbitMQ.CLI.DefaultOutput diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_topic_permissions_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_topic_permissions_command.ex index a35310523b..6d4233efb8 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_topic_permissions_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_topic_permissions_command.ex @@ -15,7 +15,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.SetTopicPermissionsCommand do - alias RabbitMQ.CLI.Core.Helpers, as: Helpers + alias RabbitMQ.CLI.Core.Helpers @behaviour RabbitMQ.CLI.CommandBehaviour use RabbitMQ.CLI.DefaultOutput diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_user_tags_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_user_tags_command.ex index e23db5b0e5..d19a35acfb 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_user_tags_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_user_tags_command.ex @@ -15,7 +15,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.SetUserTagsCommand do - alias RabbitMQ.CLI.Core.Helpers, as: Helpers + alias RabbitMQ.CLI.Core.Helpers @behaviour RabbitMQ.CLI.CommandBehaviour use RabbitMQ.CLI.DefaultOutput @@ -26,7 +26,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.SetUserTagsCommand do def validate(_, _), do: :ok use RabbitMQ.CLI.Core.RequiresRabbitAppRunning - + def run([user | tags], %{node: node_name}) do :rabbit_misc.rpc_call(node_name, :rabbit_auth_backend_internal, diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_vhost_limits_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_vhost_limits_command.ex index c2a152a7e4..c53be150b8 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_vhost_limits_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_vhost_limits_command.ex @@ -15,7 +15,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.SetVhostLimitsCommand do - alias RabbitMQ.CLI.Core.Helpers, as: Helpers + alias RabbitMQ.CLI.Core.Helpers @behaviour RabbitMQ.CLI.CommandBehaviour use RabbitMQ.CLI.DefaultOutput @@ -35,7 +35,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.SetVhostLimitsCommand do def validate(_, _), do: :ok use RabbitMQ.CLI.Core.RequiresRabbitAppRunning - + def run([definition], %{node: node_name, vhost: vhost}) do :rabbit_misc.rpc_call(node_name, :rabbit_vhost_limit, :parse_set, [vhost, definition, Helpers.cli_acting_user()]) diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_vm_memory_high_watermark_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_vm_memory_high_watermark_command.ex index 8cef584bd5..6f1fc7e1fe 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_vm_memory_high_watermark_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_vm_memory_high_watermark_command.ex @@ -15,7 +15,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.SetVmMemoryHighWatermarkCommand do - alias RabbitMQ.CLI.Core.Helpers, as: Helpers + alias RabbitMQ.CLI.Core.Helpers @behaviour RabbitMQ.CLI.CommandBehaviour use RabbitMQ.CLI.DefaultOutput @@ -68,7 +68,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.SetVmMemoryHighWatermarkCommand do def validate(_, _), do: :ok use RabbitMQ.CLI.Core.RequiresRabbitAppRunning - + def run(["absolute", arg], opts) do case Integer.parse(arg) do {num, rest} -> valid_units = rest in Helpers.memory_units diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/shutdown_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/shutdown_command.ex index 571ae098b9..247a7c5f1d 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/shutdown_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/shutdown_command.ex @@ -17,7 +17,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ShutdownCommand do @behaviour RabbitMQ.CLI.CommandBehaviour use RabbitMQ.CLI.DefaultOutput - alias RabbitMQ.CLI.Core.OsPid, as: OsPid + alias RabbitMQ.CLI.Core.OsPid def formatter(), do: RabbitMQ.CLI.Formatters.String diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/stop_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/stop_command.ex index 7101a76d7e..af8b5e9681 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/stop_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/stop_command.ex @@ -17,7 +17,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.StopCommand do @behaviour RabbitMQ.CLI.CommandBehaviour use RabbitMQ.CLI.DefaultOutput - alias RabbitMQ.CLI.Core.OsPid, as: OsPid + alias RabbitMQ.CLI.Core.OsPid def merge_defaults(args, opts), do: {args, opts} diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/update_cluster_nodes_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/update_cluster_nodes_command.ex index c5e0fbb780..1ea5d44181 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/update_cluster_nodes_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/update_cluster_nodes_command.ex @@ -15,7 +15,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.UpdateClusterNodesCommand do - alias RabbitMQ.CLI.Core.Helpers, as: Helpers + alias RabbitMQ.CLI.Core.Helpers @behaviour RabbitMQ.CLI.CommandBehaviour diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/wait_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/wait_command.ex index 121f01904a..d3564b273f 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/wait_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/wait_command.ex @@ -14,8 +14,7 @@ ## Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. defmodule RabbitMQ.CLI.Ctl.Commands.WaitCommand do - alias RabbitMQ.CLI.Core.Validators, as: Validators - alias RabbitMQ.CLI.Core.Helpers, as: Helpers + alias RabbitMQ.CLI.Core.{Helpers, Validators} @behaviour RabbitMQ.CLI.CommandBehaviour @default_timeout 10_000 diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/rpc_stream.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/rpc_stream.ex index 8d1033268f..4ed1717988 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/rpc_stream.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/rpc_stream.ex @@ -14,7 +14,7 @@ ## Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. defmodule RabbitMQ.CLI.Ctl.RpcStream do - alias RabbitMQ.CLI.Ctl.InfoKeys, as: InfoKeys + alias RabbitMQ.CLI.Ctl.InfoKeys def receive_list_items(node, mod, fun, args, timeout, info_keys) do receive_list_items(node, [{mod, fun, args}], timeout, info_keys, 1) diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/commands/memory_breakdown_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/commands/memory_breakdown_command.ex index 43197671a9..81d50f7d1b 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/commands/memory_breakdown_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/commands/memory_breakdown_command.ex @@ -53,7 +53,7 @@ defmodule RabbitMQ.CLI.Diagnostics.Commands.MemoryBreakdownCommand do end defmodule Formatter do - alias RabbitMQ.CLI.Formatters.FormatterHelpers, as: FormatterHelpers + alias RabbitMQ.CLI.Formatters.FormatterHelpers alias RabbitMQ.CLI.InformationUnit, as: IU @behaviour RabbitMQ.CLI.FormatterBehaviour diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/csv.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/csv.ex index 3016ca7d05..8d2ac64135 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/csv.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/csv.ex @@ -13,7 +13,7 @@ ## The Initial Developer of the Original Code is GoPivotal, Inc. ## Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. -alias RabbitMQ.CLI.Formatters.FormatterHelpers, as: FormatterHelpers +alias RabbitMQ.CLI.Formatters.FormatterHelpers defmodule RabbitMQ.CLI.Formatters.Csv do @@ -117,4 +117,3 @@ defimpl CSV.Encode, for: Map do |> CSV.Encode.encode(env) end end - diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/inspect.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/inspect.ex index 5ed8de08ab..7cc96edc8b 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/inspect.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/inspect.ex @@ -12,7 +12,7 @@ ## ## The Initial Developer of the Original Code is GoPivotal, Inc. ## Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. -alias RabbitMQ.CLI.Formatters.FormatterHelpers, as: FormatterHelpers +alias RabbitMQ.CLI.Formatters.FormatterHelpers defmodule RabbitMQ.CLI.Formatters.Inspect do @behaviour RabbitMQ.CLI.FormatterBehaviour diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/json.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/json.ex index 54de9eb0a9..ca7b076be2 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/json.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/json.ex @@ -17,7 +17,7 @@ # collection using start/finish_collection. # Primary purpose is to translate stream from CTL, # so there is no need for multiple collection levels -alias RabbitMQ.CLI.Formatters.FormatterHelpers, as: FormatterHelpers +alias RabbitMQ.CLI.Formatters.FormatterHelpers defmodule RabbitMQ.CLI.Formatters.Json do @behaviour RabbitMQ.CLI.FormatterBehaviour diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/plugins.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/plugins.ex index c046d3b1d3..84b6080b5e 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/plugins.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/plugins.ex @@ -12,7 +12,7 @@ ## ## The Initial Developer of the Original Code is GoPivotal, Inc. ## Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. -alias RabbitMQ.CLI.Formatters.FormatterHelpers, as: FormatterHelpers +alias RabbitMQ.CLI.Formatters.FormatterHelpers defmodule RabbitMQ.CLI.Formatters.Plugins do @behaviour RabbitMQ.CLI.FormatterBehaviour diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/report.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/report.ex index 36837e999f..826c36a540 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/report.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/report.ex @@ -13,8 +13,8 @@ ## The Initial Developer of the Original Code is GoPivotal, Inc. ## Copyright (c) 2017 Pivotal Software, Inc. All rights reserved. -alias RabbitMQ.CLI.Formatters.FormatterHelpers, as: FormatterHelpers -alias RabbitMQ.CLI.Core.Output, as: Output +alias RabbitMQ.CLI.Formatters.FormatterHelpers +alias RabbitMQ.CLI.Core.Output defmodule RabbitMQ.CLI.Formatters.Report do @behaviour RabbitMQ.CLI.FormatterBehaviour @@ -51,4 +51,4 @@ defmodule RabbitMQ.CLI.Formatters.Report do def banner_list([_|_] = list), do: list def banner_list(val), do: [val] -end
\ No newline at end of file +end diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/string.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/string.ex index c548b53799..e80a896549 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/string.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/string.ex @@ -15,8 +15,8 @@ ## Prints values from a command as strings(if possible) defmodule RabbitMQ.CLI.Formatters.String do - alias RabbitMQ.CLI.Core.Helpers, as: Helpers - alias RabbitMQ.CLI.Formatters.FormatterHelpers, as: FormatterHelpers + alias RabbitMQ.CLI.Core.Helpers + alias RabbitMQ.CLI.Formatters.FormatterHelpers @behaviour RabbitMQ.CLI.FormatterBehaviour diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/table.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/table.ex index e92c18e601..6c4727e7f7 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/table.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/table.ex @@ -13,7 +13,7 @@ ## The Initial Developer of the Original Code is GoPivotal, Inc. ## Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. -alias RabbitMQ.CLI.Formatters.FormatterHelpers, as: FormatterHelpers +alias RabbitMQ.CLI.Formatters.FormatterHelpers defmodule RabbitMQ.CLI.Formatters.Table do diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/plugins/commands/disable_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/plugins/commands/disable_command.ex index 71f0b0e8cb..57e403e686 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/plugins/commands/disable_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/plugins/commands/disable_command.ex @@ -16,8 +16,7 @@ defmodule RabbitMQ.CLI.Plugins.Commands.DisableCommand do alias RabbitMQ.CLI.Plugins.Helpers, as: PluginHelpers - alias RabbitMQ.CLI.Core.Helpers, as: Helpers - alias RabbitMQ.CLI.Core.Validators, as: Validators + alias RabbitMQ.CLI.Core.{Helpers, Validators} @behaviour RabbitMQ.CLI.CommandBehaviour diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/plugins/commands/enable_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/plugins/commands/enable_command.ex index adfba14c84..a9cd2aafa2 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/plugins/commands/enable_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/plugins/commands/enable_command.ex @@ -16,8 +16,7 @@ defmodule RabbitMQ.CLI.Plugins.Commands.EnableCommand do alias RabbitMQ.CLI.Plugins.Helpers, as: PluginHelpers - alias RabbitMQ.CLI.Core.Helpers, as: Helpers - alias RabbitMQ.CLI.Core.Validators, as: Validators + alias RabbitMQ.CLI.Core.{Helpers, Validators} @behaviour RabbitMQ.CLI.CommandBehaviour diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/plugins/commands/list_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/plugins/commands/list_command.ex index 61722ebe21..a5136c0f24 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/plugins/commands/list_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/plugins/commands/list_command.ex @@ -17,8 +17,7 @@ defmodule RabbitMQ.CLI.Plugins.Commands.ListCommand do import RabbitCommon.Records - alias RabbitMQ.CLI.Core.Helpers, as: Helpers - alias RabbitMQ.CLI.Core.Validators, as: Validators + alias RabbitMQ.CLI.Core.{Helpers, Validators} alias RabbitMQ.CLI.Plugins.Helpers, as: PluginHelpers @behaviour RabbitMQ.CLI.CommandBehaviour diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/plugins/commands/set_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/plugins/commands/set_command.ex index cc53de5ef4..7f914637eb 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/plugins/commands/set_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/plugins/commands/set_command.ex @@ -16,9 +16,7 @@ defmodule RabbitMQ.CLI.Plugins.Commands.SetCommand do alias RabbitMQ.CLI.Plugins.Helpers, as: PluginHelpers - alias RabbitMQ.CLI.Core.Helpers, as: Helpers - alias RabbitMQ.CLI.Core.Validators, as: Validators - alias RabbitMQ.CLI.Core.ExitCodes, as: ExitCodes + alias RabbitMQ.CLI.Core.{ExitCodes, Helpers, Validators} @behaviour RabbitMQ.CLI.CommandBehaviour diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/plugins/plugins_helpers.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/plugins/plugins_helpers.ex index e41677c75d..2aab417526 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/plugins/plugins_helpers.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/plugins/plugins_helpers.ex @@ -13,8 +13,7 @@ ## The Initial Developer of the Original Code is GoPivotal, Inc. ## Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. alias RabbitMQ.CLI.Core.Helpers, as: CliHelpers -alias RabbitMQ.CLI.Core.Config, as: Config -alias RabbitMQ.CLI.Core.Validators, as: Validators +alias RabbitMQ.CLI.Core.{Config, Validators} defmodule RabbitMQ.CLI.Plugins.Helpers do import Rabbitmq.Atom.Coerce diff --git a/deps/rabbitmq_cli/lib/rabbitmqctl.ex b/deps/rabbitmq_cli/lib/rabbitmqctl.ex index cf2db17a4e..b1374ec768 100644 --- a/deps/rabbitmq_cli/lib/rabbitmqctl.ex +++ b/deps/rabbitmq_cli/lib/rabbitmqctl.ex @@ -15,16 +15,9 @@ defmodule RabbitMQCtl do - alias RabbitMQ.CLI.Core.Distribution, as: Distribution + alias RabbitMQ.CLI.Core.{CommandModules, Distribution, ExitCodes, Helpers, Output, Parser} + alias RabbitMQ.CLI.Ctl.Commands.HelpCommand - alias RabbitMQ.CLI.Ctl.Commands.HelpCommand, as: HelpCommand - alias RabbitMQ.CLI.Core.Output, as: Output - alias RabbitMQ.CLI.Core.ExitCodes, as: ExitCodes - - alias RabbitMQ.CLI.Core.Helpers, as: Helpers - alias RabbitMQ.CLI.Core.Parser, as: Parser - - alias RabbitMQ.CLI.Core.CommandModules, as: CommandModules # Enable unit tests for private functions @compile if Mix.env == :test, do: :export_all diff --git a/deps/rabbitmq_cli/test/close_all_connections_command_test.exs b/deps/rabbitmq_cli/test/close_all_connections_command_test.exs index 215d08ad86..81fe6b3d4f 100644 --- a/deps/rabbitmq_cli/test/close_all_connections_command_test.exs +++ b/deps/rabbitmq_cli/test/close_all_connections_command_test.exs @@ -18,7 +18,7 @@ defmodule CloseAllConnectionsCommandTest do use ExUnit.Case, async: false import TestHelper - alias RabbitMQ.CLI.Ctl.RpcStream, as: RpcStream + alias RabbitMQ.CLI.Ctl.RpcStream @helpers RabbitMQ.CLI.Core.Helpers diff --git a/deps/rabbitmq_cli/test/close_connection_command_test.exs b/deps/rabbitmq_cli/test/close_connection_command_test.exs index 218bb36ef4..d04f0ebc76 100644 --- a/deps/rabbitmq_cli/test/close_connection_command_test.exs +++ b/deps/rabbitmq_cli/test/close_connection_command_test.exs @@ -18,7 +18,7 @@ defmodule CloseConnectionCommandTest do use ExUnit.Case, async: false import TestHelper - alias RabbitMQ.CLI.Ctl.RpcStream, as: RpcStream + alias RabbitMQ.CLI.Ctl.RpcStream @helpers RabbitMQ.CLI.Core.Helpers diff --git a/deps/rabbitmq_cli/test/distribution_test.exs b/deps/rabbitmq_cli/test/distribution_test.exs index 6829450178..d9edaabb4e 100644 --- a/deps/rabbitmq_cli/test/distribution_test.exs +++ b/deps/rabbitmq_cli/test/distribution_test.exs @@ -13,7 +13,7 @@ ## The Initial Developer of the Original Code is GoPivotal, Inc. ## Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. -alias RabbitMQ.CLI.Core.Distribution, as: Distribution +alias RabbitMQ.CLI.Core.Distribution defmodule DistributionTest do use ExUnit.Case, async: false diff --git a/deps/rabbitmq_cli/test/help_command_test.exs b/deps/rabbitmq_cli/test/help_command_test.exs index c0ac75c157..81243d45ba 100644 --- a/deps/rabbitmq_cli/test/help_command_test.exs +++ b/deps/rabbitmq_cli/test/help_command_test.exs @@ -18,8 +18,7 @@ defmodule HelpCommandTest do use ExUnit.Case, async: false import TestHelper - alias RabbitMQ.CLI.Core.CommandModules, as: CommandModules - alias RabbitMQ.CLI.Core.ExitCodes, as: ExitCodes + alias RabbitMQ.CLI.Core.{CommandModules, ExitCodes} @command RabbitMQ.CLI.Ctl.Commands.HelpCommand diff --git a/deps/rabbitmq_cli/test/rpc_stream_test.exs b/deps/rabbitmq_cli/test/rpc_stream_test.exs index 44e0c0386c..5d9a1b90b8 100644 --- a/deps/rabbitmq_cli/test/rpc_stream_test.exs +++ b/deps/rabbitmq_cli/test/rpc_stream_test.exs @@ -2,7 +2,7 @@ defmodule RpcStreamTest do use ExUnit.Case, async: false require RabbitMQ.CLI.Ctl.RpcStream - alias RabbitMQ.CLI.Ctl.RpcStream, as: RpcStream + alias RabbitMQ.CLI.Ctl.RpcStream setup_all do RabbitMQ.CLI.Core.Distribution.start() diff --git a/deps/rabbitmq_cli/test/set_vm_memory_high_watermark_command_test.exs b/deps/rabbitmq_cli/test/set_vm_memory_high_watermark_command_test.exs index caa702f679..5129724890 100644 --- a/deps/rabbitmq_cli/test/set_vm_memory_high_watermark_command_test.exs +++ b/deps/rabbitmq_cli/test/set_vm_memory_high_watermark_command_test.exs @@ -17,7 +17,7 @@ defmodule SetVmMemoryHighWatermarkCommandTest do use ExUnit.Case, async: false import TestHelper - alias RabbitMQ.CLI.Core.Helpers, as: Helpers + alias RabbitMQ.CLI.Core.Helpers @command RabbitMQ.CLI.Ctl.Commands.SetVmMemoryHighWatermarkCommand diff --git a/deps/rabbitmq_cli/test/test_helper.exs b/deps/rabbitmq_cli/test/test_helper.exs index e2a3bc57ae..a5712baffa 100644 --- a/deps/rabbitmq_cli/test/test_helper.exs +++ b/deps/rabbitmq_cli/test/test_helper.exs @@ -19,9 +19,7 @@ ExUnit.start() defmodule TestHelper do import ExUnit.Assertions alias RabbitMQ.CLI.Plugins.Helpers, as: PluginHelpers - alias RabbitMQ.CLI.Core.Config, as: Config - alias RabbitMQ.CLI.Core.CommandModules, as: CommandModules - alias RabbitMQ.CLI.Core.Helpers, as: Helpers + alias RabbitMQ.CLI.Core.{CommandModules, Config, Helpers} def get_rabbit_hostname() do RabbitMQ.CLI.Core.Helpers.get_rabbit_hostname() |