Skip to content

Commit

Permalink
Deprecate all usage of jsx module (#81)
Browse files Browse the repository at this point in the history
  • Loading branch information
sashaafm authored Feb 19, 2020
1 parent 2f04223 commit 2c76e69
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/erlastic_search.erl
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ search(Params, Index, Type, Query, Opts) ->
-spec multi_search(#erls_params{}, list({HeaderInformation :: headers(), SearchRequest :: erlastic_json() | binary()})) -> {ok, ResultJson :: erlastic_success_result()} | {error, Reason :: any()}.
multi_search(Params, HeaderJsonTuples) ->
Body = lists:map(fun({HeaderInformation, SearchRequest}) ->
[ jsx:encode(HeaderInformation), <<"\n">>, maybe_encode_doc(SearchRequest), <<"\n">> ]
[ erls_json:encode(HeaderInformation), <<"\n">>, maybe_encode_doc(SearchRequest), <<"\n">> ]
end, HeaderJsonTuples),
erls_resource:get(Params, <<"/_msearch">>, [], [], iolist_to_binary(Body), Params#erls_params.http_client_options).

Expand Down Expand Up @@ -740,7 +740,7 @@ build_header(Operation, Index, Type, Id, HeaderInformation) ->
false -> [{<<"_id">>, Id} | Header1]
end,

[jsx:encode([{erlang:atom_to_binary(Operation, utf8), Header2}])].
[erls_json:encode([{erlang:atom_to_binary(Operation, utf8), Header2}])].

build_body(delete, no_body) ->
[<<"\n">>];
Expand Down
2 changes: 1 addition & 1 deletion test/basic_SUITE.erl
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ index_templates(_Config) ->
ActualTemplateSettingsAndMapping2 = proplists:delete(<<"order">>, ActualTemplateSettingsAndMapping1),
ActualTemplateSettingsAndMapping3 = proplists:delete(<<"aliases">>, ActualTemplateSettingsAndMapping2),

ExpectedTemplateMappingAndSettings = lists:sort(jsx:decode(jsx:encode(template_mapping_json()))),
ExpectedTemplateMappingAndSettings = lists:sort(erls_json:decode(erls_json:encode(template_mapping_json()))),
ActualTemplateSettingsAndMapping = lists:sort(ActualTemplateSettingsAndMapping3),

ExpectedTemplateMappingAndSettings = ActualTemplateSettingsAndMapping,
Expand Down

0 comments on commit 2c76e69

Please sign in to comment.