QHttpServerResponse: use compact mode for json objects

Change-Id: Ia01f2f9a1483b326bc92eda20045f9764616cf66
Reviewed-by: Tasuku Suzuki <tasuku.suzuki@qbc.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>

2 files changed, 17 insertions, 1 deletions

diff --git a/src/httpserver/qhttpserverresponse.cpp b/src/httpserver/qhttpserverresponse.cpp
index 72ec7ac..9b04ce0 100644
--- a/src/httpserver/qhttpserverresponse.cpp
+++ b/src/httpserver/qhttpserverresponse.cpp
@@ -71,7 +71,8 @@ QHttpServerResponse::QHttpServerResponse(const QByteArray &data)
 }
 
 QHttpServerResponse::QHttpServerResponse(const QJsonObject &data)
-    : QHttpServerResponse(mimeApplicationJson, QJsonDocument(data).toJson())
+    : QHttpServerResponse(mimeApplicationJson,
+                          QJsonDocument(data).toJson(QJsonDocument::Compact))
 {
 }
 
diff --git a/tests/auto/qhttpserver/tst_qhttpserver.cpp b/tests/auto/qhttpserver/tst_qhttpserver.cpp
index dd1e593..69b176c 100644
--- a/tests/auto/qhttpserver/tst_qhttpserver.cpp
+++ b/tests/auto/qhttpserver/tst_qhttpserver.cpp
@@ -42,6 +42,8 @@
 #include <QtCore/qbytearray.h>
 #include <QtCore/qdatetime.h>
 #include <QtCore/qmetaobject.h>
+#include <QtCore/qjsonobject.h>
+#include <QtCore/qjsonvalue.h>
 
 #include <QtNetwork/qnetworkaccessmanager.h>
 #include <QtNetwork/qnetworkreply.h>
@@ -196,6 +198,13 @@ void tst_QHttpServer::initTestCase()
         return QHttpServerResponse::fromFile(QFINDTESTDATA(QLatin1String("data/") + file));
     });
 
+    httpserver.route("/json-object/", [] () {
+        return QJsonObject{
+            {"property", "test"},
+            {"value", 1}
+        };
+    });
+
     urlBase = QStringLiteral("http://localhost:%1%2").arg(httpserver.listen());
 }
 
@@ -360,6 +369,12 @@ void tst_QHttpServer::routeGet_data()
         << 200
         << "application/json"
         << "{ \"key\": \"value\" }";
+
+    QTest::addRow("json-object")
+        << "/json-object/"
+        << 200
+        << "application/json"
+        << "{\"property\":\"test\",\"value\":1}";
 }
 
 void tst_QHttpServer::routeGet()