@@ -148,14 +148,14 @@ public Response get(Request request) throws URISyntaxException, IOException {
148
148
HttpGet httpGet = null ;
149
149
150
150
try {
151
- uri = buildUri (request .baseUri , request .endpoint , request .queryParams );
151
+ uri = buildUri (request .getBaseUri () , request .getEndpoint () , request .getQueryParams () );
152
152
httpGet = new HttpGet (uri .toString ());
153
153
} catch (URISyntaxException ex ) {
154
154
throw ex ;
155
155
}
156
156
157
- if (request .headers != null ) {
158
- for (Map .Entry <String , String > entry : request .headers .entrySet ()) {
157
+ if (request .getHeaders () != null ) {
158
+ for (Map .Entry <String , String > entry : request .getHeaders () .entrySet ()) {
159
159
httpGet .setHeader (entry .getKey (), entry .getValue ());
160
160
}
161
161
}
@@ -171,20 +171,20 @@ public Response post(Request request) throws URISyntaxException, IOException {
171
171
HttpPost httpPost = null ;
172
172
173
173
try {
174
- uri = buildUri (request .baseUri , request .endpoint , request .queryParams );
174
+ uri = buildUri (request .getBaseUri () , request .getEndpoint () , request .getQueryParams () );
175
175
httpPost = new HttpPost (uri .toString ());
176
176
} catch (URISyntaxException ex ) {
177
177
throw ex ;
178
178
}
179
179
180
- if (request .headers != null ) {
181
- for (Map .Entry <String , String > entry : request .headers .entrySet ()) {
180
+ if (request .getHeaders () != null ) {
181
+ for (Map .Entry <String , String > entry : request .getHeaders () .entrySet ()) {
182
182
httpPost .setHeader (entry .getKey (), entry .getValue ());
183
183
}
184
184
}
185
185
186
- httpPost .setEntity (new StringEntity (request .body , Charset .forName ("UTF-8" )));
187
- if (request .body != "" ) {
186
+ httpPost .setEntity (new StringEntity (request .getBody () , Charset .forName ("UTF-8" )));
187
+ if (request .getBody () != "" ) {
188
188
httpPost .setHeader ("Content-Type" , "application/json" );
189
189
}
190
190
@@ -200,20 +200,20 @@ public Response patch(Request request) throws URISyntaxException, IOException {
200
200
HttpPatch httpPatch = null ;
201
201
202
202
try {
203
- uri = buildUri (request .baseUri , request .endpoint , request .queryParams );
203
+ uri = buildUri (request .getBaseUri () , request .getEndpoint () , request .getQueryParams () );
204
204
httpPatch = new HttpPatch (uri .toString ());
205
205
} catch (URISyntaxException ex ) {
206
206
throw ex ;
207
207
}
208
208
209
- if (request .headers != null ) {
210
- for (Map .Entry <String , String > entry : request .headers .entrySet ()) {
209
+ if (request .getHeaders () != null ) {
210
+ for (Map .Entry <String , String > entry : request .getHeaders () .entrySet ()) {
211
211
httpPatch .setHeader (entry .getKey (), entry .getValue ());
212
212
}
213
213
}
214
214
215
- httpPatch .setEntity (new StringEntity (request .body , Charset .forName ("UTF-8" )));
216
- if (request .body != "" ) {
215
+ httpPatch .setEntity (new StringEntity (request .getBody () , Charset .forName ("UTF-8" )));
216
+ if (request .getBody () != "" ) {
217
217
httpPatch .setHeader ("Content-Type" , "application/json" );
218
218
}
219
219
return executeApiCall (httpPatch );
@@ -228,20 +228,20 @@ public Response put(Request request) throws URISyntaxException, IOException {
228
228
HttpPut httpPut = null ;
229
229
230
230
try {
231
- uri = buildUri (request .baseUri , request .endpoint , request .queryParams );
231
+ uri = buildUri (request .getBaseUri () , request .getEndpoint () , request .getQueryParams () );
232
232
httpPut = new HttpPut (uri .toString ());
233
233
} catch (URISyntaxException ex ) {
234
234
throw ex ;
235
235
}
236
236
237
- if (request .headers != null ) {
238
- for (Map .Entry <String , String > entry : request .headers .entrySet ()) {
237
+ if (request .getHeaders () != null ) {
238
+ for (Map .Entry <String , String > entry : request .getHeaders () .entrySet ()) {
239
239
httpPut .setHeader (entry .getKey (), entry .getValue ());
240
240
}
241
241
}
242
242
243
- httpPut .setEntity (new StringEntity (request .body , Charset .forName ("UTF-8" )));
244
- if (request .body != "" ) {
243
+ httpPut .setEntity (new StringEntity (request .getBody () , Charset .forName ("UTF-8" )));
244
+ if (request .getBody () != "" ) {
245
245
httpPut .setHeader ("Content-Type" , "application/json" );
246
246
}
247
247
@@ -256,20 +256,20 @@ public Response delete(Request request) throws URISyntaxException, IOException {
256
256
HttpDeleteWithBody httpDelete = null ;
257
257
258
258
try {
259
- uri = buildUri (request .baseUri , request .endpoint , request .queryParams );
259
+ uri = buildUri (request .getBaseUri () , request .getEndpoint () , request .getQueryParams () );
260
260
httpDelete = new HttpDeleteWithBody (uri .toString ());
261
261
} catch (URISyntaxException ex ) {
262
262
throw ex ;
263
263
}
264
264
265
- if (request .headers != null ) {
266
- for (Map .Entry <String , String > entry : request .headers .entrySet ()) {
265
+ if (request .getHeaders () != null ) {
266
+ for (Map .Entry <String , String > entry : request .getHeaders () .entrySet ()) {
267
267
httpDelete .setHeader (entry .getKey (), entry .getValue ());
268
268
}
269
269
}
270
270
271
- httpDelete .setEntity (new StringEntity (request .body , Charset .forName ("UTF-8" )));
272
- if (request .body != "" ) {
271
+ httpDelete .setEntity (new StringEntity (request .getBody () , Charset .forName ("UTF-8" )));
272
+ if (request .getBody () != "" ) {
273
273
httpDelete .setHeader ("Content-Type" , "application/json" );
274
274
}
275
275
@@ -287,7 +287,7 @@ private Response executeApiCall(HttpRequestBase httpPost) throws IOException {
287
287
//throwing IOException here to not break API behavior.
288
288
throw new IOException ("Request returned status Code " +statusLine .getStatusCode ()+"Body:" +(response !=null ?response .body :null ));
289
289
}
290
-
290
+
291
291
} finally {
292
292
if (serverResponse != null ) {
293
293
serverResponse .close ();
@@ -301,10 +301,10 @@ private Response executeApiCall(HttpRequestBase httpPost) throws IOException {
301
301
*/
302
302
public Response api (Request request ) throws IOException {
303
303
try {
304
- if (request .method == null ) {
304
+ if (request .getMethod () == null ) {
305
305
throw new IOException ("We only support GET, PUT, PATCH, POST and DELETE." );
306
306
}
307
- switch (request .method ) {
307
+ switch (request .getMethod () ) {
308
308
case GET :
309
309
return get (request );
310
310
case POST :
0 commit comments