From 66c08bdc8b3b88baf526fa372f6453914499fa9b Mon Sep 17 00:00:00 2001
From: JianBo He <heeejianbo@gmail.com>
Date: Wed, 27 Apr 2022 16:12:51 +0800
Subject: [PATCH] chore(gw): add default value for lwm2m gateway

---
 apps/emqx_gateway/src/emqx_gateway_schema.erl | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/apps/emqx_gateway/src/emqx_gateway_schema.erl b/apps/emqx_gateway/src/emqx_gateway_schema.erl
index 686ba1cc7..83f51d110 100644
--- a/apps/emqx_gateway/src/emqx_gateway_schema.erl
+++ b/apps/emqx_gateway/src/emqx_gateway_schema.erl
@@ -103,6 +103,7 @@ fields(gateway) ->
 fields(stomp) ->
     [
         {frame, sc(ref(stomp_frame))},
+        {mountpoint, mountpoint()},
         {listeners, sc(ref(tcp_listeners), #{desc => ?DESC(tcp_listeners)})}
     ] ++ gateway_common_options();
 fields(stomp_frame) ->
@@ -177,6 +178,7 @@ fields(mqttsn) ->
                     desc => ?DESC(mqttsn_predefined)
                 }
             )},
+        {mountpoint, mountpoint()},
         {listeners, sc(ref(udp_listeners), #{desc => ?DESC(udp_listeners)})}
     ] ++ gateway_common_options();
 fields(mqttsn_predefined) ->
@@ -235,6 +237,7 @@ fields(coap) ->
                     desc => ?DESC(coap_publish_qos)
                 }
             )},
+        {mountpoint, mountpoint()},
         {listeners,
             sc(
                 ref(udp_listeners),
@@ -302,6 +305,7 @@ fields(lwm2m) ->
                     desc => ?DESC(lwm2m_translators)
                 }
             )},
+        {mountpoint, mountpoint("lwm2m/${endpoint_name}/")},
         {listeners, sc(ref(udp_listeners), #{desc => ?DESC(udp_listeners)})}
     ] ++ gateway_common_options();
 fields(exproto) ->
@@ -322,6 +326,7 @@ fields(exproto) ->
                     desc => ?DESC(exproto_handler)
                 }
             )},
+        {mountpoint, mountpoint()},
         {listeners, sc(ref(tcp_udp_listeners), #{desc => ?DESC(tcp_udp_listeners)})}
     ] ++ gateway_common_options();
 fields(exproto_grpc_server) ->
@@ -592,15 +597,6 @@ gateway_common_options() ->
                     desc => ?DESC(gateway_common_idle_timeout)
                 }
             )},
-        {mountpoint,
-            sc(
-                binary(),
-                #{
-                    default => <<>>,
-                    %% TODO: variable support?
-                    desc => ?DESC(gateway_common_mountpoint)
-                }
-            )},
         {clientinfo_override,
             sc(
                 ref(clientinfo_override),
@@ -609,6 +605,17 @@ gateway_common_options() ->
         {?EMQX_AUTHENTICATION_CONFIG_ROOT_NAME_ATOM, authentication_schema()}
     ].
 
+mountpoint() ->
+    mountpoint(<<>>).
+mountpoint(Default) ->
+    sc(
+        binary(),
+        #{
+            default => Default,
+            desc => ?DESC(gateway_common_mountpoint)
+        }
+    ).
+
 common_listener_opts() ->
     [
         {enable,