opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.15'

Browse Source 
* stable-2.15:
  Adjust file mode of Roboto fonts
  Remove SourceCodePro font files
  PutConfig: add cause to ResourceConflictException
  RestSession: Remove unnecessary utility methods

Change-Id: Ie6591ef397d9c580fe423983381d11603e015cfa
This commit is contained in:
David Pursehouse
2018-07-25 10:29:13 +01:00
parent a9725c3685 cb8c06c580
commit d9d9e6a992
6 changed files with 22 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
java/com/google/gerrit/acceptance/RestSession.java
View File

@@ -23,7 +23,6 @@ import com.google.gerrit.extensions.restapi.RawInput;
import com.google.gerrit.server.OutputFormat;
import java.io.IOException;
import org.apache.http.Header;
import org.apache.http.HttpStatus;
import org.apache.http.client.fluent.Request;
import org.apache.http.entity.BufferedHttpEntity;
import org.apache.http.entity.InputStreamEntity;
@@ -36,16 +35,6 @@ public class RestSession extends HttpSession {
super(server, account);
}
public RestResponse getOK(String endPoint) throws Exception {
return get(endPoint, HttpStatus.SC_OK);
}
public RestResponse get(String endPoint, int expectedStatus) throws Exception {
RestResponse r = get(endPoint);
r.assertStatus(expectedStatus);
return r;
}
public RestResponse get(String endPoint) throws IOException {
return getWithHeader(endPoint, null);
}
@@ -105,16 +94,6 @@ public class RestSession extends HttpSession {
return post(endPoint, null);
}
public RestResponse postOK(String endPoint, Object content) throws Exception {
return post(endPoint, content, HttpStatus.SC_OK);
}
public RestResponse post(String endPoint, Object content, int expectedStatus) throws Exception {
RestResponse r = post(endPoint, content);
r.assertStatus(expectedStatus);
return r;
}
public RestResponse post(String endPoint, Object content) throws IOException {
return postWithHeader(endPoint, null, content);
}