Merge pull request #7008 from rabbitmq/mergify/bp/v3.11.x/pr-7002

Author: michaelklishin

deps/rabbitmq_jms_topic_exchange/BUILD.bazel

@@ -24,25 +24,31 @@ RUNTIME_DEPS = [
     "//deps/rabbit:erlang_app",
 ]
 
+EXTRA_APPS = [
+    "mnesia",
+]
+
 rabbitmq_app(
     app_description = APP_DESCRIPTION,
     app_module = APP_MODULE,
     app_name = APP_NAME,
     runtime_deps = RUNTIME_DEPS,
     deps = DEPS,
+    extra_apps = EXTRA_APPS,
 )
 
 xref()
 
 plt(
     name = "base_plt",
-    deps = DEPS,
+    plt = "//:base_plt",
+    apps = EXTRA_APPS,
+    deps = DEPS + RUNTIME_DEPS,
 )
 
 dialyze(
     dialyzer_opts = RABBITMQ_DIALYZER_OPTS,
     plt = ":base_plt",
-    warnings_as_errors = False,
 )
 
 broker_for_integration_suites()

deps/rabbitmq_jms_topic_exchange/src/rabbit_jms_topic_exchange.erl

@@ -136,7 +136,7 @@ add_binding( Tx
   case {Tx, BindGen} of
     {transaction, {ok, BindFun}} ->
       add_binding_fun(XName, {{BindingKey, Dest}, BindFun});
-    {none, {error, _}} ->
+    {none, error} ->
       parsing_error(XName, Selector, Dest);
     _ ->
       ok
@@ -299,12 +299,14 @@ write_state_fun(XName, BFuns) ->
 %% E R R O R S
 
 % state error
+-spec exchange_state_corrupt_error(#resource{}) -> no_return().
 exchange_state_corrupt_error(#resource{name = XName}) ->
   rabbit_misc:protocol_error( internal_error
                             , "exchange named '~s' has no saved state or incorrect saved state"
                             , [XName] ).
 
 % parsing error
+-spec parsing_error(#resource{}, term(), #resource{}) -> no_return().
 parsing_error(#resource{name = XName}, S, #resource{name = DestName}) ->
   rabbit_misc:protocol_error( precondition_failed
                             , "cannot parse selector '~p' binding destination '~s' to exchange '~s'"

deps/rabbitmq_jms_topic_exchange/src/sjx_evaluator.erl

@@ -34,8 +34,9 @@
 
 -type expression() :: any().
 
--spec evaluate(expression(), table()) -> true | false | error.
-
+-spec evaluate(expression(), table()) ->
+          'true' | 'false' | 'error' | 'undefined' | number() |
+          [ 'true' | 'false' | 'error' | 'undefined' | number() ].
 
 evaluate( true,                           _Headers ) -> true;
 evaluate( false,                          _Headers ) -> false;