From effa3b8b908c5a0144467f2f86068817ce89828b Mon Sep 17 00:00:00 2001 From: JimMoen Date: Wed, 1 Dec 2021 15:47:56 +0800 Subject: [PATCH] style: make elvis happy --- apps/emqx_authz/src/emqx_authz_schema.erl | 31 +++++++++-------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/apps/emqx_authz/src/emqx_authz_schema.erl b/apps/emqx_authz/src/emqx_authz_schema.erl index 62d9bff17..01f601857 100644 --- a/apps/emqx_authz/src/emqx_authz_schema.erl +++ b/apps/emqx_authz/src/emqx_authz_schema.erl @@ -116,26 +116,11 @@ fields(mnesia) -> default => true}} ]; fields(mongo_single) -> - [ {collection, #{type => atom()}} - , {selector, #{type => map()}} - , {type, #{type => mongodb}} - , {enable, #{type => boolean(), - default => true}} - ] ++ emqx_connector_mongo:fields(single); + mongo_common_fields() ++ emqx_connector_mongo:fields(single); fields(mongo_rs) -> - [ {collection, #{type => atom()}} - , {selector, #{type => map()}} - , {type, #{type => mongodb}} - , {enable, #{type => boolean(), - default => true}} - ] ++ emqx_connector_mongo:fields(rs); + mongo_common_fields() ++ emqx_connector_mongo:fields(rs); fields(mongo_sharded) -> - [ {collection, #{type => atom()}} - , {selector, #{type => map()}} - , {type, #{type => mongodb}} - , {enable, #{type => boolean(), - default => true}} - ] ++ emqx_connector_mongo:fields(sharded); + mongo_common_fields() ++ emqx_connector_mongo:fields(sharded); fields(mysql) -> connector_fields(mysql) ++ [ {query, query()} ]; @@ -163,6 +148,14 @@ http_common_fields() -> , {body, #{type => map(), nullable => true}} ] ++ proplists:delete(base_url, emqx_connector_http:fields(config)). +mongo_common_fields() -> + [ {collection, #{type => atom()}} + , {selector, #{type => map()}} + , {type, #{type => mongodb}} + , {enable, #{type => boolean(), + default => true}} + ]. + validations() -> [ {check_ssl_opts, fun check_ssl_opts/1} , {check_headers, fun check_headers/1} @@ -250,7 +243,7 @@ connector_fields(DB, Fields) -> [ {type, #{type => DB}} , {enable, #{type => boolean(), default => true}} - ] ++ Mod:fields(Fields). + ] ++ erlang:apply(Mod, fields, [Fields]). to_list(A) when is_atom(A) -> atom_to_list(A);