aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-ws/src
diff options
context:
space:
mode:
authorSébastien Lesaint <sebastien.lesaint@sonarsource.com>2016-10-12 10:44:02 +0200
committerSébastien Lesaint <sebastien.lesaint@sonarsource.com>2016-10-12 12:24:33 +0200
commit55dfa5865f5de6ae44f37dcf28985e7501d16fe5 (patch)
tree5e29785a25a837b37a28d48c3ec8d84840adbfab /sonar-ws/src
parent1f69e65fdceceee5b33cfcb3567ab21ebc08db86 (diff)
downloadsonarqube-55dfa5865f5de6ae44f37dcf28985e7501d16fe5.tar.gz
sonarqube-55dfa5865f5de6ae44f37dcf28985e7501d16fe5.zip
SONAR-8190 SONAR-8191 SONAR-8206 rename api/root/* to api/roots/*
Diffstat (limited to 'sonar-ws/src')
-rw-r--r--sonar-ws/src/main/java/org/sonarqube/ws/client/DefaultWsClient.java10
-rw-r--r--sonar-ws/src/main/java/org/sonarqube/ws/client/WsClient.java4
-rw-r--r--sonar-ws/src/main/java/org/sonarqube/ws/client/root/RootsService.java (renamed from sonar-ws/src/main/java/org/sonarqube/ws/client/root/RootService.java)6
-rw-r--r--sonar-ws/src/test/java/org/sonarqube/ws/client/root/RootsServiceTest.java (renamed from sonar-ws/src/test/java/org/sonarqube/ws/client/root/RootServiceTest.java)6
4 files changed, 13 insertions, 13 deletions
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/DefaultWsClient.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/DefaultWsClient.java
index 8f96d055746..eff30072e0d 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/DefaultWsClient.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/DefaultWsClient.java
@@ -29,7 +29,7 @@ import org.sonarqube.ws.client.project.ProjectsService;
import org.sonarqube.ws.client.projectlinks.ProjectLinksService;
import org.sonarqube.ws.client.qualitygate.QualityGatesService;
import org.sonarqube.ws.client.qualityprofile.QualityProfilesService;
-import org.sonarqube.ws.client.root.RootService;
+import org.sonarqube.ws.client.root.RootsService;
import org.sonarqube.ws.client.rule.RulesService;
import org.sonarqube.ws.client.setting.SettingsService;
import org.sonarqube.ws.client.system.SystemService;
@@ -58,7 +58,7 @@ class DefaultWsClient implements WsClient {
private final ProjectsService projectsService;
private final ProjectLinksService projectLinksService;
private final SettingsService settingsService;
- private final RootService rootService;
+ private final RootsService rootsService;
DefaultWsClient(WsConnector wsConnector) {
this.wsConnector = wsConnector;
@@ -76,7 +76,7 @@ class DefaultWsClient implements WsClient {
this.projectsService = new ProjectsService(wsConnector);
this.projectLinksService = new ProjectLinksService(wsConnector);
this.settingsService = new SettingsService(wsConnector);
- this.rootService = new RootService(wsConnector);
+ this.rootsService = new RootsService(wsConnector);
}
@Override
@@ -155,7 +155,7 @@ class DefaultWsClient implements WsClient {
}
@Override
- public RootService rootService() {
- return rootService;
+ public RootsService rootService() {
+ return rootsService;
}
}
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/WsClient.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/WsClient.java
index 4514f55ec2d..add8512bca2 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/WsClient.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/WsClient.java
@@ -29,7 +29,7 @@ import org.sonarqube.ws.client.project.ProjectsService;
import org.sonarqube.ws.client.projectlinks.ProjectLinksService;
import org.sonarqube.ws.client.qualitygate.QualityGatesService;
import org.sonarqube.ws.client.qualityprofile.QualityProfilesService;
-import org.sonarqube.ws.client.root.RootService;
+import org.sonarqube.ws.client.root.RootsService;
import org.sonarqube.ws.client.rule.RulesService;
import org.sonarqube.ws.client.setting.SettingsService;
import org.sonarqube.ws.client.system.SystemService;
@@ -96,5 +96,5 @@ public interface WsClient {
/**
* @since 6.2
*/
- RootService rootService();
+ RootsService rootService();
}
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/root/RootService.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/root/RootsService.java
index 90d4d5e1713..2e9853d2cf4 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/root/RootService.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/root/RootsService.java
@@ -25,9 +25,9 @@ import org.sonarqube.ws.client.GetRequest;
import org.sonarqube.ws.client.PostRequest;
import org.sonarqube.ws.client.WsConnector;
-public class RootService extends BaseService {
- public RootService(WsConnector wsConnector) {
- super(wsConnector, "api/root");
+public class RootsService extends BaseService {
+ public RootsService(WsConnector wsConnector) {
+ super(wsConnector, "api/roots");
}
public WsRoot.SearchWsResponse search() {
diff --git a/sonar-ws/src/test/java/org/sonarqube/ws/client/root/RootServiceTest.java b/sonar-ws/src/test/java/org/sonarqube/ws/client/root/RootsServiceTest.java
index 616c6eb5832..9eec001e196 100644
--- a/sonar-ws/src/test/java/org/sonarqube/ws/client/root/RootServiceTest.java
+++ b/sonar-ws/src/test/java/org/sonarqube/ws/client/root/RootsServiceTest.java
@@ -26,13 +26,13 @@ import org.sonarqube.ws.client.WsConnector;
import static org.mockito.Mockito.mock;
-public class RootServiceTest {
+public class RootsServiceTest {
private static final String SOME_LOGIN = "johnDoe";
@Rule
- public ServiceTester<RootService> serviceTester = new ServiceTester<>(new RootService(mock(WsConnector.class)));
+ public ServiceTester<RootsService> serviceTester = new ServiceTester<>(new RootsService(mock(WsConnector.class)));
- private RootService underTest = serviceTester.getInstanceUnderTest();
+ private RootsService underTest = serviceTester.getInstanceUnderTest();
@Test
public void search() {