Adapt plugins to new exchange and exchange decorator API

Author: dcorbacho

deps/rabbit/src/rabbit_exchange_decorator.erl

@@ -109,5 +109,5 @@ maybe_recover(X = #exchange{name       = Name,
         Old -> ok;
         _   -> %% TODO create a tx here for non-federation decorators
                _ = [M:create(none, X) || M <- New -- Old],
-               rabbit_exchange:update_decorators(Name)
+               rabbit_exchange:update_decorators(Name, Decs1)
     end.

deps/rabbitmq_event_exchange/src/rabbit_event_exchange_decorator.erl

@@ -21,7 +21,7 @@
 -behaviour(rabbit_exchange_decorator).
 
 -export([description/0, serialise_events/1]).
--export([create/2, delete/3, policy_changed/2,
+-export([create/2, delete/2, policy_changed/2,
          add_binding/3, remove_bindings/3, route/2, active_for/1]).
 
 description() ->
@@ -32,13 +32,13 @@ serialise_events(_) -> false.
 create(_, _) ->
     ok.
 
-delete(_, _, _) ->
+delete(_, _) ->
     ok.
 
 policy_changed(_, _) ->
     ok.
 
-add_binding(transaction, #exchange{name = #resource{name = ?EXCH_NAME} = Name},
+add_binding(none, #exchange{name = #resource{name = ?EXCH_NAME} = Name},
             _Bs) ->
     case rabbit_binding:list_for_source(Name) of
         [_] ->
@@ -47,10 +47,10 @@ add_binding(transaction, #exchange{name = #resource{name = ?EXCH_NAME} = Name},
         _ ->
             ok
     end;
-add_binding(_, _X, _Bs) ->
+add_binding(_, _, _) ->
     ok.
 
-remove_bindings(transaction, #exchange{name = #resource{name = ?EXCH_NAME} = Name},
+remove_bindings(none, #exchange{name = #resource{name = ?EXCH_NAME} = Name},
                 _Bs) ->
     case rabbit_binding:list_for_source(Name) of
         [] ->
@@ -59,7 +59,7 @@ remove_bindings(transaction, #exchange{name = #resource{name = ?EXCH_NAME} = Nam
         _ ->
             ok
     end;
-remove_bindings(_, _X, _Bs) ->
+remove_bindings(_, _, _) ->
     ok.
 
 route(_, _) -> [].

deps/rabbitmq_random_exchange/src/rabbit_exchange_type_random.erl

@@ -20,7 +20,7 @@
   add_binding/3, 
   assert_args_equivalence/2,
   create/2, 
-  delete/3, 
+  delete/2, 
   policy_changed/2,
   description/0, 
   recover/2, 
@@ -49,12 +49,12 @@ info(_X) -> [].
 info(_X, _) -> [].
 serialise_events() -> false.
 validate(_X) -> ok.
-create(_Tx, _X) -> ok.
+create(_Serial, _X) -> ok.
 recover(_X, _Bs) -> ok.
-delete(_Tx, _X, _Bs) -> ok.
+delete(_Serial, _X) -> ok.
 policy_changed(_X1, _X2) -> ok.
-add_binding(_Tx, _X, _B) -> ok.
-remove_bindings(_Tx, _X, _Bs) -> ok.
+add_binding(_Serial, _X, _B) -> ok.
+remove_bindings(_Serial, _X, _Bs) -> ok.
 validate_binding(_X, _B) -> ok.
 assert_args_equivalence(X, Args) ->
     rabbit_exchange:assert_args_equivalence(X, Args).

deps/rabbitmq_sharding/src/rabbit_sharding_exchange_decorator.erl

@@ -20,7 +20,7 @@
 -behaviour(rabbit_exchange_decorator).
 
 -export([description/0, serialise_events/1]).
--export([create/2, delete/3, policy_changed/2,
+-export([create/2, delete/2, policy_changed/2,
          add_binding/3, remove_bindings/3, route/2, active_for/1]).
 
 -import(rabbit_sharding_util, [shard/1]).
@@ -32,14 +32,12 @@ description() ->
 
 serialise_events(_X) -> false.
 
-create(transaction, _X) ->
-    ok;
 create(none, X) ->
     _ = maybe_start_sharding(X),
     ok.
 
-add_binding(_Tx, _X, _B) -> ok.
-remove_bindings(_Tx, _X, _Bs) -> ok.
+add_binding(_Serial, _X, _B) -> ok.
+remove_bindings(_Serial, _X, _Bs) -> ok.
 
 route(_, _) -> [].
 
@@ -50,8 +48,7 @@ active_for(X) ->
     end.
 
 %% we have to remove the policy from ?SHARDING_TABLE
-delete(transaction, _X, _Bs) -> ok;
-delete(none, X, _Bs) ->
+delete(none, X) ->
     _ = maybe_stop_sharding(X),
     ok.
 

deps/rabbitmq_sharding/src/rabbit_sharding_exchange_type_modulus_hash.erl

@@ -13,7 +13,7 @@
 
 -export([description/0, serialise_events/0, route/2, info/1, info/2]).
 -export([validate/1, validate_binding/2,
-         create/2, delete/3, policy_changed/2,
+         create/2, delete/2, policy_changed/2,
          add_binding/3, remove_bindings/3, assert_args_equivalence/2]).
 
 -rabbit_boot_step(
@@ -47,11 +47,11 @@ info(_, _) -> [].
 
 validate(_X) -> ok.
 validate_binding(_X, _B) -> ok.
-create(_Tx, _X) -> ok.
-delete(_Tx, _X, _Bs) -> ok.
+create(_Serial, _X) -> ok.
+delete(_Serial, _X) -> ok.
 policy_changed(_X1, _X2) -> ok.
-add_binding(_Tx, _X, _B) -> ok.
-remove_bindings(_Tx, _X, _Bs) -> ok.
+add_binding(_Serial, _X, _B) -> ok.
+remove_bindings(_Serial, _X, _Bs) -> ok.
 assert_args_equivalence(X, Args) ->
     rabbit_exchange:assert_args_equivalence(X, Args).