comparison Framework/Toolbox/OrthancApiClient.h @ 382:dd4c7e82b4be

removed class OrthancApiClient::HttpErrorMessage, redundant with IWebService::HttpRequestErrorMessage
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 06 Nov 2018 19:36:32 +0100
parents 8eb4fe74000f
children 939f626eb6d7
comparison
equal deleted inserted replaced
381:19bd222283ae 382:dd4c7e82b4be
139 139
140 const Orthanc::IDynamicObject& GetPayload() const; 140 const Orthanc::IDynamicObject& GetPayload() const;
141 }; 141 };
142 142
143 143
144 class HttpErrorMessage : public BaseMessage<MessageType_OrthancApi_GenericHttpError_Ready> 144
145 { 145 private:
146 private: 146 class WebServicePayload;
147 const std::string& uri_; 147
148 const Orthanc::IDynamicObject* payload_;
149
150 public:
151 HttpErrorMessage(const std::string& uri,
152 const Orthanc::IDynamicObject* payload) :
153 uri_(uri),
154 payload_(payload)
155 {
156 }
157
158 const std::string& GetUri() const
159 {
160 return uri_;
161 }
162
163 bool HasPayload() const
164 {
165 return payload_ != NULL;
166 }
167
168 const Orthanc::IDynamicObject& GetPayload() const;
169 };
170
171 148
172 protected: 149 protected:
173 IWebService& orthanc_; 150 IWebService& orthanc_;
174 151
175 public: 152 public:
181 } 158 }
182 159
183 // schedule a GET request expecting a JSON response. 160 // schedule a GET request expecting a JSON response.
184 void GetJsonAsync(const std::string& uri, 161 void GetJsonAsync(const std::string& uri,
185 MessageHandler<JsonResponseReadyMessage>* successCallback, 162 MessageHandler<JsonResponseReadyMessage>* successCallback,
186 MessageHandler<HttpErrorMessage>* failureCallback = NULL, 163 MessageHandler<IWebService::HttpRequestErrorMessage>* failureCallback = NULL,
187 Orthanc::IDynamicObject* payload = NULL /* takes ownership */); 164 Orthanc::IDynamicObject* payload = NULL /* takes ownership */);
188 165
189 // schedule a GET request expecting a binary response. 166 // schedule a GET request expecting a binary response.
190 void GetBinaryAsync(const std::string& uri, 167 void GetBinaryAsync(const std::string& uri,
191 const std::string& contentType, 168 const std::string& contentType,
192 MessageHandler<BinaryResponseReadyMessage>* successCallback, 169 MessageHandler<BinaryResponseReadyMessage>* successCallback,
193 MessageHandler<HttpErrorMessage>* failureCallback = NULL, 170 MessageHandler<IWebService::HttpRequestErrorMessage>* failureCallback = NULL,
194 Orthanc::IDynamicObject* payload = NULL /* takes ownership */) 171 Orthanc::IDynamicObject* payload = NULL /* takes ownership */);
195 {
196 IWebService::Headers headers;
197 headers["Accept"] = contentType;
198 GetBinaryAsync(uri, headers, successCallback, failureCallback, payload);
199 }
200 172
201 // schedule a GET request expecting a binary response. 173 // schedule a GET request expecting a binary response.
202 void GetBinaryAsync(const std::string& uri, 174 void GetBinaryAsync(const std::string& uri,
203 const IWebService::Headers& headers, 175 const IWebService::Headers& headers,
204 MessageHandler<BinaryResponseReadyMessage>* successCallback, 176 MessageHandler<BinaryResponseReadyMessage>* successCallback,
205 MessageHandler<HttpErrorMessage>* failureCallback = NULL, 177 MessageHandler<IWebService::HttpRequestErrorMessage>* failureCallback = NULL,
206 Orthanc::IDynamicObject* payload = NULL /* takes ownership */); 178 Orthanc::IDynamicObject* payload = NULL /* takes ownership */);
207 179
208 // schedule a POST request expecting a JSON response. 180 // schedule a POST request expecting a JSON response.
209 void PostBinaryAsyncExpectJson(const std::string& uri, 181 void PostBinaryAsyncExpectJson(const std::string& uri,
210 const std::string& body, 182 const std::string& body,
211 MessageHandler<JsonResponseReadyMessage>* successCallback, 183 MessageHandler<JsonResponseReadyMessage>* successCallback,
212 MessageHandler<HttpErrorMessage>* failureCallback = NULL, 184 MessageHandler<IWebService::HttpRequestErrorMessage>* failureCallback = NULL,
213 Orthanc::IDynamicObject* payload = NULL /* takes ownership */); 185 Orthanc::IDynamicObject* payload = NULL /* takes ownership */);
214 186
215 // schedule a POST request expecting a JSON response. 187 // schedule a POST request expecting a JSON response.
216 void PostJsonAsyncExpectJson(const std::string& uri, 188 void PostJsonAsyncExpectJson(const std::string& uri,
217 const Json::Value& data, 189 const Json::Value& data,
218 MessageHandler<JsonResponseReadyMessage>* successCallback, 190 MessageHandler<JsonResponseReadyMessage>* successCallback,
219 MessageHandler<HttpErrorMessage>* failureCallback = NULL, 191 MessageHandler<IWebService::HttpRequestErrorMessage>* failureCallback = NULL,
220 Orthanc::IDynamicObject* payload = NULL /* takes ownership */); 192 Orthanc::IDynamicObject* payload = NULL /* takes ownership */);
221 193
222 // schedule a DELETE request expecting an empty response. 194 // schedule a DELETE request expecting an empty response.
223 void DeleteAsync(const std::string& uri, 195 void DeleteAsync(const std::string& uri,
224 MessageHandler<EmptyResponseReadyMessage>* successCallback, 196 MessageHandler<EmptyResponseReadyMessage>* successCallback,
225 MessageHandler<HttpErrorMessage>* failureCallback = NULL, 197 MessageHandler<IWebService::HttpRequestErrorMessage>* failureCallback = NULL,
226 Orthanc::IDynamicObject* payload = NULL /* takes ownership */); 198 Orthanc::IDynamicObject* payload = NULL /* takes ownership */);
227 199
228 200 void NotifyHttpSuccess(const IWebService::HttpRequestSuccessMessage& message);
229 }; 201 };
230 } 202 }