Merge pull request #3103 from rabbitmq/jsx-3.1-backport

Backport #3102 (bump JSX to 3.1)

Author: michaelklishin

deps/rabbitmq_aws/src/rabbitmq_aws_json.erl

@@ -15,16 +15,8 @@
 decode(Value) when is_list(Value) ->
   decode(list_to_binary(Value));
 decode(Value) when is_binary(Value) ->
-  % We set an empty list of options because we don't want the default
-  % options set in rabbit_json:cecode/1. And we can't override
-  % 'return_maps' with '{return_maps, false}' because of a bug in jsx's
-  % options handler.
-  % See https://github.com/talentdeficit/jsx/pull/115
-  Decoded0 = rabbit_json:decode(Value, []),
-  Decoded = if
-    is_map(Decoded0)  -> maps:to_list(Decoded0);
-    is_list(Decoded0) -> Decoded0
-  end,
+  Decoded0 = rabbit_json:decode(Value, [{return_maps, false}]),
+  Decoded  = rabbit_data_coercion:to_proplist(Decoded0),
   convert_binary_values(Decoded, []).
 
 

deps/rabbitmq_federation_management/test/federation_mgmt_SUITE.erl

@@ -244,7 +244,8 @@ assert_code(CodeExp, CodeAct, Type, Path, Body) ->
     end.
 
 decode(?OK, _Headers,  ResBody) ->
-    cleanup(rabbit_json:decode(rabbit_data_coercion:to_binary(ResBody)));
+    JSON = rabbit_data_coercion:to_binary(ResBody),
+    cleanup(rabbit_json:decode(JSON));
 decode(_,    Headers, _ResBody) -> Headers.
 
 cleanup(L) when is_list(L) ->

deps/rabbitmq_management/test/rabbit_mgmt_http_SUITE.erl

@@ -18,7 +18,7 @@
                                 assert_keys/2, assert_no_keys/2,
                                 http_get/2, http_get/3, http_get/5,
                                 http_get_no_auth/3,
-                                http_get_no_map/2,
+                                http_get_as_proplist/2,
                                 http_put/4, http_put/6,
                                 http_post/4, http_post/6,
                                 http_upload_raw/8,
@@ -1089,12 +1089,12 @@ queues_well_formed_json_test(Config) ->
     http_put(Config, "/queues/%2F/foo", Good, {group, '2xx'}),
     http_put(Config, "/queues/%2F/baz", Good, {group, '2xx'}),
 
-    Queues = http_get_no_map(Config, "/queues/%2F"),
+    Queues = http_get_as_proplist(Config, "/queues/%2F"),
     %% Ensure keys are unique
     [begin
-     Sorted = lists:sort(Q),
-     Sorted = lists:usort(Q)
-     end || Q <- Queues],
+         Q = rabbit_data_coercion:to_proplist(Q0),
+         ?assertEqual(lists:sort(Q), lists:usort(Q))
+     end || Q0 <- Queues],
 
     http_delete(Config, "/queues/%2F/foo", {group, '2xx'}),
     http_delete(Config, "/queues/%2F/baz", {group, '2xx'}),

deps/rabbitmq_management/test/rabbit_mgmt_only_http_SUITE.erl

@@ -17,7 +17,7 @@
 -import(rabbit_mgmt_test_util, [assert_list/2, assert_item/2, test_item/2,
                                 assert_keys/2, assert_no_keys/2,
                                 http_get/2, http_get/3, http_get/5,
-                                http_get_no_map/2,
+                                http_get_as_proplist/2,
                                 http_put/4, http_put/6,
                                 http_post/4, http_post/6,
                                 http_upload_raw/8,
@@ -609,7 +609,7 @@ queues_well_formed_json_test(Config) ->
     http_put(Config, "/queues/%2F/foo", Good, {group, '2xx'}),
     http_put(Config, "/queues/%2F/baz", Good, {group, '2xx'}),
 
-    Queues = http_get_no_map(Config, "/queues/%2F"),
+    Queues = http_get_as_proplist(Config, "/queues/%2F"),
     %% Ensure keys are unique
     [begin
      Sorted = lists:sort(Q),

deps/rabbitmq_management/test/rabbit_mgmt_rabbitmqadmin_SUITE.erl

@@ -108,6 +108,7 @@ host(Config) ->
     {ok, _} = run(Config, ["show", "overview"]),
     {ok, _} = run(Config, ["--host", "localhost", "show", "overview"]),
     {error, _, _} = run(Config, ["--host", "some-host-that-does-not-exist",
+                                 "--request-timeout", "5",
                                  "show", "overview"]).
 
 base_uri(Config) ->
@@ -116,6 +117,7 @@ base_uri(Config) ->
     {ok, _} = run(Config, ["--base-uri", "http://localhost",  "--vhost", "/", "list", "exchanges"]),
     {ok, _} = run(Config, ["--base-uri", "http://localhost/", "--vhost", "/", "list", "exchanges"]),
     {error, _, _} = run(Config, ["--base-uri", "https://some-host-that-does-not-exist:15672/",
+                                 "--request-timeout", "5",
                                  "list", "exchanges"]),
     {error, _, _} = run(Config, ["--base-uri", "http://localhost:15672/", "--vhost", "some-vhost-that-does-not-exist",
                                  "list", "exchanges"]).

rabbitmq-components.mk

@@ -110,7 +110,7 @@ dep_toke                              = git_rmq           toke $(current_rmq_ref
 dep_accept = hex 0.3.5
 dep_cowboy = hex 2.8.0
 dep_cowlib = hex 2.9.1
-dep_jsx = hex 2.11.0
+dep_jsx = hex 3.1.0
 dep_lager = hex 3.9.2
 dep_looking_glass = git https://github.com/rabbitmq/looking_glass master
 dep_prometheus = hex 4.6.0