Refactor toJson/fillJson

Both now use through a common JsonConverter<> template class with its
base definition tuned for structs/QJsonObjects and specialisations for
non-object types. This new implementation doesn't work with virtual
fillJson functions yet (so EventContent classes still use toJson as a
member function) and does not cope quite well with non-constructible
objects (you have to specialise JsonConverter<> rather than, more
intuitively, JsonObjectConverter<>), but overall is more streamlined
compared to the previous implementation. It also fixes one important
issue that pushed for a rewrite: the previous implementation was not
working with structure hierarchies at all so (in particular) the Filter
part of CS API was totally disfunctional.

1 files changed, 27 insertions, 24 deletions

diff --git a/lib/csapi/joining.cpp b/lib/csapi/joining.cpp
index 71781154..00d930fa 100644
--- a/lib/csapi/joining.cpp
+++ b/lib/csapi/joining.cpp
@@ -16,15 +16,16 @@ namespace QMatrixClient
 {
     // Converters
 
-    QJsonObject toJson(const JoinRoomByIdJob::ThirdPartySigned& pod)
+    template <> struct JsonObjectConverter<JoinRoomByIdJob::ThirdPartySigned>
     {
-        QJsonObject jo;
-        addParam<>(jo, QStringLiteral("sender"), pod.sender);
-        addParam<>(jo, QStringLiteral("mxid"), pod.mxid);
-        addParam<>(jo, QStringLiteral("token"), pod.token);
-        addParam<>(jo, QStringLiteral("signatures"), pod.signatures);
-        return jo;
-    }
+        static void dumpTo(QJsonObject& jo, const JoinRoomByIdJob::ThirdPartySigned& pod)
+        {
+            addParam<>(jo, QStringLiteral("sender"), pod.sender);
+            addParam<>(jo, QStringLiteral("mxid"), pod.mxid);
+            addParam<>(jo, QStringLiteral("token"), pod.token);
+            addParam<>(jo, QStringLiteral("signatures"), pod.signatures);
+        }
+    };
 } // namespace QMatrixClient
 
 class JoinRoomByIdJob::Private
@@ -58,7 +59,7 @@ BaseJob::Status JoinRoomByIdJob::parseJson(const QJsonDocument& data)
     if (!json.contains("room_id"_ls))
         return { JsonParseError,
             "The key 'room_id' not found in the response" };
-    d->roomId = fromJson<QString>(json.value("room_id"_ls));
+    fromJson(json.value("room_id"_ls), d->roomId);
     return Success;
 }
 
@@ -66,22 +67,24 @@ namespace QMatrixClient
 {
     // Converters
 
-    QJsonObject toJson(const JoinRoomJob::Signed& pod)
+    template <> struct JsonObjectConverter<JoinRoomJob::Signed>
     {
-        QJsonObject jo;
-        addParam<>(jo, QStringLiteral("sender"), pod.sender);
-        addParam<>(jo, QStringLiteral("mxid"), pod.mxid);
-        addParam<>(jo, QStringLiteral("token"), pod.token);
-        addParam<>(jo, QStringLiteral("signatures"), pod.signatures);
-        return jo;
-    }
-
-    QJsonObject toJson(const JoinRoomJob::ThirdPartySigned& pod)
+        static void dumpTo(QJsonObject& jo, const JoinRoomJob::Signed& pod)
+        {
+            addParam<>(jo, QStringLiteral("sender"), pod.sender);
+            addParam<>(jo, QStringLiteral("mxid"), pod.mxid);
+            addParam<>(jo, QStringLiteral("token"), pod.token);
+            addParam<>(jo, QStringLiteral("signatures"), pod.signatures);
+        }
+    };
+
+    template <> struct JsonObjectConverter<JoinRoomJob::ThirdPartySigned>
     {
-        QJsonObject jo;
-        addParam<>(jo, QStringLiteral("signed"), pod.signedData);
-        return jo;
-    }
+        static void dumpTo(QJsonObject& jo, const JoinRoomJob::ThirdPartySigned& pod)
+        {
+            addParam<>(jo, QStringLiteral("signed"), pod.signedData);
+        }
+    };
 } // namespace QMatrixClient
 
 class JoinRoomJob::Private
@@ -123,7 +126,7 @@ BaseJob::Status JoinRoomJob::parseJson(const QJsonDocument& data)
     if (!json.contains("room_id"_ls))
         return { JsonParseError,
             "The key 'room_id' not found in the response" };
-    d->roomId = fromJson<QString>(json.value("room_id"_ls));
+    fromJson(json.value("room_id"_ls), d->roomId);
     return Success;
 }