Implement QA feedback. Mainly renaming.

deps/rabbitmq_management/src/rabbit_mgmt_wm_all_configuration.erl

@@ -46,19 +46,19 @@ create_path(ReqData, Context) ->
     {"dummy", ReqData, Context}.
 
 to_json(ReqData, Context) ->
-    Xs = [X || X <- rabbit_mgmt_wm_exchanges:exchanges(ReqData),
+    Xs = [X || X <- rabbit_mgmt_wm_exchanges:basic(ReqData),
                export_exchange(X)],
-    Qs = [Q || Q <- rabbit_mgmt_wm_queues:queues(ReqData),
+    Qs = [Q || Q <- rabbit_mgmt_wm_queues:basic(ReqData),
                export_queue(Q)],
     QNames = [{pget(name, Q), pget(vhost, Q)} || Q <- Qs],
-    Bs = [B || B <- rabbit_mgmt_wm_bindings:bindings(ReqData),
+    Bs = [B || B <- rabbit_mgmt_wm_bindings:basic(ReqData),
                export_binding(B, QNames)],
     {ok, Vsn} = application:get_key(rabbit, vsn),
     rabbit_mgmt_util:reply(
       [{rabbit_version, list_to_binary(Vsn)}] ++
       filter(
         [{users,       rabbit_mgmt_wm_users:users()},
-         {vhosts,      rabbit_mgmt_wm_vhosts:vhosts()},
+         {vhosts,      rabbit_mgmt_wm_vhosts:basic()},
          {permissions, rabbit_mgmt_wm_permissions:permissions()},
          {queues,      Qs},
          {exchanges,   Xs},

deps/rabbitmq_management/src/rabbit_mgmt_wm_bindings.erl

@@ -19,7 +19,7 @@
 -export([init/1, to_json/2, content_types_provided/2, is_authorized/2]).
 -export([allowed_methods/2, post_is_create/2, create_path/2]).
 -export([content_types_accepted/2, accept_content/2, resource_exists/2]).
--export([bindings/1, annotated/2]).
+-export([basic/1, augmented/2]).
 
 -include("rabbit_mgmt.hrl").
 -include_lib("webmachine/include/webmachine.hrl").
@@ -90,12 +90,12 @@ is_authorized(ReqData, {Mode, Context}) ->
 
 %%--------------------------------------------------------------------
 
-bindings(ReqData) ->
+basic(ReqData) ->
     [rabbit_mgmt_format:binding(B) ||
         B <- list_bindings(all, ReqData)].
 
-annotated(ReqData, Context) ->
-    rabbit_mgmt_util:filter_vhost(bindings(ReqData), ReqData, Context).
+augmented(ReqData, Context) ->
+    rabbit_mgmt_util:filter_vhost(basic(ReqData), ReqData, Context).
 
 method_key_args(<<"q">>, Source, Dest, Props) ->
     M = #'queue.bind'{routing_key = K, arguments = A} =

deps/rabbitmq_management/src/rabbit_mgmt_wm_channels.erl

@@ -17,7 +17,7 @@
 -module(rabbit_mgmt_wm_channels).
 
 -export([init/1, to_json/2, content_types_provided/2, is_authorized/2,
-         annotated/2]).
+         augmented/2]).
 
 -import(rabbit_misc, [pget/2]).
 
@@ -33,17 +33,17 @@ content_types_provided(ReqData, Context) ->
    {[{"application/json", to_json}], ReqData, Context}.
 
 to_json(ReqData, Context) ->
-    rabbit_mgmt_util:reply_list(annotated(ReqData, Context), ReqData, Context).
+    rabbit_mgmt_util:reply_list(augmented(ReqData, Context), ReqData, Context).
 
 is_authorized(ReqData, Context) ->
     rabbit_mgmt_util:is_authorized(ReqData, Context).
 
-annotated(ReqData, Context) ->
+augmented(ReqData, Context) ->
     rabbit_mgmt_format:strip_pids(
       rabbit_mgmt_util:filter_user(
         case rabbit_mgmt_util:vhost(ReqData) of
             none      -> rabbit_mgmt_db:get_all_channels(basic);
             not_found -> vhost_not_found;
-            VHost      -> [I || I <- rabbit_mgmt_db:get_all_channels(basic),
-                                pget(vhost, I) =:= VHost]
+            VHost     -> [I || I <- rabbit_mgmt_db:get_all_channels(basic),
+                               pget(vhost, I) =:= VHost]
         end, ReqData, Context)).

deps/rabbitmq_management/src/rabbit_mgmt_wm_connections.erl

@@ -17,7 +17,7 @@
 -module(rabbit_mgmt_wm_connections).
 
 -export([init/1, to_json/2, content_types_provided/2, is_authorized/2,
-         annotated/2]).
+         augmented/2]).
 
 -import(rabbit_misc, [pget/2]).
 
@@ -33,17 +33,17 @@ content_types_provided(ReqData, Context) ->
    {[{"application/json", to_json}], ReqData, Context}.
 
 to_json(ReqData, Context) ->
-    rabbit_mgmt_util:reply_list(annotated(ReqData, Context), ReqData, Context).
+    rabbit_mgmt_util:reply_list(augmented(ReqData, Context), ReqData, Context).
 
 is_authorized(ReqData, Context) ->
     rabbit_mgmt_util:is_authorized(ReqData, Context).
 
-annotated(ReqData, Context) ->
+augmented(ReqData, Context) ->
     rabbit_mgmt_format:strip_pids(
       rabbit_mgmt_util:filter_user(
         case rabbit_mgmt_util:vhost(ReqData) of
             none      -> rabbit_mgmt_db:get_all_connections();
             not_found -> vhost_not_found;
-            VHost      -> [I || I <- rabbit_mgmt_db:get_all_connections(),
-                                pget(vhost, I) =:= VHost]
+            VHost     -> [I || I <- rabbit_mgmt_db:get_all_connections(),
+                               pget(vhost, I) =:= VHost]
         end, ReqData, Context)).

deps/rabbitmq_management/src/rabbit_mgmt_wm_exchanges.erl

@@ -17,7 +17,7 @@
 -module(rabbit_mgmt_wm_exchanges).
 
 -export([init/1, to_json/2, content_types_provided/2, is_authorized/2,
-         resource_exists/2, exchanges/1, annotated/2]).
+         resource_exists/2, basic/1, augmented/2]).
 
 -include("rabbit_mgmt.hrl").
 -include_lib("webmachine/include/webmachine.hrl").
