Move JSON output functionality to socket.

include/QHttpEngine/qhttpsocket.h

@@ -30,6 +30,7 @@
 
 #include "qhttpengine_global.h"
 
+class QJsonDocument;
 class QTcpSocket;
 class QHTTPENGINE_EXPORT QHttpSocketPrivate;
 
@@ -289,6 +290,11 @@ public:
      */
     void writeError(int statusCode, const QByteArray &statusReason = QByteArray());
 
+    /**
+     * @brief Write the specified JSON document to the socket and close it
+     */
+    void writeJson(const QJsonDocument &document, int statusCode = OK);
+
 Q_SIGNALS:
 
     /**

include/QHttpEngine/qobjecthandler.h

@@ -157,11 +157,6 @@ public:
      */
     static bool readJson(QHttpSocket *socket, QJsonDocument &document);
 
-    /**
-     * @brief Write the response to the socket as a JSON document
-     */
-    static void writeJson(QHttpSocket *socket, const QJsonDocument &document);
-
 protected:
 
     /**

src/qhttpsocket.cpp

@@ -22,6 +22,7 @@
 
 #include <cstring>
 
+#include <QJsonDocument>
 #include <QTcpSocket>
 
 #include <QHttpEngine/QHttpParser>
@@ -325,6 +326,16 @@ void QHttpSocket::writeError(int statusCode, const QByteArray &statusReason)
     close();
 }
 
+void QHttpSocket::writeJson(const QJsonDocument &document, int statusCode)
+{
+    QByteArray data = document.toJson();
+    setStatusCode(statusCode);
+    setHeader("Content-Length", QByteArray::number(data.length()));
+    setHeader("Content-Type", "application/json");
+    write(data);
+    close();
+}
+
 qint64 QHttpSocket::readData(char *data, qint64 maxlen)
 {
     // Ensure the connection is in the correct state for reading data

src/qobjecthandler.cpp

@@ -90,15 +90,6 @@ bool QObjectHandler::readJson(QHttpSocket *socket, QJsonDocument &document)
     return true;
 }
 
-void QObjectHandler::writeJson(QHttpSocket *socket, const QJsonDocument &document)
-{
-    QByteArray data = document.toJson();
-    socket->setHeader("Content-Length", QByteArray::number(data.length()));
-    socket->setHeader("Content-Type", "application/json");
-    socket->write(data);
-    socket->close();
-}
-
 void QObjectHandler::process(QHttpSocket *socket, const QString &path)
 {
     // Ensure the method has been registered

tests/TestQObjectHandler.cpp

@@ -45,7 +45,7 @@ public Q_SLOTS:
     void echo(QHttpSocket *socket) {
         QJsonDocument document;
         if (QObjectHandler::readJson(socket, document)) {
-            QObjectHandler::writeJson(socket, document);
+            socket->writeJson(document);
         }
     }
 };