From 178bafbabf5e0c6090a393110be5a716b2e57ee6 Mon Sep 17 00:00:00 2001 From: zhanghongtong Date: Fri, 9 Jul 2021 13:49:28 +0800 Subject: [PATCH] chore: rename required function to not_empty Signed-off-by: zhanghongtong --- apps/emqx_connector/include/emqx_connector.hrl | 2 +- apps/emqx_connector/src/emqx_connector_mongo.erl | 4 ++-- apps/emqx_connector/src/emqx_connector_schema_lib.erl | 6 +++--- apps/emqx_resource/src/emqx_resource_validator.erl | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/emqx_connector/include/emqx_connector.hrl b/apps/emqx_connector/include/emqx_connector.hrl index 143816402..fb299b19b 100644 --- a/apps/emqx_connector/include/emqx_connector.hrl +++ b/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)). diff --git a/apps/emqx_connector/src/emqx_connector_mongo.erl b/apps/emqx_connector/src/emqx_connector_mongo.erl index 6fac3cb26..daddb7e13 100644 --- a/apps/emqx_connector/src/emqx_connector_mongo.erl +++ b/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(); diff --git a/apps/emqx_connector/src/emqx_connector_schema_lib.erl b/apps/emqx_connector/src/emqx_connector_schema_lib.erl index 4f43a3bd4..7dcf24be5 100644 --- a/apps/emqx_connector/src/emqx_connector_schema_lib.erl +++ b/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) -> diff --git a/apps/emqx_resource/src/emqx_resource_validator.erl b/apps/emqx_resource/src/emqx_resource_validator.erl index 519ad4095..ee8cb6067 100644 --- a/apps/emqx_resource/src/emqx_resource_validator.erl +++ b/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.