Add missing header and code updates
This commit is contained in:
parent
1fa20083c4
commit
c08c22bf6a
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -13,6 +13,8 @@
|
|||
#include <QBasicTimer>
|
||||
#include <QTimerEvent>
|
||||
|
||||
#include <chrono>
|
||||
|
||||
constexpr std::chrono::milliseconds DEFAULT_REST_TIMEOUT{ 1000 };
|
||||
|
||||
//Set QNetworkReply timeout without external timer
|
||||
|
|
Loading…
Reference in New Issue