Explorar o código

chore: rename required function to not_empty

Signed-off-by: zhanghongtong <rory-z@outlook.com>
zhanghongtong %!s(int64=4) %!d(string=hai) anos
pai
achega
178bafbabf

+ 1 - 1
apps/emqx_connector/include/emqx_connector.hrl

@@ -1,4 +1,4 @@
 -define(VALID, emqx_resource_validator).
--define(REQUIRED(MSG), ?VALID:required(MSG)).
+-define(NOT_EMPTY(MSG), ?VALID:not_empty(MSG)).
 -define(MAX(MAXV), ?VALID:max(number, MAXV)).
 -define(MIN(MINV), ?VALID:min(number, MINV)).

+ 2 - 2
apps/emqx_connector/src/emqx_connector_mongo.erl

@@ -243,11 +243,11 @@ host_port(HostPort) ->
     end.
 
 server(type) -> server();
-server(validator) -> [?REQUIRED("the field 'server' is required")];
+server(validator) -> [?NOT_EMPTY("the value of the field 'server' cannot be empty")];
 server(_) -> undefined.
 
 servers(type) -> hoconsc:array(server());
-servers(validator) -> [?REQUIRED("the field 'servers' is required")];
+servers(validator) -> [?NOT_EMPTY("the value of the field 'servers' cannot be empty")];
 servers(_) -> undefined.
 
 duration(type) -> emqx_schema:duration_ms();

+ 3 - 3
apps/emqx_connector/src/emqx_connector_schema_lib.erl

@@ -87,12 +87,12 @@ relational_db_fields() ->
 
 server(type) -> emqx_schema:ip_port();
 server(nullable) -> false;
-server(validator) -> [?REQUIRED("the field 'server' is required")];
+server(validator) -> [?NOT_EMPTY("the value of the field 'server' cannot be empty")];
 server(_) -> undefined.
 
 database(type) -> binary();
 database(nullable) -> false;
-database(validator) -> [?REQUIRED("the field 'database' is required")];
+database(validator) -> [?NOT_EMPTY("the value of the field 'database' cannot be empty")];
 database(_) -> undefined.
 
 pool_size(type) -> integer();
@@ -129,7 +129,7 @@ verify(default) -> false;
 verify(_) -> undefined.
 
 servers(type) -> servers();
-servers(validator) -> [?REQUIRED("the field 'servers' is required")];
+servers(validator) -> [?NOT_EMPTY("the value of the field 'servers' cannot be empty")];
 servers(_) -> undefined.
 
 to_ip_port(Str) ->

+ 2 - 2
apps/emqx_resource/src/emqx_resource_validator.erl

@@ -20,7 +20,7 @@
         , max/2
         , equals/2
         , enum/1
-        , required/1
+        , not_empty/1
         ]).
 
 max(Type, Max) ->
@@ -38,7 +38,7 @@ enum(Items) ->
             err_limit({enum, {is_member_of, Items}, {got, Value}}))
     end.
 
-required(ErrMsg) ->
+not_empty(ErrMsg) ->
     fun(<<>>) -> {error, ErrMsg};
        (_) -> ok
     end.