@@ -37,19 +37,19 @@ resource_exists(ReqData, Context) ->
      end, ReqData, Context}.
 
 to_json(ReqData, Context) ->
-    rabbit_mgmt_util:reply_list(annotated(ReqData, Context), ReqData, Context).
+    rabbit_mgmt_util:reply_list(augmented(ReqData, Context), ReqData, Context).
 
 is_authorized(ReqData, Context) ->
     rabbit_mgmt_util:is_authorized_vhost(ReqData, Context).
 
 %%--------------------------------------------------------------------
 
-annotated(ReqData, Context) ->
+augmented(ReqData, Context) ->
     rabbit_mgmt_db:augment_exchanges(
-      rabbit_mgmt_util:filter_vhost(exchanges(ReqData), ReqData, Context),
+      rabbit_mgmt_util:filter_vhost(basic(ReqData), ReqData, Context),
       basic).
 
-exchanges(ReqData) ->
+basic(ReqData) ->
     [rabbit_mgmt_format:exchange(X) || X <- exchanges0(ReqData)].
 
 exchanges0(ReqData) ->

deps/rabbitmq_management/src/rabbit_mgmt_wm_queues.erl

@@ -17,7 +17,7 @@
 -module(rabbit_mgmt_wm_queues).
 
 -export([init/1, to_json/2, content_types_provided/2, is_authorized/2,
-         resource_exists/2, queues/1, annotated/2]).
+         resource_exists/2, basic/1, augmented/2]).
 
 -include("rabbit_mgmt.hrl").
 -include_lib("webmachine/include/webmachine.hrl").
@@ -37,20 +37,20 @@ resource_exists(ReqData, Context) ->
      end, ReqData, Context}.
 
 to_json(ReqData, Context) ->
-    rabbit_mgmt_util:reply_list(annotated(ReqData, Context), ReqData, Context).
+    rabbit_mgmt_util:reply_list(augmented(ReqData, Context), ReqData, Context).
 
 is_authorized(ReqData, Context) ->
     rabbit_mgmt_util:is_authorized_vhost(ReqData, Context).
 
 %%--------------------------------------------------------------------
 
-annotated(ReqData, Context) ->
+augmented(ReqData, Context) ->
     rabbit_mgmt_format:strip_pids(
       rabbit_mgmt_db:augment_queues(
-        rabbit_mgmt_util:filter_vhost(queues(ReqData), ReqData, Context),
+        rabbit_mgmt_util:filter_vhost(basic(ReqData), ReqData, Context),
         basic)).
 
-queues(ReqData) ->
+basic(ReqData) ->
     [rabbit_mgmt_format:queue(Q) || Q <- queues0(ReqData)].
 
 queues0(ReqData) ->

deps/rabbitmq_management/src/rabbit_mgmt_wm_vhosts.erl

@@ -17,7 +17,7 @@
 -module(rabbit_mgmt_wm_vhosts).
 
 -export([init/1, to_json/2, content_types_provided/2, is_authorized/2]).
--export([vhosts/0, annotated/2]).
+-export([basic/0, augmented/2]).
 
 -include("rabbit_mgmt.hrl").
 -include_lib("webmachine/include/webmachine.hrl").
@@ -31,15 +31,15 @@ content_types_provided(ReqData, Context) ->
    {[{"application/json", to_json}], ReqData, Context}.
 
 to_json(ReqData, Context) ->
-    rabbit_mgmt_util:reply_list(annotated(ReqData, Context), ReqData, Context).
+    rabbit_mgmt_util:reply_list(augmented(ReqData, Context), ReqData, Context).
 
 is_authorized(ReqData, Context) ->
     rabbit_mgmt_util:is_authorized(ReqData, Context).
 
 %%--------------------------------------------------------------------
 
-annotated(_ReqData, #context{user = User}) ->
+augmented(_ReqData, #context{user = User}) ->
     [rabbit_vhost:info(V) || V <- rabbit_mgmt_util:list_visible_vhosts(User)].
 
-vhosts() ->
+basic() ->
     rabbit_vhost:info_all([name]).