aboutsummaryrefslogtreecommitdiffstats
path: root/it
diff options
context:
space:
mode:
authorJenkins CI <ci@sonarsource.com>2016-04-15 10:36:24 +0200
committerJenkins CI <ci@sonarsource.com>2016-04-15 10:36:24 +0200
commitd0fd6ac322cab2a2166b7af00d3d1e283f2c7e05 (patch)
treef8549a5b88a420ea7abe00c0ed0fcfd0ce840017 /it
parentd464f2d6abcecd7cd2f5ca6f96d7b61b5b88444b (diff)
parent378d6b7916c97849e83eb3f77d1a9a259d4b3d50 (diff)
downloadsonarqube-d0fd6ac322cab2a2166b7af00d3d1e283f2c7e05.tar.gz
sonarqube-d0fd6ac322cab2a2166b7af00d3d1e283f2c7e05.zip
Automatic merge from branch-5.5
* origin/branch-5.5: Fix malformed javadoc in API Add UserDao.selectByIds SONAR-6948 rename method Request#getLocalConnector() to localConnector() SONAR-6948 add javadoc for org.sonar.api.server.ws.LocalConnector
Diffstat (limited to 'it')
-rw-r--r--it/it-plugins/ws-plugin/src/main/java/LocalCallWebService.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/it/it-plugins/ws-plugin/src/main/java/LocalCallWebService.java b/it/it-plugins/ws-plugin/src/main/java/LocalCallWebService.java
index b878ef2c47f..7a2ca7561aa 100644
--- a/it/it-plugins/ws-plugin/src/main/java/LocalCallWebService.java
+++ b/it/it-plugins/ws-plugin/src/main/java/LocalCallWebService.java
@@ -49,7 +49,7 @@ public final class LocalCallWebService implements WebService {
private class ProtobufHandler implements RequestHandler {
@Override
public void handle(Request request, Response response) throws Exception {
- WsClient client = wsClientFactory.newClient(request.getLocalConnector());
+ WsClient client = wsClientFactory.newClient(request.localConnector());
WsCe.TaskTypesWsResponse ceTaskTypes = client.ce().taskTypes();
response.stream().setStatus(ceTaskTypes.getTaskTypesCount() > 0 ? 200 : 500);
@@ -59,7 +59,7 @@ public final class LocalCallWebService implements WebService {
private class JsonHandler implements RequestHandler {
@Override
public void handle(Request request, Response response) throws Exception {
- WsClient client = wsClientFactory.newClient(request.getLocalConnector());
+ WsClient client = wsClientFactory.newClient(request.localConnector());
WsResponse jsonResponse = client.wsConnector().call(new GetRequest("api/issues/search"));
boolean ok = jsonResponse.contentType().equals(MediaTypes.JSON)
@@ -72,7 +72,7 @@ public final class LocalCallWebService implements WebService {
private class RequirePermissionHandler implements RequestHandler {
@Override
public void handle(Request request, Response response) throws Exception {
- WsClient client = wsClientFactory.newClient(request.getLocalConnector());
+ WsClient client = wsClientFactory.newClient(request.localConnector());
WsResponse jsonResponse = client.wsConnector().call(new GetRequest("api/system/info"));