refactor: move binary_util to emqx_utils_binary

apps/emqx_gateway_lwm2m/src/emqx_lwm2m_api.erl

@@ -227,7 +227,7 @@ to_operations(Obj, ObjDefinition) ->
     }.
 
 path_list(Path) ->
-    case binary:split(binary_util:trim(Path, $/), [<<$/>>], [global]) of
+    case binary:split(emqx_utils_binary:trim(Path, $/), [<<$/>>], [global]) of
         [ObjId, ObjInsId, ResId, ResInstId] -> [ObjId, ObjInsId, ResId, ResInstId];
         [ObjId, ObjInsId, ResId] -> [ObjId, ObjInsId, ResId];
         [ObjId, ObjInsId] -> [ObjId, ObjInsId];

apps/emqx_gateway_lwm2m/src/emqx_lwm2m_cmd.erl

@@ -335,7 +335,7 @@ remove_tmp_fields(Ref) ->
 
 -spec path_list(Path :: binary()) -> {[PathWord :: binary()], [Query :: binary()]}.
 path_list(Path) ->
-    case binary:split(binary_util:trim(Path, $/), [<<$/>>], [global]) of
+    case binary:split(emqx_utils_binary:trim(Path, $/), [<<$/>>], [global]) of
         [ObjId, ObjInsId, ResId, LastPart] ->
             {ResInstId, QueryList} = query_list(LastPart),
             {[ObjId, ObjInsId, ResId, ResInstId], QueryList};
@@ -389,7 +389,7 @@ observe_seq(Options) ->
 add_alternate_path_prefix(<<"/">>, PathList) ->
     PathList;
 add_alternate_path_prefix(AlternatePath, PathList) ->
-    [binary_util:trim(AlternatePath, $/) | PathList].
+    [emqx_utils_binary:trim(AlternatePath, $/) | PathList].
 
 extract_path(Ref = #{}) ->
     drop_query(

apps/emqx_gateway_lwm2m/src/emqx_lwm2m_message.erl

@@ -97,7 +97,7 @@ tlv_single_resource(BaseName, Id, Value, ObjDefinition) ->
     [#{path => BaseName, value => Val}].
 
 basename(OldBaseName, _ObjectId, ObjectInstanceId, ResourceId, 3) ->
-    case binary:split(binary_util:trim(OldBaseName, $/), [<<$/>>], [global]) of
+    case binary:split(emqx_utils_binary:trim(OldBaseName, $/), [<<$/>>], [global]) of
         [ObjId, ObjInsId, ResId] ->
             <<$/, ObjId/binary, $/, ObjInsId/binary, $/, ResId/binary>>;
         [ObjId, ObjInsId] ->
@@ -113,13 +113,13 @@ basename(OldBaseName, _ObjectId, ObjectInstanceId, ResourceId, 3) ->
             >>
     end;
 basename(OldBaseName, _ObjectId, ObjectInstanceId, _ResourceId, 2) ->
-    case binary:split(binary_util:trim(OldBaseName, $/), [<<$/>>], [global]) of
+    case binary:split(emqx_utils_binary:trim(OldBaseName, $/), [<<$/>>], [global]) of
         [ObjId, ObjInsId, _ResId] -> <<$/, ObjId/binary, $/, ObjInsId/binary>>;
         [ObjId, ObjInsId] -> <<$/, ObjId/binary, $/, ObjInsId/binary>>;
         [ObjId] -> <<$/, ObjId/binary, $/, (integer_to_binary(ObjectInstanceId))/binary>>
     end.
 % basename(OldBaseName, _ObjectId, _ObjectInstanceId, _ResourceId, 1) ->
-%    case binary:split(binary_util:trim(OldBaseName, $/), [<<$/>>], [global]) of
+%    case binary:split(emqx_utils_binary:trim(OldBaseName, $/), [<<$/>>], [global]) of
 %        [ObjId, _ObjInsId, _ResId]       -> <<$/, ObjId/binary>>;
 %        [ObjId, _ObjInsId]               -> <<$/, ObjId/binary>>;
 %        [ObjId]                          -> <<$/, ObjId/binary>>
@@ -129,7 +129,7 @@ make_path(RelativePath, Id) ->
     <<RelativePath/binary, $/, (integer_to_binary(Id))/binary>>.
 
 object_id(BaseName) ->
-    case binary:split(binary_util:trim(BaseName, $/), [<<$/>>], [global]) of
+    case binary:split(emqx_utils_binary:trim(BaseName, $/), [<<$/>>], [global]) of
         [ObjId] -> binary_to_integer(ObjId);
         [ObjId, _] -> binary_to_integer(ObjId);
         [ObjId, _, _] -> binary_to_integer(ObjId);
@@ -137,7 +137,7 @@ object_id(BaseName) ->
     end.
 
 object_resource_id(BaseName) ->
-    case binary:split(binary_util:trim(BaseName, $/), [<<$/>>], [global]) of
+    case binary:split(emqx_utils_binary:trim(BaseName, $/), [<<$/>>], [global]) of
         [_ObjIdBin1] ->
             error({invalid_basename, BaseName});
         [_ObjIdBin2, _] ->
@@ -371,8 +371,8 @@ translate_element(BaseName, [Element | ElementList], Acc) ->
     translate_element(BaseName, ElementList, NewAcc).
 
 full_path(BaseName, RelativePath) ->
-    Prefix = binary_util:rtrim(BaseName, $/),
-    Path = binary_util:ltrim(RelativePath, $/),
+    Prefix = emqx_utils_binary:rtrim(BaseName, $/),
+    Path = emqx_utils_binary:ltrim(RelativePath, $/),
     <<Prefix/binary, $/, Path/binary>>.
 
 get_element_value(#{<<"t">> := Value}) -> Value;

apps/emqx_gateway_lwm2m/src/emqx_lwm2m_session.erl

@@ -386,11 +386,11 @@ is_alternate_path(LinkAttrs) ->
         LinkAttrs
     ).
 
-trim(Str) -> binary_util:trim(Str, $\s).
+trim(Str) -> emqx_utils_binary:trim(Str, $\s).
 
 delink(Str) ->
-    Ltrim = binary_util:ltrim(Str, $<),
-    binary_util:rtrim(Ltrim, $>).
+    Ltrim = emqx_utils_binary:ltrim(Str, $<),
+    emqx_utils_binary:rtrim(Ltrim, $>).
 
 get_lifetime(#{<<"lt">> := LT}) ->
     case LT of

apps/emqx_utils/src/emqx_utils_binary.erl

@@ -14,7 +14,7 @@
 %% limitations under the License.
 %%--------------------------------------------------------------------
 
--module(binary_util).
+-module(emqx_utils_binary).
 
 %% copied from https://github.com/arcusfelis/binary2