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

2 files changed, 2 insertions, 2 deletions

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);
   }
 }