Skip to content

Commit 4d322fd

Browse files
gmessnergmessner
committed
Now explicitly sets timeouts on connection (#311).
1 parent fea9f0a commit 4d322fd

File tree

1 file changed

+24
-6
lines changed

1 file changed

+24
-6
lines changed

‎src/main/java/org/gitlab4j/api/utils/AccessTokenUtils.java‎

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@ public static final String createPersonalAccessToken(final String baseUrl, final
8484
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
8585
connection.setRequestProperty("User-Agent", USER_AGENT);
8686
connection.setRequestProperty("Cookie", cookies);
87+
connection.setReadTimeout(10000);
88+
connection.setConnectTimeout(10000);
8789

8890
// Make sure the response code is 200, otherwise there is a failure
8991
int responseCode = connection.getResponseCode();
@@ -108,8 +110,8 @@ public static final String createPersonalAccessToken(final String baseUrl, final
108110
connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
109111
connection.setRequestProperty("Charset", "utf-8");
110112
connection.setRequestProperty("Cookie", cookies);
111-
connection.setReadTimeout(5000);
112-
connection.setConnectTimeout(5000);
113+
connection.setReadTimeout(10000);
114+
connection.setConnectTimeout(10000);
113115
connection.setRequestMethod("POST");
114116
connection.setDoInput(true);
115117
connection.setDoOutput(true);
@@ -143,6 +145,8 @@ public static final String createPersonalAccessToken(final String baseUrl, final
143145
connection = (HttpURLConnection) url.openConnection();
144146
connection.setRequestProperty("User-Agent", USER_AGENT);
145147
connection.setRequestProperty("Cookie", cookies);
148+
connection.setReadTimeout(10000);
149+
connection.setConnectTimeout(10000);
146150

147151
// Make sure the response code is 200, otherwise there is a failure
148152
responseCode = connection.getResponseCode();
@@ -212,6 +216,8 @@ public static final void revokePersonalAccessToken(final String baseUrl, final S
212216
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
213217
connection.setRequestProperty("User-Agent", USER_AGENT);
214218
connection.setRequestProperty("Cookie", cookies);
219+
connection.setReadTimeout(10000);
220+
connection.setConnectTimeout(10000);
215221

216222
// Make sure the response code is 200, otherwise there is a failure
217223
int responseCode = connection.getResponseCode();
@@ -266,8 +272,8 @@ public static final void revokePersonalAccessToken(final String baseUrl, final S
266272
connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
267273
connection.setRequestProperty("Charset", "utf-8");
268274
connection.setRequestProperty("Cookie", cookies);
269-
connection.setReadTimeout(5000);
270-
connection.setConnectTimeout(5000);
275+
connection.setReadTimeout(10000);
276+
connection.setConnectTimeout(10000);
271277
connection.setRequestMethod("PUT");
272278
connection.setDoInput(true);
273279
connection.setDoOutput(true);
@@ -293,6 +299,8 @@ public static final void revokePersonalAccessToken(final String baseUrl, final S
293299
connection = (HttpURLConnection) url.openConnection();
294300
connection.setRequestProperty("User-Agent", USER_AGENT);
295301
connection.setRequestProperty("Cookie", cookies);
302+
connection.setReadTimeout(10000);
303+
connection.setConnectTimeout(10000);
296304

297305
// Make sure the response code is 200, otherwise there is a failure
298306
responseCode = connection.getResponseCode();
@@ -351,6 +359,8 @@ public static final String getFeedToken(final String baseUrl, final String usern
351359
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
352360
connection.setRequestProperty("User-Agent", USER_AGENT);
353361
connection.setRequestProperty("Cookie", cookies);
362+
connection.setReadTimeout(10000);
363+
connection.setConnectTimeout(10000);
354364

355365
// Make sure the response code is 200, otherwise there is a failure
356366
int responseCode = connection.getResponseCode();
@@ -419,6 +429,8 @@ public static final String getHealthCheckAccessToken(final String baseUrl, final
419429
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
420430
connection.setRequestProperty("User-Agent", USER_AGENT);
421431
connection.setRequestProperty("Cookie", cookies);
432+
connection.setReadTimeout(10000);
433+
connection.setConnectTimeout(10000);
422434

423435
// Make sure the response code is 200, otherwise there is a failure
424436
int responseCode = connection.getResponseCode();
@@ -480,6 +492,8 @@ protected static final String login(final String baseUrl, final String username,
480492
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
481493
connection.setRequestMethod("GET");
482494
connection.addRequestProperty("User-Agent", USER_AGENT);
495+
connection.setReadTimeout(10000);
496+
connection.setConnectTimeout(10000);
483497

484498
// Make sure a redirect was provided, otherwise it is a login failure
485499
int responseCode = connection.getResponseCode();
@@ -511,8 +525,8 @@ protected static final String login(final String baseUrl, final String username,
511525
connection.setRequestProperty("Charset", "utf-8");
512526

513527
connection.setRequestProperty("Cookie", cookies);
514-
connection.setReadTimeout(5000);
515-
connection.setConnectTimeout(5000);
528+
connection.setReadTimeout(10000);
529+
connection.setConnectTimeout(10000);
516530
connection.setRequestMethod("POST");
517531
connection.setDoInput(true);
518532
connection.setDoOutput(true);
@@ -543,6 +557,8 @@ protected static final String login(final String baseUrl, final String username,
543557
connection = (HttpURLConnection) url.openConnection();
544558
connection.setRequestProperty("User-Agent", USER_AGENT);
545559
connection.setRequestProperty("Cookie", cookies);
560+
connection.setReadTimeout(10000);
561+
connection.setConnectTimeout(10000);
546562

547563
// The response code should be 200, otherwise something is wrong, consider it a login failure
548564
responseCode = connection.getResponseCode();
@@ -586,6 +602,8 @@ protected static final void logout(final String baseUrl, final String cookies) t
586602
connection.setRequestProperty("User-Agent", USER_AGENT);
587603
connection.setRequestProperty("Cookie", cookies);
588604
connection.setRequestMethod("GET");
605+
connection.setReadTimeout(10000);
606+
connection.setConnectTimeout(10000);
589607

590608
// Make sure a redirect was provided, otherwise it is a logout failure
591609
int responseCode = connection.getResponseCode();

0 commit comments

Comments
 (0)