Mercurial > hg > orthanc-stone

comparison Framework/Deprecated/Toolbox/BaseWebService.cpp @ 1222:21c2b0eee53c broker

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
deprecating MessageHandler
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sat, 07 Dec 2019 18:18:07 +0100
parents 04a95ee91327
children 68579a31eeb4
comparison
equal deleted inserted replaced
1218:6f3f1ef347a3 1222:21c2b0eee53c
35 35
36 36
37 class BaseWebService::BaseWebServicePayload : public Orthanc::IDynamicObject 37 class BaseWebService::BaseWebServicePayload : public Orthanc::IDynamicObject
38 { 38 {
39 private: 39 private:
40 std::auto_ptr< OrthancStone::MessageHandler<IWebService::HttpRequestSuccessMessage> > userSuccessHandler_; 40 std::auto_ptr< MessageHandler<IWebService::HttpRequestSuccessMessage> > userSuccessHandler_;
41 std::auto_ptr< OrthancStone::MessageHandler<IWebService::HttpRequestErrorMessage> > userFailureHandler_; 41 std::auto_ptr< MessageHandler<IWebService::HttpRequestErrorMessage> > userFailureHandler_;
42 std::auto_ptr< Orthanc::IDynamicObject> userPayload_; 42 std::auto_ptr< Orthanc::IDynamicObject> userPayload_;
43 43
44 public: 44 public:
45 BaseWebServicePayload(OrthancStone::MessageHandler<IWebService::HttpRequestSuccessMessage>* userSuccessHandler, 45 BaseWebServicePayload(MessageHandler<IWebService::HttpRequestSuccessMessage>* userSuccessHandler,
46 OrthancStone::MessageHandler<IWebService::HttpRequestErrorMessage>* userFailureHandler, 46 MessageHandler<IWebService::HttpRequestErrorMessage>* userFailureHandler,
47 Orthanc::IDynamicObject* userPayload) : 47 Orthanc::IDynamicObject* userPayload) :
48 userSuccessHandler_(userSuccessHandler), 48 userSuccessHandler_(userSuccessHandler),
49 userFailureHandler_(userFailureHandler), 49 userFailureHandler_(userFailureHandler),
50 userPayload_(userPayload) 50 userPayload_(userPayload)
51 { 51 {
86 86
87 87
88 void BaseWebService::GetAsync(const std::string& uri, 88 void BaseWebService::GetAsync(const std::string& uri,
89 const HttpHeaders& headers, 89 const HttpHeaders& headers,
90 Orthanc::IDynamicObject* payload /* takes ownership */, 90 Orthanc::IDynamicObject* payload /* takes ownership */,
91 OrthancStone::MessageHandler<IWebService::HttpRequestSuccessMessage>* successCallback, 91 MessageHandler<IWebService::HttpRequestSuccessMessage>* successCallback,
92 OrthancStone::MessageHandler<IWebService::HttpRequestErrorMessage>* failureCallback, 92 MessageHandler<IWebService::HttpRequestErrorMessage>* failureCallback,
93 unsigned int timeoutInSeconds) 93 unsigned int timeoutInSeconds)
94 { 94 {
95 if (!cacheEnabled_ || cache_.find(uri) == cache_.end()) 95 if (!cacheEnabled_ || cache_.find(uri) == cache_.end())
96 { 96 {
97 GetAsyncInternal(uri, headers, 97 GetAsyncInternal(uri, headers,
98 new BaseWebService::BaseWebServicePayload(successCallback, failureCallback, payload), // ownership is transfered 98 new BaseWebService::BaseWebServicePayload(successCallback, failureCallback, payload), // ownership is transfered
99 new OrthancStone::Callable<BaseWebService, IWebService::HttpRequestSuccessMessage> 99 new DeprecatedCallable<BaseWebService, IWebService::HttpRequestSuccessMessage>
100 (GetSharedObserver(), &BaseWebService::CacheAndNotifyHttpSuccess), 100 (GetSharedObserver(), &BaseWebService::CacheAndNotifyHttpSuccess),
101 new OrthancStone::Callable<BaseWebService, IWebService::HttpRequestErrorMessage> 101 new DeprecatedCallable<BaseWebService, IWebService::HttpRequestErrorMessage>
102 (GetSharedObserver(), &BaseWebService::NotifyHttpError), 102 (GetSharedObserver(), &BaseWebService::NotifyHttpError),
103 timeoutInSeconds); 103 timeoutInSeconds);
104 } 104 }
105 else 105 else
106 { 106 {