From dc08fab0e82d7c0b0a6412189e2bb6ab9d9cfd96 Mon Sep 17 00:00:00 2001
From: Kjell Winblad <kjellwinblad@gmail.com>
Date: Tue, 19 Mar 2024 10:11:41 +0100
Subject: [PATCH] refactor(hstreamdb connector): to use emqx_connector_info

This commit refactors the `emqx_bridge_hstreamdb` to use the
`emqx_connector_info` behavior. The `emqx_bridge_hstreamdb` related
information can thus be removed from `emqx_connector_ee_schema` and
`emqx_connector_schema`.
---
 .../src/emqx_bridge_hstreamdb.app.src         |  5 ++-
 .../emqx_bridge_hstreamdb_connector_info.erl  | 43 +++++++++++++++++++
 .../src/emqx_connector_info.erl               |  3 +-
 .../src/schema/emqx_connector_ee_schema.erl   | 12 ------
 .../src/schema/emqx_connector_schema.erl      |  2 -
 5 files changed, 49 insertions(+), 16 deletions(-)
 create mode 100644 apps/emqx_bridge_hstreamdb/src/emqx_bridge_hstreamdb_connector_info.erl

diff --git a/apps/emqx_bridge_hstreamdb/src/emqx_bridge_hstreamdb.app.src b/apps/emqx_bridge_hstreamdb/src/emqx_bridge_hstreamdb.app.src
index 84c09fe3a..f9f80b1d0 100644
--- a/apps/emqx_bridge_hstreamdb/src/emqx_bridge_hstreamdb.app.src
+++ b/apps/emqx_bridge_hstreamdb/src/emqx_bridge_hstreamdb.app.src
@@ -8,7 +8,10 @@
         emqx_resource,
         hstreamdb_erl
     ]},
-    {env, [{emqx_action_info_modules, [emqx_bridge_hstreamdb_action_info]}]},
+    {env, [
+        {emqx_action_info_modules, [emqx_bridge_hstreamdb_action_info]},
+        {emqx_connector_info_modules, [emqx_bridge_hstreamdb_connector_info]}
+    ]},
     {modules, []},
     {links, []}
 ]}.
diff --git a/apps/emqx_bridge_hstreamdb/src/emqx_bridge_hstreamdb_connector_info.erl b/apps/emqx_bridge_hstreamdb/src/emqx_bridge_hstreamdb_connector_info.erl
new file mode 100644
index 000000000..8fc4f61bf
--- /dev/null
+++ b/apps/emqx_bridge_hstreamdb/src/emqx_bridge_hstreamdb_connector_info.erl
@@ -0,0 +1,43 @@
+%%--------------------------------------------------------------------
+%% Copyright (c) 2022-2024 EMQ Technologies Co., Ltd. All Rights Reserved.
+%%--------------------------------------------------------------------
+
+-module(emqx_bridge_hstreamdb_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() ->
+    hstreamdb.
+
+bridge_types() ->
+    [hstreamdb].
+
+resource_callback_module() ->
+    emqx_bridge_hstreamdb_connector.
+
+config_schema() ->
+    {hstreamdb,
+        hoconsc:mk(
+            hoconsc:map(name, hoconsc:ref(emqx_bridge_hstreamdb, "config_connector")),
+            #{
+                desc => <<"HStreamDB Connector Config">>,
+                required => false
+            }
+        )}.
+
+schema_module() ->
+    emqx_bridge_hstreamdb.
+
+api_schema(Method) ->
+    emqx_connector_schema:api_ref(
+        emqx_bridge_hstreamdb, <<"hstreamdb">>, Method ++ "_connector"
+    ).
diff --git a/apps/emqx_connector/src/emqx_connector_info.erl b/apps/emqx_connector/src/emqx_connector_info.erl
index 86def6da7..30287a0a1 100644
--- a/apps/emqx_connector/src/emqx_connector_info.erl
+++ b/apps/emqx_connector/src/emqx_connector_info.erl
@@ -60,7 +60,8 @@ hard_coded_connector_info_modules_ee() ->
         emqx_bridge_azure_event_hub_connector_info,
         emqx_bridge_confluent_producer_connector_info,
         emqx_bridge_gcp_pubsub_consumer_connector_info,
-        emqx_bridge_gcp_pubsub_producer_connector_info
+        emqx_bridge_gcp_pubsub_producer_connector_info,
+        emqx_bridge_hstreamdb_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 1ae8794cf..0e6634d79 100644
--- a/apps/emqx_connector/src/schema/emqx_connector_ee_schema.erl
+++ b/apps/emqx_connector/src/schema/emqx_connector_ee_schema.erl
@@ -21,8 +21,6 @@
 
 resource_type(Type) when is_binary(Type) ->
     resource_type(binary_to_atom(Type, utf8));
-resource_type(hstreamdb) ->
-    emqx_bridge_hstreamdb_connector;
 resource_type(kafka_consumer) ->
     emqx_bridge_kafka_impl_consumer;
 resource_type(kafka_producer) ->
@@ -106,14 +104,6 @@ fields(connectors) ->
 
 connector_structs() ->
     [
-        {hstreamdb,
-            mk(
-                hoconsc:map(name, ref(emqx_bridge_hstreamdb, "config_connector")),
-                #{
-                    desc => <<"HStreamDB Connector Config">>,
-                    required => false
-                }
-            )},
         {kafka_consumer,
             mk(
                 hoconsc:map(name, ref(emqx_bridge_kafka_consumer_schema, "config_connector")),
@@ -319,7 +309,6 @@ connector_structs() ->
 
 schema_modules() ->
     [
-        emqx_bridge_hstreamdb,
         emqx_bridge_kafka,
         emqx_bridge_kafka_consumer_schema,
         emqx_bridge_kinesis,
@@ -351,7 +340,6 @@ api_schemas(Method) ->
     [
         %% We need to map the `type' field of a request (binary) to a
         %% connector schema module.
-        api_ref(emqx_bridge_hstreamdb, <<"hstreamdb">>, Method ++ "_connector"),
         api_ref(emqx_bridge_kafka, <<"kafka_producer">>, Method ++ "_connector"),
         api_ref(emqx_bridge_kafka_consumer_schema, <<"kafka_consumer">>, Method ++ "_connector"),
         api_ref(emqx_bridge_kinesis, <<"kinesis">>, Method ++ "_connector"),
diff --git a/apps/emqx_connector/src/schema/emqx_connector_schema.erl b/apps/emqx_connector/src/schema/emqx_connector_schema.erl
index 4b8cf01e6..ee52c7361 100644
--- a/apps/emqx_connector/src/schema/emqx_connector_schema.erl
+++ b/apps/emqx_connector/src/schema/emqx_connector_schema.erl
@@ -130,8 +130,6 @@ connector_info_schema_modules() ->
 %% from the latest connector type name.
 connector_type_to_bridge_types(http) ->
     [webhook, http];
-connector_type_to_bridge_types(hstreamdb) ->
-    [hstreamdb];
 connector_type_to_bridge_types(kafka_consumer) ->
     [kafka_consumer];
 connector_type_to_bridge_types(kafka_producer) ->