yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: rename required function to not_empty 

Signed-off-by: zhanghongtong <rory-z@outlook.com>
This commit is contained in:
zhanghongtong 2021-07-09 13:49:28 +08:00 committed by Rory Z
parent c10d154dab
commit 178bafbabf
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/emqx_connector/include/emqx_connector.hrl
View File

@ -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)).

4
apps/emqx_connector/src/emqx_connector_mongo.erl
View File

@ -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();

6
apps/emqx_connector/src/emqx_connector_schema_lib.erl
View File

@ -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) ->

4
apps/emqx_resource/src/emqx_resource_validator.erl
View File

@ -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.