Merge pull request #4422 from esl/dead_code

Remove some more complicated dead code
esl · Dec 6, 2024 · 0076a25 · 0076a25
2 parents c0ac5ef + e8824b4
commit 0076a25
Show file tree

Hide file tree

Showing 50 changed files with 484 additions and 713 deletions.
diff --git a/big_tests/tests/bosh_SUITE.erl b/big_tests/tests/bosh_SUITE.erl
@@ -691,7 +691,7 @@ reply_in_time(ConfigIn) ->
 server_acks(Config) ->
     escalus:story(Config, [{carol, 1}, {geralt, 1}], fun(Carol, Geralt) ->
         bosh_set_active(Carol, false),
-        ExpectedRid = list_to_binary(integer_to_list(get_bosh_rid(Carol))),
+        ExpectedRid = integer_to_binary(get_bosh_rid(Carol)),
         escalus_client:send(Carol, escalus_stanza:chat_to(Geralt, <<"1st!">>)),
         escalus_client:send(Carol, escalus_stanza:chat_to(Geralt, <<"2nd!">>)),
         timer:sleep(200),
@@ -897,7 +897,7 @@ wait_for_stanza(Client) ->
 
 ack_body(Body, Rid) ->
     Attrs = Body#xmlel.attrs,
-    Ack = {<<"ack">>, list_to_binary(integer_to_list(Rid))},
+    Ack = {<<"ack">>, integer_to_binary(Rid)},
     NewAttrs = lists:keystore(<<"ack">>, 1, Attrs, Ack),
     Body#xmlel{attrs = NewAttrs}.
 

diff --git a/big_tests/tests/common_helper.erl b/big_tests/tests/common_helper.erl
@@ -7,4 +7,4 @@ get_bjid(UserSpec) ->
     <<User/binary,"@",Server/binary>>.
 
 unprep(Bin) when is_binary(Bin) ->
-    list_to_binary(string:titlecase(binary_to_list(Bin))).
+    string:titlecase(Bin).
diff --git a/big_tests/tests/gdpr_SUITE.erl b/big_tests/tests/gdpr_SUITE.erl
@@ -1534,15 +1534,14 @@ retrieve_inbox_for_multiple_messages(Config) ->
 retrieve_logs(Config) ->
     escalus:fresh_story(Config, [{alice, 1}],
         fun(Alice) ->
-            User = string:to_lower(binary_to_list(escalus_client:username(Alice))),
-            Domain = string:to_lower(binary_to_list(escalus_client:server(Alice))),
-            JID = string:to_upper(binary_to_list(escalus_client:short_jid(Alice))),
+            User = string:lowercase(escalus_client:username(Alice)),
+            Domain = string:lowercase(escalus_client:server(Alice)),
+            JID = string:uppercase(binary_to_list(escalus_client:short_jid(Alice))),
             #{node := MIM2NodeName} = MIM2Node = distributed_helper:mim2(),
             mongoose_helper:successful_rpc(net_kernel, connect_node, [MIM2NodeName]),
             mongoose_helper:successful_rpc(MIM2Node, error_logger, error_msg,
                                            ["event=disturbance_in_the_force, jid=~s", [JID]]),
-            Dir = request_and_unzip_personal_data(list_to_binary(User), list_to_binary(Domain),
-                                                  Config),
+            Dir = request_and_unzip_personal_data(User, Domain, Config),
             Filename = filename:join(Dir, "logs-" ++ atom_to_list(MIM2NodeName) ++ ".txt"),
             {ok, Content} = file:read_file(Filename),
             {match, _} = re:run(Content, "disturbance_in_the_force")

diff --git a/big_tests/tests/graphql_muc_SUITE.erl b/big_tests/tests/graphql_muc_SUITE.erl
@@ -1925,7 +1925,7 @@ assert_default_room_config(Response) ->
                    <<"logging">> := false}, get_ok_value(?GET_ROOM_CONFIG_PATH, Response)).
 
 atom_to_enum_item(null) -> null;
-atom_to_enum_item(Atom) -> list_to_binary(string:to_upper(atom_to_list(Atom))).
+atom_to_enum_item(Atom) -> string:uppercase(atom_to_binary(Atom)).
 
 get_room_name() ->
     Domain = domain_helper:domain(),

