Convert gen_server2 to gen_server

Author: ansd

deps/rabbitmq_amqp1_0/src/rabbit_amqp1_0_session.erl

@@ -7,8 +7,7 @@
 
 -module(rabbit_amqp1_0_session).
 
-%%TODO change to gen_server
--behaviour(gen_server2).
+-behaviour(gen_server).
 
 -include_lib("amqp_client/include/amqp_client.hrl").
 -include("rabbit_amqp1_0.hrl").
@@ -117,14 +116,14 @@
                }).
 
 start_link(Args) ->
-    gen_server2:start_link(?MODULE, Args, []).
+    gen_server:start_link(?MODULE, Args, []).
 
 get_info(Pid) ->
-    gen_server2:call(Pid, info, ?CALL_TIMEOUT).
+    gen_server:call(Pid, info, ?CALL_TIMEOUT).
 
 process_frame(Pid, Frame) ->
     credit_flow:send(Pid),
-    gen_server2:cast(Pid, {frame, Frame, self()}).
+    gen_server:cast(Pid, {frame, Frame, self()}).
 
 init({Channel, ReaderPid, WriterPid, User, Vhost, FrameMax}) ->
     process_flag(trap_exit, true),
@@ -367,12 +366,8 @@ handle_control(#'v1_0.attach'{role = ?RECV_ROLE,
                      _ -> ?DEFAULT_SEND_SETTLED
                  end,
     DOSym = amqp10_framing:symbol_for(DefaultOutcome),
-    case ensure_source(Source,
-                       #outgoing_link{delivery_count = ?INIT_TXFR_COUNT,
-                                      send_settled = SndSettled,
-                                      default_outcome = DOSym},
-                       Vhost) of
-        {ok, OutgoingLink = #outgoing_link{queue = QNameBin}} ->
+    case ensure_source(Source, Vhost) of
+        {ok, QNameBin} ->
             CTag = handle_to_ctag(Handle),
             Args = source_filters_to_consumer_args(Source) ++
             [{<<"x-credit">>, table, [{<<"credit">>, long, 0},
@@ -408,7 +403,11 @@ handle_control(#'v1_0.attach'{role = ?RECV_ROLE,
                                                     source = Source#'v1_0.source'{default_outcome = DefaultOutcome,
                                                                                   outcomes = Outcomes},
                                                     role = ?SEND_ROLE},
-                                   {ok, [AttachReply], OutgoingLink, State1};
+                                   OutLink = #outgoing_link{delivery_count = ?INIT_TXFR_COUNT,
+                                                            queue = QNameBin,
+                                                            send_settled = SndSettled,
+                                                            default_outcome = DOSym},
+                                   {ok, [AttachReply], OutLink, State1};
                                {error, Reason} ->
                                    protocol_error(
                                      ?V_1_0_AMQP_ERROR_INTERNAL_ERROR,
@@ -1250,10 +1249,10 @@ outgoing_link_flow(#outgoing_link{delivery_count = DeliveryCountSnd,
 default(undefined, Default) -> Default;
 default(Thing,    _Default) -> Thing.
 
-ensure_source(#'v1_0.source'{dynamic = true}, _Link, _Vhost) ->
+ensure_source(#'v1_0.source'{dynamic = true}, _Vhost) ->
     protocol_error(?V_1_0_AMQP_ERROR_NOT_IMPLEMENTED, "Dynamic sources not supported", []);
 ensure_source(#'v1_0.source'{address = Address,
-                             durable = Durable}, Link, Vhost) ->
+                             durable = Durable}, Vhost) ->
     case Address of
         {utf8, SourceAddr} ->
             case rabbit_routing_util:parse_endpoint(SourceAddr, false) of
@@ -1264,7 +1263,7 @@ ensure_source(#'v1_0.source'{address = Address,
                     case rabbit_routing_util:parse_routing(Src) of
                         {"", QNameList} ->
                             true = string:equal(QNameList, QNameBin),
-                            {ok, Link#outgoing_link{queue = QNameBin}};
+                            {ok, QNameBin};
                         {XNameList, RoutingKeyList} ->
                             RoutingKey = list_to_binary(RoutingKeyList),
                             XNameBin = list_to_binary(XNameList),
@@ -1276,7 +1275,7 @@ ensure_source(#'v1_0.source'{address = Address,
                             %% TODO authorisation checks
                             case rabbit_binding:add(Binding, <<"todo">>) of
                                 ok ->
-                                    {ok, Link#outgoing_link{queue = QNameBin}};
+                                    {ok, QNameBin};
                                 {error, _} = Err ->
                                     Err
                             end