Fix specs

Author: ansd

deps/rabbit/src/rabbit_amqqueue.erl

@@ -2043,8 +2043,7 @@ get_quorum_nodes(Q) ->
     end.
 
 -spec prepend_extra_bcc(Qs) ->
-    Qs when Qs :: [amqqueue:amqqueue() | amqqueue:target() |
-                   {amqqueue:amqqueue() | amqqueue:target(), route_infos()}].
+    Qs when Qs :: [amqqueue:target() | {amqqueue:target(), route_infos()}].
 prepend_extra_bcc([]) ->
     [];
 prepend_extra_bcc([Q0] = Qs) ->
@@ -2053,12 +2052,7 @@ prepend_extra_bcc([Q0] = Qs) ->
         none ->
             Qs;
         Name ->
-            case lookup_extra_bcc(Q, Name) of
-                {ok, BCCQueue} ->
-                    [BCCQueue | Qs];
-                {error, not_found} ->
-                    Qs
-            end
+            lookup_extra_bcc(Q, Name) ++ Qs
     end;
 prepend_extra_bcc(Qs) ->
     ExtraQs = lists:filtermap(
@@ -2069,37 +2063,37 @@ prepend_extra_bcc(Qs) ->
                                 false;
                             Name ->
                                 case lookup_extra_bcc(Q, Name) of
-                                    {ok, BCCQ} ->
-                                        {true, BCCQ};
-                                    {error, not_found} ->
+                                    [ExtraQ] ->
+                                        {true, ExtraQ};
+                                    [] ->
                                         false
                                 end
                         end
                 end, Qs),
     lists:usort(ExtraQs) ++ Qs.
 
 -spec queue(Q | {Q, route_infos()}) ->
-    Q when Q :: amqqueue:amqqueue() | amqqueue:target().
+    Q when Q :: amqqueue:target().
 queue({Q, RouteInfos}) when is_map(RouteInfos) ->
     Q;
 queue(Q) ->
     Q.
 
 -spec queue_names([Q | {Q, route_infos()}]) ->
-    [name()] when Q :: amqqueue:amqqueue() | amqqueue:target().
+    [name()] when Q :: amqqueue:target().
 queue_names(Queues) ->
     lists:map(fun({Q, RouteInfos}) when is_map(RouteInfos) ->
                       amqqueue:get_name(Q);
                  (Q) ->
                       amqqueue:get_name(Q)
               end, Queues).
 
--spec lookup_extra_bcc(amqqueue:amqqueue() | amqqueue:target(), binary()) ->
-    {ok, amqqueue:amqqueue()} | {error, not_found}.
+-spec lookup_extra_bcc(amqqueue:target(), binary()) ->
+    [amqqueue:target()].
 lookup_extra_bcc(Q, BCCName) ->
     #resource{virtual_host = VHost} = amqqueue:get_name(Q),
     BCCQueueName = rabbit_misc:r(VHost, queue, BCCName),
-    lookup(BCCQueueName).
+    rabbit_db_queue:get_targets([BCCQueueName]).
 
 is_queue_args_combination_permitted(Q) ->
     Durable = amqqueue:is_durable(Q),

deps/rabbit/src/rabbit_classic_queue.erl

@@ -287,9 +287,8 @@ format(Q, _Ctx) when ?is_amqqueue(Q) ->
      {state, State},
      {node, node(amqqueue:get_pid(Q))}].
 
--spec init(amqqueue:amqqueue()) ->
-    {ok, state()}.
-init(Q) ->
+-spec init(amqqueue:amqqueue()) -> {ok, state()}.
+init(Q) when ?amqqueue_is_classic(Q) ->
     {ok, #?STATE{pid = amqqueue:get_pid(Q)}}.
 
 -spec close(state()) -> ok.

deps/rabbit/src/rabbit_quorum_queue.erl

@@ -212,8 +212,7 @@ is_compatible(_Durable = true,
 is_compatible(_, _, _) ->
     false.
 
--spec init(amqqueue:amqqueue()) ->
-    {ok, rabbit_fifo_client:state()} | {error, not_found}.
+-spec init(amqqueue:amqqueue()) -> {ok, rabbit_fifo_client:state()}.
 init(Q) when ?is_amqqueue(Q) ->
     {ok, SoftLimit} = application:get_env(rabbit, quorum_commands_soft_limit),
     {Name, _} = MaybeLeader = amqqueue:get_pid(Q),