fix: replace maps:foreach with lists:foreach

emqx · Apr 23, 2022 · 3514ac6 · 3514ac6
1 parent d854edf
commit 3514ac6
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 20 deletions.
diff --git a/apps/emqx/src/emqx_config.erl b/apps/emqx/src/emqx_config.erl
@@ -249,8 +249,8 @@ erase(RootName) ->
 -spec put(emqx_map_lib:config_key_path(), term()) -> ok.
 put(KeyPath, Config) ->
     Putter = fun(Path, Map, Value) ->
-                 emqx_map_lib:deep_put(Path, Map, Value)
-             end,
+        emqx_map_lib:deep_put(Path, Map, Value)
+    end,
     do_put(?CONF, safe, Putter, KeyPath, Config).
 
 -spec force_put(emqx_map_lib:config_key_path(), term()) -> ok.
@@ -260,8 +260,8 @@ force_put(KeyPath, Config) ->
 -spec force_put(emqx_map_lib:config_key_path(), term(), safe | unsafe) -> ok.
 force_put(KeyPath, Config, Safety) ->
     Putter = fun(Path, Map, Value) ->
-                 emqx_map_lib:deep_force_put(Path, Map, Value)
-             end,
+        emqx_map_lib:deep_force_put(Path, Map, Value)
+    end,
     do_put(?CONF, Safety, Putter, KeyPath, Config).
 
 -spec get_default_value(emqx_map_lib:config_key_path()) -> {ok, term()} | {error, term()}.
@@ -302,8 +302,8 @@ put_raw(Config) ->
 -spec put_raw(emqx_map_lib:config_key_path(), term()) -> ok.
 put_raw(KeyPath, Config) ->
     Putter = fun(Path, Map, Value) ->
-                 emqx_map_lib:deep_force_put(Path, Map, Value)
-             end,
+        emqx_map_lib:deep_force_put(Path, Map, Value)
+    end,
     do_put(?RAW_CONF, safe, Putter, KeyPath, Config).
 
 %%============================================================================

diff --git a/apps/emqx/src/emqx_map_lib.erl b/apps/emqx/src/emqx_map_lib.erl
@@ -81,18 +81,15 @@ deep_force_put([Key | KeyPath] = FullPath, Map, Data) ->
     case Map of
         #{Key := InnerValue} ->
             Map#{Key => deep_force_put(KeyPath, InnerValue, Data)};
-
         #{} ->
             maps:put(Key, path_to_map(KeyPath, Data), Map);
-
         _ ->
             path_to_map(FullPath, Data)
     end.
 
 -spec path_to_map(config_key_path(), term()) -> map().
 path_to_map([], Data) -> Data;
-path_to_map([Key | Tail], Data) ->
-    #{Key => path_to_map(Tail, Data)}.
+path_to_map([Key | Tail], Data) -> #{Key => path_to_map(Tail, Data)}.
 
 -spec deep_remove(config_key_path(), map()) -> map().
 deep_remove([], Map) ->

diff --git a/apps/emqx/test/emqx_shared_sub_SUITE.erl b/apps/emqx/test/emqx_shared_sub_SUITE.erl
@@ -454,24 +454,26 @@ ensure_config(Strategy, AckEnabled) ->
     ok.
 
 ensure_group_config(Group2Strategy) ->
-    maps:foreach(
-        fun(Group, Strategy) ->
-            emqx_config:force_put([broker, shared_subscription_group, Group, strategy], Strategy, unsafe)
+    lists:foreach(
+        fun({Group, Strategy}) ->
+            emqx_config:force_put(
+                [broker, shared_subscription_group, Group, strategy], Strategy, unsafe
+            )
         end,
-        Group2Strategy
+        maps:to_list(Group2Strategy)
     ).
 
 ensure_group_config(Node, Group2Strategy) ->
-    maps:foreach(
-        fun(Group, Strategy) ->
+    lists:foreach(
+        fun({Group, Strategy}) ->
             rpc:call(
                 Node,
                 emqx_config,
                 force_put,
                 [[broker, shared_subscription_group, Group, strategy], Strategy, unsafe]
             )
         end,
-        Group2Strategy
+        maps:to_list(Group2Strategy)
     ).
 
 subscribed(Group, Topic, Pid) ->

diff --git a/apps/emqx_machine/src/emqx_machine.erl b/apps/emqx_machine/src/emqx_machine.erl
@@ -92,10 +92,10 @@ update_vips() ->
 
 configure_shard_transports() ->
     ShardTransports = application:get_env(emqx_machine, custom_shard_transports, #{}),
-    maps:foreach(
-        fun(ShardBin, Transport) ->
+    lists:foreach(
+        fun({ShardBin, Transport}) ->
             ShardName = binary_to_existing_atom(ShardBin),
             mria_config:set_shard_transport(ShardName, Transport)
         end,
-        ShardTransports
+        maps:to_list(ShardTransports)
     ).