From c08c22bf6aad9e0552ea11dfcd1530ec81139b98 Mon Sep 17 00:00:00 2001 From: LordGrey Date: Sat, 11 Feb 2023 19:19:41 +0100 Subject: [PATCH] Add missing header and code updates --- libsrc/leddevice/dev_net/ProviderRestApi.cpp | 42 +++++++++----------- libsrc/leddevice/dev_net/ProviderRestApi.h | 2 + 2 files changed, 21 insertions(+), 23 deletions(-) diff --git a/libsrc/leddevice/dev_net/ProviderRestApi.cpp b/libsrc/leddevice/dev_net/ProviderRestApi.cpp index 62806cda..3daa54a6 100644 --- a/libsrc/leddevice/dev_net/ProviderRestApi.cpp +++ b/libsrc/leddevice/dev_net/ProviderRestApi.cpp @@ -256,30 +256,28 @@ httpResponse ProviderRestApi::getResponse(QNetworkReply* const& reply) if (reply->error() == QNetworkReply::NoError) { - if ( httpStatusCode != HttpStatusCode::NoContent ){ - QByteArray replyData = reply->readAll(); + QByteArray replyData = reply->readAll(); - if (!replyData.isEmpty()) + if (!replyData.isEmpty()) + { + QJsonParseError error; + QJsonDocument jsonDoc = QJsonDocument::fromJson(replyData, &error); + + if (error.error != QJsonParseError::NoError) { - QJsonParseError error; - QJsonDocument jsonDoc = QJsonDocument::fromJson(replyData, &error); - - if (error.error != QJsonParseError::NoError) - { - //Received not valid JSON response - response.setError(true); - response.setErrorReason(error.errorString()); - } - else - { - response.setBody(jsonDoc); - } + //Received not valid JSON response + response.setError(true); + response.setErrorReason(error.errorString()); } else - { // Create valid body which is empty - response.setBody(QJsonDocument()); + { + response.setBody(jsonDoc); } } + else + { // Create valid body which is empty + response.setBody(QJsonDocument()); + } } else { @@ -316,12 +314,10 @@ httpResponse ProviderRestApi::getResponse(QNetworkReply* const& reply) { errorReason = reply->errorString(); } - response.setError(true); - response.setErrorReason(errorReason); - } - // Create valid body which is empty - response.setBody(QJsonDocument()); + } + response.setError(true); + response.setErrorReason(errorReason); } return response; } diff --git a/libsrc/leddevice/dev_net/ProviderRestApi.h b/libsrc/leddevice/dev_net/ProviderRestApi.h index 0eec1ba1..8d8e0a83 100644 --- a/libsrc/leddevice/dev_net/ProviderRestApi.h +++ b/libsrc/leddevice/dev_net/ProviderRestApi.h @@ -13,6 +13,8 @@ #include #include +#include + constexpr std::chrono::milliseconds DEFAULT_REST_TIMEOUT{ 1000 }; //Set QNetworkReply timeout without external timer