diff --git a/big_tests/tests/mam_send_message_SUITE_data/mam_send_message_example.erl b/big_tests/tests/mam_send_message_SUITE_data/mam_send_message_example.erl
@@ -43,9 +43,9 @@ extend_message(_HostType, _ArcJID, Row = #{}) ->
     Row#{some_hash => erlang:phash2(Row, 32)}.
 
 send_message(Row, From, To, Mess) ->
-    Res = xml:get_subtag(Mess, <<"result">>),
-    Res2 = xml:append_subtags(Res, [new_subelem(Row)]),
-    Mess2 = xml:replace_subelement(Mess, Res2),
+    Res = exml_query:subelement(Mess, <<"result">>),
+    Res2 = jlib:append_subtags(Res, [new_subelem(Row)]),
+    Mess2 = jlib:replace_subelement(Mess, Res2),
     mod_mam_utils:send_message(Row, From, To, Mess2).
 
 new_subelem(#{some_hash := SomeHash}) ->

diff --git a/big_tests/tests/muc_SUITE.erl b/big_tests/tests/muc_SUITE.erl
@@ -4678,7 +4678,7 @@ skip_undefined(Xs) ->
     [X || X <- Xs, X =/= undefined].
 
 i2b(X) when is_integer(X) ->
-    list_to_binary(integer_to_list(X)).
+    integer_to_binary(X).
 
 wait_room_range(Client, FromN, ToN) ->
     wait_room_range(Client, 15, FromN-1, FromN, ToN).

diff --git a/big_tests/tests/muc_light_helper.erl b/big_tests/tests/muc_light_helper.erl
@@ -211,12 +211,12 @@ aff_msg_verify_fun(AffUsersChanges) ->
     end.
 
 -spec lbin(Bin :: binary()) -> binary().
-lbin(Bin) -> list_to_binary(string:to_lower(binary_to_list(Bin))).
-
+lbin(Bin) ->
+    string:lowercase(Bin).
 
 -spec bin_aff_users(AffUsers :: ct_aff_users()) -> [{LBinJID :: binary(), AffBin :: binary()}].
 bin_aff_users(AffUsers) ->
-    [ {lbin(escalus_client:short_jid(User)), list_to_binary(atom_to_list(Aff))}
+    [ {lbin(escalus_client:short_jid(User)), atom_to_binary(Aff)}
       || {User, Aff} <- AffUsers ].
 
 -spec verify_aff_users(Items :: [exml:element()], BinAffUsers :: [{binary(), binary()}]) -> [].
@@ -288,7 +288,7 @@ clear_db(HostType) ->
 
 -spec ver(Int :: integer()) -> binary().
 ver(Int) ->
-  <<"ver-", (list_to_binary(integer_to_list(Int)))/binary>>.
+  <<"ver-", (integer_to_binary(Int))/binary>>.
 
 assert_no_aff_duplicates(AffUsers) ->
     Users = [US || {US, _} <- AffUsers],
@@ -302,8 +302,8 @@ assert_no_aff_duplicates(AffUsers) ->
 
 -spec stanza_blocking_set(BlocklistChanges :: [ct_block_item()]) -> exml:element().
 stanza_blocking_set(BlocklistChanges) ->
-    Items = [#xmlel{ name = list_to_binary(atom_to_list(What)),
-                     attrs = [{<<"action">>, list_to_binary(atom_to_list(Action))}],
+    Items = [#xmlel{ name = atom_to_binary(What),
+                     attrs = [{<<"action">>, atom_to_binary(Action)}],
                      children = [#xmlcdata{ content = Who }] }
              || {What, Action, Who} <- BlocklistChanges],
     escalus_stanza:to(escalus_stanza:iq_set(?NS_MUC_LIGHT_BLOCKING, Items), muc_host()).

diff --git a/big_tests/tests/oauth_SUITE.erl b/big_tests/tests/oauth_SUITE.erl
@@ -435,7 +435,7 @@ serialize(ServerSideToken) ->
     end.
 
 to_lower(B) when is_binary(B) ->
-    list_to_binary(string:to_lower(binary_to_list(B))).
+    string:lowercase(B).
 
 required_modules() ->
     KeyOpts = #{backend => ct_helper:get_internal_database(),

diff --git a/big_tests/tests/offline_SUITE.erl b/big_tests/tests/offline_SUITE.erl
@@ -406,7 +406,7 @@ make_chat_text(I) ->
     <<"Hi, Offline ", Number/binary>>.
 
 make_message_with_expiry(Target, Expiry, Text) ->
-    ExpiryBin = list_to_binary(integer_to_list(Expiry)),
+    ExpiryBin = integer_to_binary(Expiry),
     Stanza = escalus_stanza:chat_to(Target, Text),
     #xmlel{children = Children} = Stanza,
     ExpiryElem = #xmlel{name = <<"x">>,

diff --git a/big_tests/tests/push_SUITE.erl b/big_tests/tests/push_SUITE.erl
@@ -774,7 +774,7 @@ push_notification(PubsubJID, Payload, PublishOpts) ->
 
 bare_jid(JIDOrClient) ->
     ShortJID = escalus_client:short_jid(JIDOrClient),
-    list_to_binary(string:to_lower(binary_to_list(ShortJID))).
+    string:lowercase(ShortJID).
 
 add_pubsub_jid(Config) ->
     CaseName = proplists:get_value(case_name, Config),

diff --git a/big_tests/tests/push_http_SUITE.erl b/big_tests/tests/push_http_SUITE.erl
@@ -161,8 +161,10 @@ process_notification(Req) ->
 
 check_default_format(From, To, Body, Msg) ->
     Attrs = lists:map(fun(P) -> list_to_tuple(binary:split(P, <<$=>>)) end, binary:split(Msg, <<$&>>, [global])),
-    ?assertEqual(to_lower(escalus_client:username(From)), proplists:get_value(<<"author">>, Attrs)),
-    ?assertEqual(to_lower(escalus_client:username(To)), proplists:get_value(<<"receiver">>, Attrs)),
+    ?assertEqual(string:lowercase(escalus_client:username(From)),
+                 proplists:get_value(<<"author">>, Attrs)),
+    ?assertEqual(string:lowercase(escalus_client:username(To)),
+                 proplists:get_value(<<"receiver">>, Attrs)),
     ?assertEqual(Body, proplists:get_value(<<"message">>, Attrs)),
     ?assertEqual(<<"localhost">>, proplists:get_value(<<"server">>, Attrs)),
     ok.
@@ -221,15 +223,6 @@ custom_module_code_2() ->
      "
     .
 
-to_lower(B) ->
-    list_to_binary(
-        string:to_lower(
-            binary_to_list(
-                B
-            )
-        )
-    ).
-
 send(Alice, Bob, Body) ->
     Stanza = escalus_stanza:chat_to(Bob, Body),
     escalus_client:send(Alice, Stanza).
diff --git a/big_tests/tests/push_integration_SUITE.erl b/big_tests/tests/push_integration_SUITE.erl
@@ -983,7 +983,7 @@ gen_token() ->
     integer_to_binary(binary:decode_unsigned(crypto:strong_rand_bytes(16)), 24).
 
 lower(Bin) when is_binary(Bin) ->
-    list_to_binary(string:to_lower(binary_to_list(Bin))).
+    string:lowercase(Bin).
 
 pubsub_node_from_host(Config) ->
     case ?config(pubsub_host, Config) of

diff --git a/big_tests/tests/push_pubsub_SUITE.erl b/big_tests/tests/push_pubsub_SUITE.erl
@@ -396,7 +396,7 @@ rpc(M, F, A) ->
 
 bare_jid(JIDOrClient) ->
     ShortJID = escalus_client:short_jid(JIDOrClient),
-    list_to_binary(string:to_lower(binary_to_list(ShortJID))).
+    string:lowercase(ShortJID).
 
 %% ----------------------------------------------
 %% REST mock handler

diff --git a/big_tests/tests/vcard_SUITE.erl b/big_tests/tests/vcard_SUITE.erl
@@ -38,7 +38,7 @@
 -define(EL_CD(Element, Name), exml_query:path(Element, [{element, Name}, cdata])).
 
 -define(PHOTO_BIN, <<130, 192, 33, 159, 204, 86, 12, 63, 132, 164>>).
--define(PHOTO_BASE_64, <<"gsAhn8xWDD+EpA==">>). %% jlib:encode_base64(?PHOTO_BIN)
+-define(PHOTO_BASE_64, <<"gsAhn8xWDD+EpA==">>). %% base64:encode(?PHOTO_BIN)
 
 -import(distributed_helper, [mim/0,
                              require_rpc_nodes/1,

diff --git a/rel/files/scripts/bootstrap20-template.escript b/rel/files/scripts/bootstrap20-template.escript
@@ -111,15 +111,5 @@ parse_template_config(TemplateConfigPath, TemplateConfigBin) ->
     end.
 
 % Produce LowerEnvVars depending on the version
--ifdef(OTP_RELEASE).
--if(?OTP_RELEASE >= 24).
 get_env_vars() ->
-    [{string:to_lower(K), V} || {K, V} <- os:env()].
--else.
-get_env_vars() ->
-    [{string:to_lower(K), V} || {K, V} <- os:list_env_vars()].
--endif.
--else.
-get_env_vars() ->
-    [{string:to_lower(K), V} || {K, V} <- os:list_env_vars()].
--endif.
+    [{string:lowercase(K), V} || {K, V} <- os:env()].
diff --git a/src/adhoc.erl b/src/adhoc.erl
@@ -47,9 +47,9 @@ parse_request(#iq{type = set, lang = Lang, sub_el = SubEl, xmlns = ?NS_COMMANDS}
     ?LOG_DEBUG(#{what => adhoc_parse_request,
                  text => <<"entering parse_request...">>,
                  sub_el => SubEl}),
-    Node = xml:get_tag_attr_s(<<"node">>, SubEl),
-    SessionID = xml:get_tag_attr_s(<<"sessionid">>, SubEl),
-    Action = xml:get_tag_attr_s(<<"action">>, SubEl),
+    Node = exml_query:attr(SubEl, <<"node">>, <<>>),
+    SessionID = exml_query:attr(SubEl, <<"sessionid">>, <<>>),
+    Action = exml_query:attr(SubEl, <<"action">>, <<>>),
     XData = mongoose_data_forms:find_form(SubEl, false),
     #xmlel{children = AllEls} = SubEl,
     Others = case XData of
@@ -112,7 +112,7 @@ produce_response(#adhoc_response{lang = _Lang,
            attrs = [{<<"xmlns">>, ?NS_COMMANDS},
                     {<<"sessionid">>, SessionID},
                     {<<"node">>, Node},
-                    {<<"status">>, list_to_binary(atom_to_list(Status))}],
+                    {<<"status">>, atom_to_binary(Status)}],
            children = ActionsEls ++ NotesEls ++ Elements}.
 
 -spec ensure_correct_session_id(binary()) -> binary().

diff --git a/src/c2s/mongoose_c2s_stanzas.erl b/src/c2s/mongoose_c2s_stanzas.erl
@@ -125,7 +125,7 @@ hook_enabled_features(StateData) ->
 sasl_success_stanza(ServerOut) ->
     C = case ServerOut of
             undefined -> [];
-            _ -> [#xmlcdata{content = jlib:encode_base64(ServerOut)}]
+            _ -> [#xmlcdata{content = base64:encode(ServerOut)}]
         end,
     #xmlel{name = <<"success">>,
            attrs = [{<<"xmlns">>, ?NS_SASL}],
@@ -148,7 +148,7 @@ maybe_text_tag(Text) ->
 sasl_challenge_stanza(ServerOut) ->
     #xmlel{name = <<"challenge">>,
            attrs = [{<<"xmlns">>, ?NS_SASL}],
-           children = [#xmlcdata{content = jlib:encode_base64(ServerOut)}]}.
+           children = [#xmlcdata{content = base64:encode(ServerOut)}]}.
 
 -spec successful_resource_binding(jlib:iq(), jid:jid()) -> exml:element().
 successful_resource_binding(IQ, Jid) ->

diff --git a/src/ejabberd.erl b/src/ejabberd.erl
@@ -35,7 +35,7 @@
                           | {'xmlstreamelement', exml:element()}
                           | {'xmlstreamend', _}
                           | {'xmlstreamerror', _}
-                          | {'xmlstreamstart', Name :: any(), Attrs :: list()}.
+                          | {'xmlstreamstart', Name :: binary(), Attrs :: [exml:attr()]}.
 
 -export_type([lang/0, xml_stream_item/0]).
 

diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl
@@ -276,10 +276,9 @@ stream_start_error(StateData, Info, Error) ->
 -spec wait_for_feature_request(ejabberd:xml_stream_item(), state()
                               ) -> fsm_return().
 wait_for_feature_request({xmlstreamelement, El}, StateData) ->
-    #xmlel{name = Name, attrs = Attrs, children = Els} = El,
     TLS = StateData#state.tls,
     TLSEnabled = StateData#state.tls_enabled,
-    case {xml:get_attr_s(<<"xmlns">>, Attrs), Name} of
+    case {exml_query:attr(El, <<"xmlns">>), El#xmlel.name} of
         {?NS_TLS, <<"starttls">>} when TLS == true,
                                        TLSEnabled == false ->
             ?LOG_DEBUG(#{what => s2s_starttls}),
@@ -295,10 +294,9 @@ wait_for_feature_request({xmlstreamelement, El}, StateData) ->
                              tls_options = TLSOpts
                             }};
         {?NS_SASL, <<"auth">>} when TLSEnabled ->
-            Mech = xml:get_attr_s(<<"mechanism">>, Attrs),
-            case Mech of
+            case exml_query:attr(El, <<"mechanism">>) of
                 <<"EXTERNAL">> ->
-                    Auth = jlib:decode_base64(xml:get_cdata(Els)),
+                    Auth = base64:mime_decode(exml_query:cdata(El)),
                     AuthDomain = jid:nameprep(Auth),
                     CertData = mongoose_transport:get_peer_certificate(
                                  StateData#state.socket),

diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl
@@ -312,12 +312,13 @@ open_socket2(HostType, Type, Addr, Port) ->
 %%----------------------------------------------------------------------
 
 -spec wait_for_stream(ejabberd:xml_stream_item(), state()) -> fsm_return().
-wait_for_stream({xmlstreamstart, _Name, Attrs}, StateData0) ->
-    RemoteStreamID = xml:get_attr_s(<<"id">>, Attrs),
+wait_for_stream({xmlstreamstart, Name, Attrs}, StateData0) ->
+    StreamStart = #xmlel{name = Name, attrs = Attrs},
+    RemoteStreamID = exml_query:attr(StreamStart, <<"id">>, <<>>),
     StateData = StateData0#state{remote_streamid = RemoteStreamID},
-    case {xml:get_attr_s(<<"xmlns">>, Attrs),
-          xml:get_attr_s(<<"xmlns:db">>, Attrs),
-          xml:get_attr_s(<<"version">>, Attrs) == <<"1.0">>} of
+    case {exml_query:attr(StreamStart, <<"xmlns">>, <<>>),
+          exml_query:attr(StreamStart, <<"xmlns:db">>, <<>>),
+          exml_query:attr(StreamStart, <<"version">>, <<>>) =:= <<"1.0">>} of
         {<<"jabber:server">>, <<"jabber:server:dialback">>, false} ->
             send_dialback_request(StateData);
         {<<"jabber:server">>, <<"jabber:server:dialback">>, true} when
@@ -424,12 +425,11 @@ wait_for_features({xmlstreamelement, El}, StateData) ->
         #xmlel{name = <<"stream:features">>, children = Els} ->
             {SASLEXT, StartTLS, StartTLSRequired} =
                 lists:foldl(
-                  fun(#xmlel{name = <<"mechanisms">>, attrs = Attrs1,
-                             children = Els1} = _El1, Acc) ->
-                          Attr =  xml:get_attr_s(<<"xmlns">>, Attrs1),
+                  fun(#xmlel{name = <<"mechanisms">>, children = Els1} = El1, Acc) ->
+                          Attr = exml_query:attr(El1, <<"xmlns">>, <<>>),
                           get_acc_with_new_sext(Attr, Els1, Acc);
-                     (#xmlel{name = <<"starttls">>, attrs = Attrs1} = El1, Acc) ->
-                          Attr = xml:get_attr_s(<<"xmlns">>, Attrs1),
+                     (#xmlel{name = <<"starttls">>} = El1, Acc) ->
+                          Attr = exml_query:attr(El1, <<"xmlns">>, <<>>),
                           get_acc_with_new_tls(Attr, El1, Acc);
                      (_, Acc) ->
                           Acc
@@ -455,8 +455,8 @@ wait_for_features(closed, StateData) ->
 -spec wait_for_auth_result(ejabberd:xml_stream_item(), state()) -> fsm_return().
 wait_for_auth_result({xmlstreamelement, El}, StateData) ->
     case El of
-        #xmlel{name = <<"success">>, attrs = Attrs} ->
-            case xml:get_attr_s(<<"xmlns">>, Attrs) of
+        #xmlel{name = <<"success">>} ->
+            case exml_query:attr(El, <<"xmlns">>) of
                 ?NS_SASL ->
                     ?LOG_DEBUG(#{what => s2s_auth_success,
                                  myname => StateData#state.myname,
@@ -473,8 +473,8 @@ wait_for_auth_result({xmlstreamelement, El}, StateData) ->
                     send_text(StateData, ?STREAM_TRAILER),
                     ?CLOSE_GENERIC(wait_for_auth_result, bad_format, El, StateData)
             end;
-        #xmlel{name = <<"failure">>, attrs = Attrs} ->
-            case xml:get_attr_s(<<"xmlns">>, Attrs) of
+        #xmlel{name = <<"failure">>} ->
+            case exml_query:attr(El, <<"xmlns">>) of
                 ?NS_SASL ->
                     ?LOG_WARNING(#{what => s2s_auth_failure,
                                    text => <<"Received failure result in ejabberd_s2s_out. Restarting">>,
@@ -508,8 +508,8 @@ wait_for_auth_result(closed, StateData) ->
 -spec wait_for_starttls_proceed(ejabberd:xml_stream_item(), state()) -> fsm_return().
 wait_for_starttls_proceed({xmlstreamelement, El}, StateData) ->
     case El of
-        #xmlel{name = <<"proceed">>, attrs = Attrs} ->
-            case xml:get_attr_s(<<"xmlns">>, Attrs) of
+        #xmlel{name = <<"proceed">>} ->
+            case exml_query:attr(El, <<"xmlns">>) of
                 ?NS_TLS ->
                     ?LOG_DEBUG(#{what => s2s_starttls,
                                  myname => StateData#state.myname,
@@ -1083,24 +1083,18 @@ addr_type(Addr) when tuple_size(Addr) =:= 8 -> inet6.
 get_acc_with_new_sext(?NS_SASL, Els1, {_SEXT, STLS, STLSReq}) ->
     NewSEXT =
         lists:any(
-          fun(#xmlel{name = <<"mechanism">>,
-                     children = Els2}) ->
-                  case xml:get_cdata(Els2) of
-                      <<"EXTERNAL">> -> true;
-                      _ -> false
-                  end;
-             (_) -> false
+          fun(El) ->
+                  is_record(El, xmlel)
+                  andalso <<"mechanism">> =:= El#xmlel.name
+                  andalso <<"EXTERNAL">> =:= exml_query:cdata(El)
           end, Els1),
+
     {NewSEXT, STLS, STLSReq};
 get_acc_with_new_sext(_, _, Acc) ->
     Acc.
 
 get_acc_with_new_tls(?NS_TLS, El1, {SEXT, _STLS, _STLSReq}) ->
-    Req = case xml:get_subtag(El1, <<"required">>) of
-              #xmlel{} -> true;
-              false -> false
-          end,
-    {SEXT, true, Req};
+    {SEXT, true, undefined =/= exml_query:subelement(El1, <<"required">>)};
 get_acc_with_new_tls(_, _, Acc) ->
     Acc.
 
@@ -1132,7 +1126,7 @@ handle_parsed_features({true, _, _, StateData = #state{try_auth = true, is_regis
                         attrs = [{<<"xmlns">>, ?NS_SASL},
                                  {<<"mechanism">>, <<"EXTERNAL">>}],
                         children =
-                            [#xmlcdata{content = jlib:encode_base64(
+                            [#xmlcdata{content = base64:encode(
                                                    StateData#state.myname)}]}),
     {next_state, wait_for_auth_result,
      StateData#state{try_auth = false}, ?FSMTIMEOUT};