From 188ab716733685dc6131b7aba1a2bebf4db058e0 Mon Sep 17 00:00:00 2001 From: Kjell Winblad Date: Wed, 20 Mar 2024 14:02:18 +0100 Subject: [PATCH] refactor(rocketmq connector): to use emqx_connector_info This commit refactors the rocketmq connector to use the `emqx_connector_info` behavior. --- .../src/emqx_bridge_rocketmq.app.src | 5 ++- .../emqx_bridge_rocketmq_connector_info.erl | 42 +++++++++++++++++++ .../src/emqx_connector_info.erl | 3 +- .../src/schema/emqx_connector_ee_schema.erl | 12 ------ .../src/schema/emqx_connector_schema.erl | 2 - 5 files changed, 48 insertions(+), 16 deletions(-) create mode 100644 apps/emqx_bridge_rocketmq/src/emqx_bridge_rocketmq_connector_info.erl diff --git a/apps/emqx_bridge_rocketmq/src/emqx_bridge_rocketmq.app.src b/apps/emqx_bridge_rocketmq/src/emqx_bridge_rocketmq.app.src index 564e36a88..f41b313d4 100644 --- a/apps/emqx_bridge_rocketmq/src/emqx_bridge_rocketmq.app.src +++ b/apps/emqx_bridge_rocketmq/src/emqx_bridge_rocketmq.app.src @@ -3,7 +3,10 @@ {vsn, "0.1.5"}, {registered, []}, {applications, [kernel, stdlib, emqx_resource, rocketmq]}, - {env, [{emqx_action_info_modules, [emqx_bridge_rocketmq_action_info]}]}, + {env, [ + {emqx_action_info_modules, [emqx_bridge_rocketmq_action_info]}, + {emqx_connector_info_modules, [emqx_bridge_rocketmq_connector_info]} + ]}, {modules, []}, {links, []} ]}. diff --git a/apps/emqx_bridge_rocketmq/src/emqx_bridge_rocketmq_connector_info.erl b/apps/emqx_bridge_rocketmq/src/emqx_bridge_rocketmq_connector_info.erl new file mode 100644 index 000000000..96783f53c --- /dev/null +++ b/apps/emqx_bridge_rocketmq/src/emqx_bridge_rocketmq_connector_info.erl @@ -0,0 +1,42 @@ +%%-------------------------------------------------------------------- +%% Copyright (c) 2022-2024 EMQ Technologies Co., Ltd. All Rights Reserved. +%%-------------------------------------------------------------------- +-module(emqx_bridge_rocketmq_connector_info). + +-behaviour(emqx_connector_info). + +-export([ + type_name/0, + bridge_types/0, + resource_callback_module/0, + config_schema/0, + schema_module/0, + api_schema/1 +]). + +type_name() -> + rocketmq. + +bridge_types() -> + [rocketmq]. + +resource_callback_module() -> + emqx_bridge_rocketmq_connector. + +config_schema() -> + {rocketmq, + hoconsc:mk( + hoconsc:map(name, hoconsc:ref(emqx_bridge_rocketmq, "config_connector")), + #{ + desc => <<"RocketMQ Connector Config">>, + required => false + } + )}. + +schema_module() -> + emqx_bridge_rocketmq. + +api_schema(Method) -> + emqx_connector_schema:api_ref( + emqx_bridge_rocketmq, <<"rocketmq">>, Method ++ "_connector" + ). diff --git a/apps/emqx_connector/src/emqx_connector_info.erl b/apps/emqx_connector/src/emqx_connector_info.erl index 36b01d6eb..18f952733 100644 --- a/apps/emqx_connector/src/emqx_connector_info.erl +++ b/apps/emqx_connector/src/emqx_connector_info.erl @@ -74,7 +74,8 @@ hard_coded_connector_info_modules_ee() -> emqx_bridge_cassandra_connector_info, emqx_bridge_clickhouse_connector_info, emqx_bridge_mysql_connector_info, - emqx_bridge_redis_connector_info + emqx_bridge_redis_connector_info, + emqx_bridge_rocketmq_connector_info ]. -else. hard_coded_connector_info_modules_ee() -> diff --git a/apps/emqx_connector/src/schema/emqx_connector_ee_schema.erl b/apps/emqx_connector/src/schema/emqx_connector_ee_schema.erl index f2aed272d..60c94625d 100644 --- a/apps/emqx_connector/src/schema/emqx_connector_ee_schema.erl +++ b/apps/emqx_connector/src/schema/emqx_connector_ee_schema.erl @@ -27,8 +27,6 @@ resource_type(syskeeper_proxy) -> emqx_bridge_syskeeper_proxy_server; resource_type(sqlserver) -> emqx_bridge_sqlserver_connector; -resource_type(rocketmq) -> - emqx_bridge_rocketmq_connector; resource_type(iotdb) -> emqx_bridge_iotdb_connector; resource_type(elasticsearch) -> @@ -73,14 +71,6 @@ fields(connectors) -> connector_structs() -> [ - {rocketmq, - mk( - hoconsc:map(name, ref(emqx_bridge_rocketmq, "config_connector")), - #{ - desc => <<"RocketMQ Connector Config">>, - required => false - } - )}, {syskeeper_forwarder, mk( hoconsc:map(name, ref(emqx_bridge_syskeeper_connector, config)), @@ -177,7 +167,6 @@ schema_modules() -> emqx_bridge_syskeeper_proxy, emqx_bridge_sqlserver, emqx_postgresql_connector_schema, - emqx_bridge_rocketmq, emqx_bridge_iotdb_connector, emqx_bridge_es_connector, emqx_bridge_rabbitmq_connector_schema, @@ -195,7 +184,6 @@ api_schemas(Method) -> api_ref(emqx_bridge_syskeeper_connector, <<"syskeeper_forwarder">>, Method), api_ref(emqx_bridge_syskeeper_proxy, <<"syskeeper_proxy">>, Method), api_ref(emqx_bridge_sqlserver, <<"sqlserver">>, Method ++ "_connector"), - api_ref(emqx_bridge_rocketmq, <<"rocketmq">>, Method ++ "_connector"), api_ref(emqx_bridge_iotdb_connector, <<"iotdb">>, Method), api_ref(emqx_bridge_es_connector, <<"elasticsearch">>, Method), api_ref(emqx_bridge_opents_connector, <<"opents">>, Method), diff --git a/apps/emqx_connector/src/schema/emqx_connector_schema.erl b/apps/emqx_connector/src/schema/emqx_connector_schema.erl index 0a1967dd1..327e305e4 100644 --- a/apps/emqx_connector/src/schema/emqx_connector_schema.erl +++ b/apps/emqx_connector/src/schema/emqx_connector_schema.erl @@ -122,8 +122,6 @@ connector_info_schema_modules() -> %% @doc Return old bridge(v1) and/or connector(v2) type %% from the latest connector type name. -connector_type_to_bridge_types(rocketmq) -> - [rocketmq]; connector_type_to_bridge_types(syskeeper_forwarder) -> [syskeeper_forwarder]; connector_type_to_bridge_types(syskeeper_proxy) ->