Feature/arbitrary json types (#25)

* Test for arbitrary json params (#24)
* Allow unchecked RPC calls (#24)
* Remove Test Modules
* Update OSX Toolchain
* Update OSX Toolchain

Author: cinemast

.circleci/config.yml

@@ -45,7 +45,7 @@ jobs:
           command: ./example-warehouse
   "build-osx-clang":
     macos:
-      xcode: "10.2.1"
+      xcode: "12.4.0"
     steps:
       - checkout
       - run:

include/jsonrpccxx/typemapper.hpp

@@ -8,9 +8,8 @@
 #include <vector>
 
 namespace jsonrpccxx {
-  typedef std::vector<json> Parameters;
-  typedef std::function<json(const Parameters &)> MethodHandle;
-  typedef std::function<void(const Parameters &)> NotificationHandle;
+  typedef std::function<json(const json &)> MethodHandle;
+  typedef std::function<void(const json &)> NotificationHandle;
 
   // Workaround due to forbidden partial template function specialisation
   template <typename T>
@@ -89,12 +88,9 @@ namespace jsonrpccxx {
     }
   }
 
-  //
-  // Mapping for methods
-  //
   template <typename ReturnType, typename... ParamTypes, std::size_t... index>
   MethodHandle createMethodHandle(std::function<ReturnType(ParamTypes...)> method, std::index_sequence<index...>) {
-    MethodHandle handle = [method](const Parameters &params) -> json {
+    MethodHandle handle = [method](const json &params) -> json {
       size_t actualSize = params.size();
       size_t formalSize = sizeof...(ParamTypes);
       // TODO: add lenient mode for backwards compatible additional params
@@ -122,12 +118,19 @@ namespace jsonrpccxx {
     return GetHandle(std::function<ReturnType(ParamTypes...)>(f));
   }
 
+  inline MethodHandle GetUncheckedHandle(std::function<json(const json&)> f) {
+    MethodHandle handle = [f](const json &params) -> json {
+      return f(params);
+    };
+    return handle;
+  }
+
   //
   // Notification mapping
   //
   template <typename... ParamTypes, std::size_t... index>
   NotificationHandle createNotificationHandle(std::function<void(ParamTypes...)> method, std::index_sequence<index...>) {
-    NotificationHandle handle = [method](const Parameters &params) -> void {
+    NotificationHandle handle = [method](const json &params) -> void {
       size_t actualSize = params.size();
       size_t formalSize = sizeof...(ParamTypes);
       // TODO: add lenient mode for backwards compatible additional params
@@ -156,9 +159,13 @@ namespace jsonrpccxx {
     return GetHandle(std::function<void(ParamTypes...)>(f));
   }
 
-  //
-  // Mapping for classes
-  //
+  inline NotificationHandle GetUncheckedNotificationHandle(std::function<void(const json&)> f) {
+    NotificationHandle handle = [f](const json &params) -> void {
+      f(params);
+    };
+    return handle;
+  }
+
   template <typename T, typename ReturnType, typename... ParamTypes>
   MethodHandle methodHandle(ReturnType (T::*method)(ParamTypes...), T &instance) {
     std::function<ReturnType(ParamTypes...)> function = [&instance, method](ParamTypes &&... params) -> ReturnType {
@@ -190,4 +197,4 @@ namespace jsonrpccxx {
     };
     return GetHandle(function);
   }
-} // namespace jsonrpccxx
+}

test/batchclient.cpp

@@ -3,8 +3,6 @@
 #include <iostream>
 #include <jsonrpccxx/batchclient.hpp>
 
-#define TEST_MODULE "[batch]"
-
 using namespace std;
 using namespace jsonrpccxx;
 

test/client.cpp

@@ -3,8 +3,6 @@
 #include <iostream>
 #include <jsonrpccxx/client.hpp>
 
-#define TEST_MODULE "[client]"
-
 using namespace std;
 using namespace jsonrpccxx;
 

test/dispatcher.cpp

@@ -5,8 +5,6 @@
 using namespace jsonrpccxx;
 using namespace std;
 
-#define TEST_MODULE "[dispatcher]"
-
 static string procCache;
 unsigned int add_function(unsigned int a, unsigned int b) { return a + b; }
 void some_procedure(const string &param) { procCache = param; }

test/server.cpp

@@ -6,8 +6,6 @@
 using namespace jsonrpccxx;
 using namespace std;
 
-#define TEST_MODULE "[server]"
-
 struct Server2 {
   JsonRpc2Server server;
   TestServerConnector connector;

test/typemapper.cpp

@@ -6,8 +6,6 @@
 using namespace jsonrpccxx;
 using namespace std;
 
-#define TEST_MODULE "[typemapper]"
-
 static string notifyResult = "";
 
 int add(int a, int b) { return a + b; }
@@ -209,4 +207,23 @@ TEST_CASE("test auto conversion of float to int passed to float method") {
   CHECK(mh(R"([3,3])"_json) == 6.0);
   CHECK(mh(R"([3.0,3.0])"_json) == 6.0);
   CHECK(mh(R"([3.1,3.2])"_json) == doctest::Approx(6.3));
+}
+
+json arbitrary_json(const json& value) {
+  return value;
+}
+
+void arbitrary_json_notification(const json& value) {
+  to_string(value);
+}
+
+TEST_CASE("test json method handles without specific types") {
+  MethodHandle mh = GetUncheckedHandle(&arbitrary_json);
+  CHECK(mh(R"([3,"string"])"_json) == R"([3,"string"])"_json);
+  auto param = R"({"a": "string"})"_json;
+  CHECK(mh(param) == param);
+
+  NotificationHandle nh = GetUncheckedNotificationHandle(&arbitrary_json_notification);
+  nh(R"([3,"string"])"_json);
+  nh(R"({"3": "string"})"_json);
 }

test/warehouseapp.cpp

@@ -3,8 +3,6 @@
 #include "doctest/doctest.h"
 #include "integrationtest.hpp"
 
-#define TEST_MODULE "[integration]"
-
 TEST_CASE_FIXTURE(IntegrationTest, "warehouse_test") {
   WarehouseServer app;
   rpcServer.Add("GetProduct", GetHandle(&WarehouseServer::GetProduct, app));