SONAR-5743 Move new source WS to api/sources/lines

11 files changed, 19 insertions, 19 deletions

diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java b/server/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java
index ec5e1f47fbf..7ef804907ee 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java
@@ -545,7 +545,7 @@ class ServerComponents {
     pico.addSingleton(SourceService.class);
     pico.addSingleton(SourcesWs.class);
     pico.addSingleton(ShowAction.class);
-    pico.addSingleton(IndexAction.class);
+    pico.addSingleton(LinesAction.class);
     pico.addSingleton(ScmWriter.class);
     pico.addSingleton(RawAction.class);
     pico.addSingleton(ScmAction.class);
diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/ws/IndexAction.java b/server/sonar-server/src/main/java/org/sonar/server/source/ws/LinesAction.java
index 33afb3a67c3..4a075f50e38 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/source/ws/IndexAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/source/ws/LinesAction.java
@@ -34,16 +34,16 @@ import org.sonar.server.source.index.SourceLineIndex;
 import java.util.Date;
 import java.util.List;
 
-public class IndexAction implements RequestHandler {
+public class LinesAction implements RequestHandler {
 
   private final SourceLineIndex sourceLineIndex;
 
-  public IndexAction(SourceLineIndex sourceLineIndex) {
+  public LinesAction(SourceLineIndex sourceLineIndex) {
     this.sourceLineIndex = sourceLineIndex;
   }
 
   void define(WebService.NewController controller) {
-    WebService.NewAction action = controller.createAction("index")
+    WebService.NewAction action = controller.createAction("lines")
       .setDescription("Show source code with line oriented info. Require Browse permission on file's project<br/>" +
         "Each element of the result array is an object which contains:" +
         "<ol>" +
@@ -55,7 +55,7 @@ public class IndexAction implements RequestHandler {
         "</ol>")
       .setSince("5.0")
       .setInternal(true)
-      .setResponseExample(Resources.getResource(getClass(), "example-index.json"))
+      .setResponseExample(Resources.getResource(getClass(), "example-lines.json"))
       .setHandler(this);
 
     action
diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/ws/SourcesWs.java b/server/sonar-server/src/main/java/org/sonar/server/source/ws/SourcesWs.java
index a2d7624c6a1..b571b17aa53 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/source/ws/SourcesWs.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/source/ws/SourcesWs.java
@@ -25,11 +25,11 @@ import org.sonar.api.server.ws.WebService;
 public class SourcesWs implements WebService {
 
   private final ShowAction showAction;
-  private final IndexAction show2Action;
+  private final LinesAction show2Action;
   private final RawAction rawAction;
   private final ScmAction scmAction;
 
-  public SourcesWs(ShowAction showAction, RawAction rawAction, ScmAction scmAction, IndexAction show2Action) {
+  public SourcesWs(ShowAction showAction, RawAction rawAction, ScmAction scmAction, LinesAction show2Action) {
     this.showAction = showAction;
     this.show2Action = show2Action;
     this.rawAction = rawAction;
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/source/ws/example-index.json b/server/sonar-server/src/main/resources/org/sonar/server/source/ws/example-lines.json
index 3cdfdd6a4e3..3cdfdd6a4e3 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/source/ws/example-index.json
+++ b/server/sonar-server/src/main/resources/org/sonar/server/source/ws/example-lines.json
diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/ws/IndexActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/source/ws/LinesActionTest.java
index 07e96220086..57d93195702 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/source/ws/IndexActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/source/ws/LinesActionTest.java
@@ -48,7 +48,7 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
-public class IndexActionTest {
+public class LinesActionTest {
 
   @Mock
   SourceLineIndex sourceLineIndex;
@@ -62,7 +62,7 @@ public class IndexActionTest {
         mock(ShowAction.class),
         mock(RawAction.class),
         mock(ScmAction.class),
-        new IndexAction(sourceLineIndex)
+        new LinesAction(sourceLineIndex)
       )
     );
   }
@@ -108,7 +108,7 @@ public class IndexActionTest {
       line3
     ));
 
-    WsTester.TestRequest request = tester.newGetRequest("api/sources", "index").setParam("uuid", componentUuid);
+    WsTester.TestRequest request = tester.newGetRequest("api/sources", "lines").setParam("uuid", componentUuid);
     // Using non-strict match b/c of dates
     request.execute().assertJson(getClass(), "show_source.json", false);
   }
@@ -119,7 +119,7 @@ public class IndexActionTest {
     when(sourceLineIndex.getLines(anyString(), anyInt(), anyInt())).thenReturn(Lists.<SourceLineDoc>newArrayList());
 
     try {
-      WsTester.TestRequest request = tester.newGetRequest("api/sources", "index").setParam("uuid", componentKey);
+      WsTester.TestRequest request = tester.newGetRequest("api/sources", "lines").setParam("uuid", componentKey);
       request.execute();
       fail();
     } catch (Exception e) {
@@ -143,7 +143,7 @@ public class IndexActionTest {
       new SourceLineDoc(fieldMap)
     ));
     WsTester.TestRequest request = tester
-      .newGetRequest("api/sources", "index")
+      .newGetRequest("api/sources", "lines")
       .setParam("uuid", fileKey)
       .setParam("from", "3")
       .setParam("to", "3");
diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/ws/RawActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/source/ws/RawActionTest.java
index 312efb4a2c2..e848850b000 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/source/ws/RawActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/source/ws/RawActionTest.java
@@ -64,7 +64,7 @@ public class RawActionTest {
   public void setUp() throws Exception {
     when(dbClient.componentDao()).thenReturn(componentDao);
     when(dbClient.openSession(false)).thenReturn(session);
-    tester = new WsTester(new SourcesWs(mock(ShowAction.class), new RawAction(dbClient, sourceService), mock(ScmAction.class), mock(IndexAction.class)));
+    tester = new WsTester(new SourcesWs(mock(ShowAction.class), new RawAction(dbClient, sourceService), mock(ScmAction.class), mock(LinesAction.class)));
   }
 
   @Test
diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/ws/ScmActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/source/ws/ScmActionTest.java
index bd5ee2e012e..f57ec7389f6 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/source/ws/ScmActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/source/ws/ScmActionTest.java
@@ -34,7 +34,7 @@ public class ScmActionTest {
 
   SourceService sourceService = mock(SourceService.class);
   ScmWriter scmWriter = mock(ScmWriter.class);
-  WsTester tester = new WsTester(new SourcesWs(mock(ShowAction.class), mock(RawAction.class), new ScmAction(sourceService, scmWriter), mock(IndexAction.class)));
+  WsTester tester = new WsTester(new SourcesWs(mock(ShowAction.class), mock(RawAction.class), new ScmAction(sourceService, scmWriter), mock(LinesAction.class)));
 
   @Test
   public void get_scm() throws Exception {
diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/ws/ShowActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/source/ws/ShowActionTest.java
index 53888aa4e33..8ceaae65b47 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/source/ws/ShowActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/source/ws/ShowActionTest.java
@@ -43,7 +43,7 @@ public class ShowActionTest {
 
   @Before
   public void setUp() throws Exception {
-    tester = new WsTester(new SourcesWs(new ShowAction(sourceService), mock(RawAction.class), new ScmAction(sourceService, mock(ScmWriter.class)), mock(IndexAction.class)));
+    tester = new WsTester(new SourcesWs(new ShowAction(sourceService), mock(RawAction.class), new ScmAction(sourceService, mock(ScmWriter.class)), mock(LinesAction.class)));
   }
 
   @Test
diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/ws/SourcesWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/source/ws/SourcesWsTest.java
index dc96bc36b93..9d4334eb6d5 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/source/ws/SourcesWsTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/source/ws/SourcesWsTest.java
@@ -35,8 +35,8 @@ public class SourcesWsTest {
   ShowAction showAction = new ShowAction(mock(SourceService.class));
   RawAction rawAction = new RawAction(mock(DbClient.class), mock(SourceService.class));
   ScmAction scmAction = new ScmAction(mock(SourceService.class), new ScmWriter());
-  IndexAction indexAction = new IndexAction(mock(SourceLineIndex.class));
-  WsTester tester = new WsTester(new SourcesWs(showAction, rawAction, scmAction, indexAction));
+  LinesAction linesAction = new LinesAction(mock(SourceLineIndex.class));
+  WsTester tester = new WsTester(new SourcesWs(showAction, rawAction, scmAction, linesAction));
 
   @Test
   public void define_ws() throws Exception {
@@ -70,9 +70,9 @@ public class SourcesWsTest {
     assertThat(scm.responseExampleAsString()).isNotEmpty();
     assertThat(scm.params()).hasSize(4);
 
-    WebService.Action index = controller.action("index");
+    WebService.Action index = controller.action("lines");
     assertThat(index).isNotNull();
-    assertThat(index.handler()).isSameAs(indexAction);
+    assertThat(index.handler()).isSameAs(linesAction);
     assertThat(index.since()).isEqualTo("5.0");
     assertThat(index.isInternal()).isTrue();
     assertThat(index.responseExampleAsString()).isNotEmpty();
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/IndexActionTest/show_source.json b/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/show_source.json
index 27d36186e5c..27d36186e5c 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/IndexActionTest/show_source.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/show_source.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/IndexActionTest/show_source_with_params_from_and_to.json b/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/show_source_with_params_from_and_to.json
index ba2a4c6e52b..ba2a4c6e52b 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/IndexActionTest/show_source_with_params_from_and_to.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/show_source_with_params_from_and_to.json