ETM-Schurig
/
nymea
mirror of https://github.com/nymea/nymea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Standardize json traffic

pull/135/head
Simon Stürz 2017-09-30 10:58:15 +02:00 committed by Michael Zanetti
parent 900f409485
commit edc3188077
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libguh-core/jsonrpc/jsonrpcserver.cpp
View File

@ -266,7 +266,7 @@ void JsonRPCServer::sendResponse(TransportInterface *interface, const QUuid &cli
response.insert("status", "success");
response.insert("params", params);
interface->sendData(clientId, QJsonDocument::fromVariant(response).toJson());
interface->sendData(clientId, QJsonDocument::fromVariant(response).toJson(QJsonDocument::Compact));
}
/*! Send a JSON error response to the client with the given \a clientId,
@ -279,7 +279,7 @@ void JsonRPCServer::sendErrorResponse(TransportInterface *interface, const QUuid
errorResponse.insert("status", "error");
errorResponse.insert("error", error);
interface->sendData(clientId, QJsonDocument::fromVariant(errorResponse).toJson());
interface->sendData(clientId, QJsonDocument::fromVariant(errorResponse).toJson(QJsonDocument::Compact));
}
void JsonRPCServer::sendUnauthorizedResponse(TransportInterface *interface, const QUuid &clientId, int commandId, const QString &error)
@ -289,7 +289,7 @@ void JsonRPCServer::sendUnauthorizedResponse(TransportInterface *interface, cons
errorResponse.insert("status", "unauthorized");
errorResponse.insert("error", error);
interface->sendData(clientId, QJsonDocument::fromVariant(errorResponse).toJson());
interface->sendData(clientId, QJsonDocument::fromVariant(errorResponse).toJson(QJsonDocument::Compact));
}
void JsonRPCServer::setup()
@ -399,8 +399,8 @@ QString JsonRPCServer::formatAssertion(const QString &targetNamespace, const QSt
QJsonDocument doc2 = QJsonDocument::fromVariant(data);
return QString("\nMethod: %1\nTemplate: %2\nValue: %3")
.arg(targetNamespace + "." + method)
.arg(QString(doc.toJson()))
.arg(QString(doc2.toJson()));
.arg(QString(doc.toJson(QJsonDocument::Compact)))
.arg(QString(doc2.toJson(QJsonDocument::Compact)));
}
void JsonRPCServer::sendNotification(const QVariantMap &params)
@ -414,7 +414,7 @@ void JsonRPCServer::sendNotification(const QVariantMap &params)
notification.insert("params", params);
foreach (TransportInterface *interface, m_interfaces.keys()) {
interface->sendData(m_clients.keys(true), QJsonDocument::fromVariant(notification).toJson());
interface->sendData(m_clients.keys(true), QJsonDocument::fromVariant(notification).toJson(QJsonDocument::Compact));
}
}
@ -461,7 +461,7 @@ void JsonRPCServer::clientConnected(const QUuid &clientId)
handshake.insert("protocol version", JSON_PROTOCOL_VERSION);
handshake.insert("initialSetupRequired", (interface->configuration().authenticationEnabled ? GuhCore::instance()->userManager()->users().isEmpty() : false));
handshake.insert("authenticationRequired", interface->configuration().authenticationEnabled);
interface->sendData(clientId, QJsonDocument::fromVariant(handshake).toJson());
interface->sendData(clientId, QJsonDocument::fromVariant(handshake).toJson(QJsonDocument::Compact));
}
void JsonRPCServer::clientDisconnected(const QUuid &clientId)

4
libguh-core/jsonrpc/jsontypes.cpp
View File

@ -1572,7 +1572,7 @@ QPair<bool, QString> JsonTypes::validateMap(const QVariantMap &templateMap, cons
qCWarning(dcJsonRpc) << "Expected: " << templateMap;
qCWarning(dcJsonRpc) << "Got: " << map;
QJsonDocument jsonDoc = QJsonDocument::fromVariant(map);
return report(false, QString("Missing key %1 in %2").arg(key).arg(QString(jsonDoc.toJson())));
return report(false, QString("Missing key %1 in %2").arg(key).arg(QString(jsonDoc.toJson(QJsonDocument::Compact))));
}
if (map.contains(strippedKey)) {
QPair<bool, QString> result = validateVariant(templateMap.value(key), map.value(strippedKey));
@ -1590,7 +1590,7 @@ QPair<bool, QString> JsonTypes::validateMap(const QVariantMap &templateMap, cons
if (!templateMap.contains(key) && !templateMap.contains(optKey)) {
qCWarning(dcJsonRpc) << "Forbidden param" << key << "in params";
QJsonDocument jsonDoc = QJsonDocument::fromVariant(map);
return report(false, QString("Forbidden key \"%1\" in %2").arg(key).arg(QString(jsonDoc.toJson())));
return report(false, QString("Forbidden key \"%1\" in %2").arg(key).arg(QString(jsonDoc.toJson(QJsonDocument::Compact))));
}
}

2
libguh-core/mocktcpserver.cpp
View File

@ -50,7 +50,7 @@ void MockTcpServer::sendData(const QUuid &clientId, const QByteArray &data)
void MockTcpServer::sendData(const QList<QUuid> &clients, const QByteArray &data)
{
foreach (const QUuid &clientId, clients) {
sendData(clientId, data);
sendData(clientId, data + '\n');
}
}

2
libguh-core/tcpserver.cpp
View File

@ -75,7 +75,7 @@ void TcpServer::sendData(const QUuid &clientId, const QByteArray &data)
QTcpSocket *client = 0;
client = m_clientList.value(clientId);
if (client) {
client->write(data);
client->write(data + '\n');
}
}

2
libguh-core/websocketserver.cpp
View File

@ -86,7 +86,7 @@ void WebSocketServer::sendData(const QUuid &clientId, const QByteArray &data)
QWebSocket *client = 0;
client = m_clientList.value(clientId);
if (client) {
client->sendTextMessage(data);
client->sendTextMessage(data + '\n');
}
}

2
tests/auto/guhtestbase.cpp
View File

@ -220,7 +220,7 @@ QVariant GuhTestBase::injectAndWait(const QString &method, const QVariantMap &pa
QJsonDocument jsonDoc = QJsonDocument::fromVariant(call);
QSignalSpy spy(m_mockTcpServer, SIGNAL(outgoingData(QUuid,QByteArray)));
m_mockTcpServer->injectData(m_clientId, jsonDoc.toJson());
m_mockTcpServer->injectData(m_clientId, jsonDoc.toJson(QJsonDocument::Compact));
if (spy.count() == 0) {
spy.wait();

2
tests/auto/websocketserver/testwebsocketserver.cpp
View File

@ -183,7 +183,7 @@ QVariant TestWebSocketServer::injectSocketAndWait(const QString &method, const Q
}
QSignalSpy spy(socket, SIGNAL(textMessageReceived(QString)));
socket->sendTextMessage(QString(jsonDoc.toJson()));
socket->sendTextMessage(QString(jsonDoc.toJson(QJsonDocument::Compact)));
spy.wait();
socket->close();