Commit c8ccbaa7 authored by Greg Messner's avatar Greg Messner
Browse files

validate() now properly handles expected HTTP status in the 200-204 range (#203).

parent 68345120
...@@ -429,8 +429,15 @@ public abstract class AbstractApi implements Constants { ...@@ -429,8 +429,15 @@ public abstract class AbstractApi implements Constants {
*/ */
protected Response validate(Response response, Response.Status expected) throws GitLabApiException { protected Response validate(Response response, Response.Status expected) throws GitLabApiException {
if (response.getStatus() != expected.getStatusCode()) { int responseCode = response.getStatus();
throw new GitLabApiException(response); int expectedResponseCode = expected.getStatusCode();
if (responseCode != expectedResponseCode) {
// If the expected code is 200-204 and the response code is 200-204 it is OK. We do this because
// GitLab is constantly changing the expected code in the 200 to 204 range
if (expectedResponseCode > 204 || responseCode > 204 || expectedResponseCode < 200 || responseCode < 200)
throw new GitLabApiException(response);
} }
if (!getApiClient().validateSecretToken(response)) { if (!getApiClient().validateSecretToken(response)) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment