Merge pull request #405 from quotient-im/kitsune-basejob-store-json-response

Store JSON response in BaseJob + tweaks to the generated code

6 files changed, 29 insertions, 80 deletions

diff --git a/lib/csapi/definitions/wellknown/full.cpp b/lib/csapi/definitions/wellknown/full.cpp
deleted file mode 100644
index 595db0e5..00000000
--- a/lib/csapi/definitions/wellknown/full.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/******************************************************************************
- * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN
- */
-
-#include "full.h"
-
-using namespace Quotient;
-
-void JsonObjectConverter<DiscoveryInformation>::dumpTo(
-    QJsonObject& jo, const DiscoveryInformation& pod)
-{
-    fillJson(jo, pod.additionalProperties);
-    addParam<>(jo, QStringLiteral("m.homeserver"), pod.homeserver);
-    addParam<IfNotEmpty>(jo, QStringLiteral("m.identity_server"),
-                         pod.identityServer);
-}
-
-void JsonObjectConverter<DiscoveryInformation>::fillFrom(
-    QJsonObject jo, DiscoveryInformation& result)
-{
-    fromJson(jo.take("m.homeserver"_ls), result.homeserver);
-    fromJson(jo.take("m.identity_server"_ls), result.identityServer);
-    fromJson(jo, result.additionalProperties);
-}
diff --git a/lib/csapi/definitions/wellknown/full.h b/lib/csapi/definitions/wellknown/full.h
index 88d7da79..a0ef2076 100644
--- a/lib/csapi/definitions/wellknown/full.h
+++ b/lib/csapi/definitions/wellknown/full.h
@@ -9,13 +9,7 @@
 #include "csapi/definitions/wellknown/homeserver.h"
 #include "csapi/definitions/wellknown/identity_server.h"
 
-#include <QtCore/QHash>
-#include <QtCore/QJsonObject>
-
 namespace Quotient {
-
-// Data structures
-
 /// Used by clients to determine the homeserver, identity server, and other
 /// optional components they should be interacting with.
 struct DiscoveryInformation {
@@ -33,8 +27,19 @@ struct DiscoveryInformation {
 
 template <>
 struct JsonObjectConverter<DiscoveryInformation> {
-    static void dumpTo(QJsonObject& jo, const DiscoveryInformation& pod);
-    static void fillFrom(QJsonObject jo, DiscoveryInformation& pod);
+    static void dumpTo(QJsonObject& jo, const DiscoveryInformation& pod)
+    {
+        fillJson(jo, pod.additionalProperties);
+        addParam<>(jo, QStringLiteral("m.homeserver"), pod.homeserver);
+        addParam<IfNotEmpty>(jo, QStringLiteral("m.identity_server"),
+                             pod.identityServer);
+    }
+    static void fillFrom(QJsonObject jo, DiscoveryInformation& pod)
+    {
+        fromJson(jo.take("m.homeserver"_ls), pod.homeserver);
+        fromJson(jo.take("m.identity_server"_ls), pod.identityServer);
+        fromJson(jo, pod.additionalProperties);
+    }
 };
 
 } // namespace Quotient
diff --git a/lib/csapi/definitions/wellknown/homeserver.cpp b/lib/csapi/definitions/wellknown/homeserver.cpp
deleted file mode 100644
index 7b87aa95..00000000
--- a/lib/csapi/definitions/wellknown/homeserver.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/******************************************************************************
- * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN
- */
-
-#include "homeserver.h"
-
-using namespace Quotient;
-
-void JsonObjectConverter<HomeserverInformation>::dumpTo(
-    QJsonObject& jo, const HomeserverInformation& pod)
-{
-    addParam<>(jo, QStringLiteral("base_url"), pod.baseUrl);
-}
-
-void JsonObjectConverter<HomeserverInformation>::fillFrom(
-    const QJsonObject& jo, HomeserverInformation& result)
-{
-    fromJson(jo.value("base_url"_ls), result.baseUrl);
-}
diff --git a/lib/csapi/definitions/wellknown/homeserver.h b/lib/csapi/definitions/wellknown/homeserver.h
index 7607c8b5..5cfaca24 100644
--- a/lib/csapi/definitions/wellknown/homeserver.h
+++ b/lib/csapi/definitions/wellknown/homeserver.h
@@ -7,9 +7,6 @@
 #include "converters.h"
 
 namespace Quotient {
-
-// Data structures
-
 /// Used by clients to discover homeserver information.
 struct HomeserverInformation {
     /// The base URL for the homeserver for client-server connections.
@@ -18,8 +15,14 @@ struct HomeserverInformation {
 
 template <>
 struct JsonObjectConverter<HomeserverInformation> {
-    static void dumpTo(QJsonObject& jo, const HomeserverInformation& pod);
-    static void fillFrom(const QJsonObject& jo, HomeserverInformation& pod);
+    static void dumpTo(QJsonObject& jo, const HomeserverInformation& pod)
+    {
+        addParam<>(jo, QStringLiteral("base_url"), pod.baseUrl);
+    }
+    static void fillFrom(const QJsonObject& jo, HomeserverInformation& pod)
+    {
+        fromJson(jo.value("base_url"_ls), pod.baseUrl);
+    }
 };
 
 } // namespace Quotient
diff --git a/lib/csapi/definitions/wellknown/identity_server.cpp b/lib/csapi/definitions/wellknown/identity_server.cpp
deleted file mode 100644
index 3b2a5720..00000000
--- a/lib/csapi/definitions/wellknown/identity_server.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/******************************************************************************
- * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN
- */
-
-#include "identity_server.h"
-
-using namespace Quotient;
-
-void JsonObjectConverter<IdentityServerInformation>::dumpTo(
-    QJsonObject& jo, const IdentityServerInformation& pod)
-{
-    addParam<>(jo, QStringLiteral("base_url"), pod.baseUrl);
-}
-
-void JsonObjectConverter<IdentityServerInformation>::fillFrom(
-    const QJsonObject& jo, IdentityServerInformation& result)
-{
-    fromJson(jo.value("base_url"_ls), result.baseUrl);
-}
diff --git a/lib/csapi/definitions/wellknown/identity_server.h b/lib/csapi/definitions/wellknown/identity_server.h
index d272e527..3bd07bd1 100644
--- a/lib/csapi/definitions/wellknown/identity_server.h
+++ b/lib/csapi/definitions/wellknown/identity_server.h
@@ -7,9 +7,6 @@
 #include "converters.h"
 
 namespace Quotient {
-
-// Data structures
-
 /// Used by clients to discover identity server information.
 struct IdentityServerInformation {
     /// The base URL for the identity server for client-server connections.
@@ -18,8 +15,14 @@ struct IdentityServerInformation {
 
 template <>
 struct JsonObjectConverter<IdentityServerInformation> {
-    static void dumpTo(QJsonObject& jo, const IdentityServerInformation& pod);
-    static void fillFrom(const QJsonObject& jo, IdentityServerInformation& pod);
+    static void dumpTo(QJsonObject& jo, const IdentityServerInformation& pod)
+    {
+        addParam<>(jo, QStringLiteral("base_url"), pod.baseUrl);
+    }
+    static void fillFrom(const QJsonObject& jo, IdentityServerInformation& pod)
+    {
+        fromJson(jo.value("base_url"_ls), pod.baseUrl);
+    }
 };
 
 } // namespace Quotient