comparison Framework/Deprecated/Toolbox/OrthancApiClient.cpp @ 792:4fe4b221a31f

deprecating MessagingToolbox
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 28 May 2019 08:49:49 +0200
parents c35e98d22764
children debb70fa10b5
comparison
equal deleted inserted replaced
791:907189734acd 792:4fe4b221a31f
18 * along with this program. If not, see <http://www.gnu.org/licenses/>. 18 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 **/ 19 **/
20 20
21 #include "OrthancApiClient.h" 21 #include "OrthancApiClient.h"
22 22
23 #include "../../Toolbox/MessagingToolbox.h" 23 #include "../Toolbox/MessagingToolbox.h"
24 24
25 #include <Core/OrthancException.h> 25 #include <Core/OrthancException.h>
26 26
27 namespace Deprecated 27 namespace Deprecated
28 { 28 {
137 message.GetAnswerSize(), userPayload_.get())); 137 message.GetAnswerSize(), userPayload_.get()));
138 } 138 }
139 else if (jsonHandler_.get() != NULL) 139 else if (jsonHandler_.get() != NULL)
140 { 140 {
141 Json::Value response; 141 Json::Value response;
142 if (OrthancStone::MessagingToolbox::ParseJson(response, message.GetAnswer(), message.GetAnswerSize())) 142 if (MessagingToolbox::ParseJson(response, message.GetAnswer(), message.GetAnswerSize()))
143 { 143 {
144 jsonHandler_->Apply(OrthancApiClient::JsonResponseReadyMessage 144 jsonHandler_->Apply(OrthancApiClient::JsonResponseReadyMessage
145 (message.GetUri(), response, userPayload_.get())); 145 (message.GetUri(), response, userPayload_.get()));
146 } 146 }
147 else 147 else
268 OrthancStone::MessageHandler<JsonResponseReadyMessage>* successCallback, 268 OrthancStone::MessageHandler<JsonResponseReadyMessage>* successCallback,
269 OrthancStone::MessageHandler<IWebService::HttpRequestErrorMessage>* failureCallback, 269 OrthancStone::MessageHandler<IWebService::HttpRequestErrorMessage>* failureCallback,
270 Orthanc::IDynamicObject* payload) 270 Orthanc::IDynamicObject* payload)
271 { 271 {
272 std::string body; 272 std::string body;
273 OrthancStone::MessagingToolbox::JsonToString(body, data); 273 MessagingToolbox::JsonToString(body, data);
274 return PostBinaryAsyncExpectJson(uri, body, successCallback, failureCallback, payload); 274 return PostBinaryAsyncExpectJson(uri, body, successCallback, failureCallback, payload);
275 } 275 }
276 276
277 void OrthancApiClient::PostJsonAsync( 277 void OrthancApiClient::PostJsonAsync(
278 const std::string& uri, 278 const std::string& uri,
279 const Json::Value& data) 279 const Json::Value& data)
280 { 280 {
281 std::string body; 281 std::string body;
282 OrthancStone::MessagingToolbox::JsonToString(body, data); 282 MessagingToolbox::JsonToString(body, data);
283 return PostBinaryAsync(uri, body); 283 return PostBinaryAsync(uri, body);
284 } 284 }
285 285
286 void OrthancApiClient::PostJsonAsync( 286 void OrthancApiClient::PostJsonAsync(
287 const std::string& uri, 287 const std::string& uri,
289 OrthancStone::MessageHandler<EmptyResponseReadyMessage>* successCallback, 289 OrthancStone::MessageHandler<EmptyResponseReadyMessage>* successCallback,
290 OrthancStone::MessageHandler<IWebService::HttpRequestErrorMessage>* failureCallback, 290 OrthancStone::MessageHandler<IWebService::HttpRequestErrorMessage>* failureCallback,
291 Orthanc::IDynamicObject* payload /* takes ownership */) 291 Orthanc::IDynamicObject* payload /* takes ownership */)
292 { 292 {
293 std::string body; 293 std::string body;
294 OrthancStone::MessagingToolbox::JsonToString(body, data); 294 MessagingToolbox::JsonToString(body, data);
295 return PostBinaryAsync(uri, body, successCallback, failureCallback, payload); 295 return PostBinaryAsync(uri, body, successCallback, failureCallback, payload);
296 } 296 }
297 297
298 void OrthancApiClient::DeleteAsync( 298 void OrthancApiClient::DeleteAsync(
299 const std::string& uri, 299 const std::string& uri,