Move normalizeParameter to private method

Author: cinemast

include/jsonrpccxx/dispatcher.hpp

@@ -51,7 +51,7 @@ namespace jsonrpccxx {
         throw JsonRpcException(-32601, "method not found: " + name);
       }
       try {
-        return method->second(normalizeParameter(name, params));
+        return method->second(normalize_parameter(name, params));
       } catch (json::type_error &e) {
         throw JsonRpcException(-32602, "invalid parameter: " + std::string(e.what()));
       } catch (JsonRpcException &e) {
@@ -65,15 +65,21 @@ namespace jsonrpccxx {
         throw JsonRpcException(-32601, "notification not found: " + name);
       }
       try {
-        notification->second(normalizeParameter(name, params));
+        notification->second(normalize_parameter(name, params));
       } catch (json::type_error &e) {
         throw JsonRpcException(-32602, "invalid parameter: " + std::string(e.what()));
       } catch (JsonRpcException &e) {
         throw process_type_error(name, e);
       }
     }
 
-    inline json normalizeParameter(const std::string &name, const json &params) {
+  private:
+    std::map<std::string, MethodHandle> methods;
+    std::map<std::string, NotificationHandle> notifications;
+    std::map<std::string, NamedParamMapping> mapping;
+
+    inline bool contains(const std::string &name) { return (methods.find(name) != methods.end() || notifications.find(name) != notifications.end()); }
+    inline json normalize_parameter(const std::string &name, const json &params) {
       if (params.type() == json::value_t::array) {
         return params;
       } else if (params.type() == json::value_t::object) {
@@ -91,11 +97,5 @@ namespace jsonrpccxx {
       }
       throw JsonRpcException(-32600, "invalid request: params field must be an array, object");
     }
-
-  private:
-    std::map<std::string, MethodHandle> methods;
-    std::map<std::string, NotificationHandle> notifications;
-    std::map<std::string, NamedParamMapping> mapping;
-    inline bool contains(const std::string &name) { return (methods.find(name) != methods.end() || notifications.find(name) != notifications.end()); }
   };
 } // namespace jsonrpccxx

test/server.cpp

@@ -27,6 +27,8 @@ TEST_CASE_METHOD(Server2, "v2_malformed_requests", TEST_MODULE) {
 
   connector.SendRawRequest("dfasdf");
   connector.VerifyMethodError(-32700, "parse error", nullptr);
+  connector.SendRawRequest("true");
+  connector.VerifyMethodError(-32600, "invalid request: expected array or object", nullptr);
 
   connector.SendRequest({{"id", true}, {"method", name}, {"params", params}, {"jsonrpc", "2.0"}});
   connector.VerifyMethodError(-32600, "invalid request: id field must be a number, string or null", nullptr);
@@ -115,6 +117,7 @@ TEST_CASE_METHOD(Server2, "v2_invocations", TEST_MODULE) {
   REQUIRE(!server.Add("dirty_method2", GetHandle(&TestServer::dirty_method2, t), {"a", "b"}));
   REQUIRE(!server.Add("rpc.something", GetHandle(&TestServer::dirty_method2, t), {"a", "b"}));
   REQUIRE(!server.Add("rpc.", GetHandle(&TestServer::dirty_method2, t), {"a", "b"}));
+  REQUIRE(!server.Add("rpc.somenotification", GetHandle(&TestServer::dirty_notification, t), {"a", "b"}));
   REQUIRE(server.Add("rpc", GetHandle(&TestServer::dirty_method2, t), {"a", "b"}));
 
   connector.CallMethod(1, "add_function", {{"a", 3}, {"b", 4}});