Make JID related functions from jlib.erl deprecated

diff --git a/rebar.config.script b/rebar.config.script
index 9e213b8636404ce6c0b1a7fbfb1a7ce0325585d9..dd005d455fdf1c54c438c50691eee8d0d1b5051c 100644 (file)
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -187,7 +187,7 @@ Config = [{erl_opts, Macros ++ HiPE ++ DebugInfo ++
            ++ TestConfig
            ++ "-include " ++ filename:join([Cwd, "tools"])},
          {xref_warnings, false},
-          {xref_checks, []},
+          {xref_checks, [deprecated_function_calls]},
          {xref_queries,
           [{"(XC - UC) || (XU - X - B - "
             ++ string:join(CfgXrefs, " - ") ++ ")", []}]},

diff --git a/src/jlib.erl b/src/jlib.erl
index 711c432e6036040ae40db0c29c442efc74ae4abd..edeb6cd0189e7baf73f1f3a8d2145157f9ae8d2f 100644 (file)
--- a/src/jlib.erl
+++ b/src/jlib.erl
@@ -62,6 +62,18 @@
         nameprep/1, resourceprep/1, jid_tolower/1,
         jid_remove_resource/1, jid_replace_resource/2]).
 
+-deprecated([{make_jid, '_'},
+            {split_jid, 1},
+            {string_to_jid, 1},
+            {jid_to_string, 1},
+            {is_nodename, 1},
+            {nodeprep, 1},
+            {nameprep, 1},
+            {resourceprep, 1},
+            {jid_tolower, 1},
+            {jid_remove_resource, 1},
+            {jid_replace_resource, 2}]).
+
 -include("ejabberd.hrl").
 -include("jlib.hrl").
 

diff --git a/tools/xmpp_codec.erl b/tools/xmpp_codec.erl
index 987eb7c413569a1f74c702468a971f432588de9a..3adceabc4d4b66b19cd97380c638d3f97fa1e8a2 100644 (file)
--- a/tools/xmpp_codec.erl
+++ b/tools/xmpp_codec.erl
@@ -2533,15 +2533,15 @@ dec_bool(<<"true">>) -> true;
 dec_bool(<<"1">>) -> true.
 
 resourceprep(R) ->
-    case jlib:resourceprep(R) of
+    case jid:resourceprep(R) of
       error -> erlang:error(badarg);
       R1 -> R1
     end.
 
-enc_jid(J) -> jlib:jid_to_string(J).
+enc_jid(J) -> jid:to_string(J).
 
 dec_jid(Val) ->
-    case jlib:string_to_jid(Val) of
+    case jid:from_string(Val) of
       error -> erlang:error(badarg);
       J -> J
     end.

diff --git a/tools/xmpp_codec.spec b/tools/xmpp_codec.spec
index 38508ce6c421970606696f73bd2c7312651ade89..8d087c8b637a7956717e20e88e7d266240a95e9e 100644 (file)
--- a/tools/xmpp_codec.spec
+++ b/tools/xmpp_codec.spec
@@ -2421,7 +2421,7 @@ enc_utc(Val) ->
     jlib:now_to_utc_string(Val).
 
 dec_jid(Val) ->
-    case jlib:string_to_jid(Val) of
+    case jid:from_string(Val) of
         error ->
             erlang:error(badarg);
         J ->
@@ -2429,10 +2429,10 @@ dec_jid(Val) ->
     end.
 
 enc_jid(J) ->            
-    jlib:jid_to_string(J).
+    jid:to_string(J).
 
 resourceprep(R) ->
-    case jlib:resourceprep(R) of
+    case jid:resourceprep(R) of
         error ->
             erlang:error(badarg);
         R1 ->