Replace jsx with built-in JSON module (#13)

Author: whatyouhide

.github/workflows/ci.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        otp_version: ['27.1', '26.2']
+        otp_version: ['27.1']
 
     steps:
       - uses: actions/checkout@v4
@@ -40,7 +40,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        otp_version: ['27.1', '26.2']
+        otp_version: ['27.1']
 
     steps:
       - uses: actions/checkout@v4

rebar.config

@@ -14,7 +14,6 @@
     {lager, "3.9.2"},
     folsom,
     cowboy,
-    jsx,
     dns_erlang,
     erldns
 ]}.

rebar.lock

@@ -8,7 +8,6 @@
  {<<"folsom">>,{pkg,<<"folsom">>,<<"1.0.0">>},0},
  {<<"goldrush">>,{pkg,<<"goldrush">>,<<"0.1.9">>},1},
  {<<"iso8601">>,{pkg,<<"iso8601">>,<<"1.3.4">>},1},
- {<<"jsx">>,{pkg,<<"jsx">>,<<"3.1.0">>},0},
  {<<"lager">>,{pkg,<<"lager">>,<<"3.9.2">>},0},
  {<<"ranch">>,{pkg,<<"ranch">>,<<"1.8.0">>},1},
  {<<"recon">>,{pkg,<<"recon">>,<<"2.5.5">>},1}]}.
@@ -23,7 +22,6 @@
  {<<"folsom">>, <<"50ECC998D2149939F1D5E0AA3E32788F8ED16A58E390D81B5C0BE4CC4EF25589">>},
  {<<"goldrush">>, <<"F06E5D5F1277DA5C413E84D5A2924174182FB108DABB39D5EC548B27424CD106">>},
  {<<"iso8601">>, <<"7B1F095F86F6CF65E1E5A77872E8E8BF69BD58D4C3A415B3F77D9CC9423ECBB9">>},
- {<<"jsx">>, <<"D12516BAA0BB23A59BB35DCCAF02A1BD08243FCBB9EFE24F2D9D056CCFF71268">>},
  {<<"lager">>, <<"4CAB289120EB24964E3886BD22323CB5FEFE4510C076992A23AD18CF85413D8C">>},
  {<<"ranch">>, <<"8C7A100A139FD57F17327B6413E4167AC559FBC04CA7448E9BE9057311597A1D">>},
  {<<"recon">>, <<"C108A4C406FA301A529151A3BB53158CADC4064EC0C5F99B03DDB8C0E4281BDF">>}]},
@@ -37,7 +35,6 @@
  {<<"folsom">>, <<"DD6AB97278E94F9E4CFC43E188224A7B8C7EAEC0DD2E935007005177F3EEBB0E">>},
  {<<"goldrush">>, <<"99CB4128CFFCB3227581E5D4D803D5413FA643F4EB96523F77D9E6937D994CEB">>},
  {<<"iso8601">>, <<"A334469C07F1C219326BC891A95F5EEC8EB12DD8071A3FFF56A7843CB20FAE34">>},
- {<<"jsx">>, <<"0C5CC8FDC11B53CC25CF65AC6705AD39E54ECC56D1C22E4ADB8F5A53FB9427F3">>},
  {<<"lager">>, <<"7F904D9E87A8CB7E66156ED31768D1C8E26EBA1D54F4BC85B1AA4AC1F6340C28">>},
  {<<"ranch">>, <<"49FBCFD3682FAB1F5D109351B61257676DA1A2FDBE295904176D5E521A2DDFE5">>},
  {<<"recon">>, <<"632A6F447DF7CCC1A4A10BDCFCE71514412B16660FE59DECA0FCF0AA3C054404">>}]}

src/erldns_admin_root_handler.erl

@@ -47,17 +47,18 @@ to_text(Req, State) ->
 to_json(Req, State) ->
     ZoneNamesAndVersionsForJson = lists:map(
         fun({Name, Version}) ->
-            [{<<"name">>, Name}, {<<"version">>, Version}]
+            #{<<"name">> => Name, <<"version">> => Version}
         end,
         erldns_zone_cache:zone_names_and_versions()
     ),
 
-    Body = jsx:encode([
-        {<<"erldns">>, [
-            {<<"zones">>, [
-                {<<"count">>, length(ZoneNamesAndVersionsForJson)},
-                {<<"versions">>, ZoneNamesAndVersionsForJson}
-            ]}
-        ]}
-    ]),
-    {Body, Req, State}.
+    Body = json:encode(#{
+        <<"erldns">> => #{
+            <<"zones">> => #{
+                <<"count">> => length(ZoneNamesAndVersionsForJson),
+                <<"versions">> => ZoneNamesAndVersionsForJson
+            }
+        }
+    }),
+
+    {iolist_to_binary(Body), Req, State}.

src/erldns_admin_zone_control_handler.erl

@@ -55,5 +55,5 @@ to_json(Req, State) ->
     case Action of
         _ ->
             lager:debug("Unsupported action: ~p (name: ~p)", [Action, Name]),
-            {jsx:encode([]), Req, State}
+            {json:encode(#{}), Req, State}
     end.