diff options
author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2016-04-15 09:15:20 +0200 |
---|---|---|
committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2016-04-15 09:15:20 +0200 |
commit | 9a3d3fc2d03cf39ff102068124681b9bc78dc4b6 (patch) | |
tree | be6a7b96038cc24f9dd535c8f0adf19aba57f0aa | |
parent | a444f194d4352ccb6ef70d79161620311b1cda8f (diff) | |
download | sonarqube-9a3d3fc2d03cf39ff102068124681b9bc78dc4b6.tar.gz sonarqube-9a3d3fc2d03cf39ff102068124681b9bc78dc4b6.zip |
SONAR-6948 rename method Request#getLocalConnector() to localConnector()
8 files changed, 10 insertions, 10 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")); diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/LocalConnector.java b/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/LocalConnector.java index d4a2fc4440e..eb93d97957d 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/LocalConnector.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/LocalConnector.java @@ -35,7 +35,7 @@ import javax.annotation.CheckForNull; * public class MyRequestHandler implements RequestHandler { * {@literal @}Override * public void handle(Request request, Response response) { - * WsClient wsClient = WsClientFactories.getLocal().newClient(request.getLocalConnector()); + * WsClient wsClient = WsClientFactories.getLocal().newClient(request.localConnector()); * SearchWsResponse issues = wsClient.issues().search(new SearchWsRequest()); * // ... * } diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/Request.java b/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/Request.java index d30802cad2a..6396ecab761 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/Request.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/Request.java @@ -242,5 +242,5 @@ public abstract class Request { * @since 5.5 */ @Beta - public abstract LocalConnector getLocalConnector(); + public abstract LocalConnector localConnector(); } diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/WebService.java b/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/WebService.java index 99c530f65b6..484956d7a68 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/WebService.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/WebService.java @@ -88,7 +88,7 @@ import static java.lang.String.format; * } * </pre> * - * Since version 5.5, a web service can call another web service to get some data. See {@link Request#getLocalConnector()} + * Since version 5.5, a web service can call another web service to get some data. See {@link Request#localConnector()} * provided by {@link RequestHandler#handle(Request, Response)}. * * @since 4.2 diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/internal/SimpleGetRequest.java b/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/internal/SimpleGetRequest.java index f08816d5bd7..e9d2c0827d1 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/internal/SimpleGetRequest.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/internal/SimpleGetRequest.java @@ -82,7 +82,7 @@ public class SimpleGetRequest extends Request { } @Override - public LocalConnector getLocalConnector() { + public LocalConnector localConnector() { throw new UnsupportedOperationException(); } } diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/internal/ValidatingRequest.java b/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/internal/ValidatingRequest.java index f38a1bed2e2..58615ec636e 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/internal/ValidatingRequest.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/internal/ValidatingRequest.java @@ -53,7 +53,7 @@ public abstract class ValidatingRequest extends Request { } @Override - public LocalConnector getLocalConnector() { + public LocalConnector localConnector() { checkNotNull(localConnector, "Local connector has not been set"); return localConnector; } diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/LocalWsConnector.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/LocalWsConnector.java index 3b7af43aa88..ca8947e64e7 100644 --- a/sonar-ws/src/main/java/org/sonarqube/ws/client/LocalWsConnector.java +++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/LocalWsConnector.java @@ -37,7 +37,7 @@ class LocalWsConnector implements WsConnector { } @VisibleForTesting - LocalConnector getLocalConnector() { + LocalConnector localConnector() { return localConnector; } diff --git a/sonar-ws/src/test/java/org/sonarqube/ws/client/WsClientFactoriesTest.java b/sonar-ws/src/test/java/org/sonarqube/ws/client/WsClientFactoriesTest.java index 351a80dc295..886a1f6d8a4 100644 --- a/sonar-ws/src/test/java/org/sonarqube/ws/client/WsClientFactoriesTest.java +++ b/sonar-ws/src/test/java/org/sonarqube/ws/client/WsClientFactoriesTest.java @@ -42,6 +42,6 @@ public class WsClientFactoriesTest { assertThat(client).isInstanceOf(DefaultWsClient.class); assertThat(client.wsConnector()).isInstanceOf(LocalWsConnector.class); - assertThat(((LocalWsConnector) client.wsConnector()).getLocalConnector()).isSameAs(connector); + assertThat(((LocalWsConnector) client.wsConnector()).localConnector()).isSameAs(connector); } } |