SONAR-5601 - Fixed IssueWs CTor for tests and es/legacy switch

diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssuesWs.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssuesWs.java
index 3c534d2c73409b06885e2640b9cce47aedb4a703..13e4aa4e4dbf12c3c4a2c3c6fd8025833e12cb7e 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssuesWs.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssuesWs.java
@@ -50,7 +50,11 @@ public class IssuesWs implements WebService {
     this(showAction, null, searchAction);
   }
 
-  public IssuesWs(IssueShowAction showAction, SearchAction esSearchAction, IssueSearchAction searchAction) {
+  public IssuesWs(IssueShowAction showAction, SearchAction searchAction) {
+    this(showAction, searchAction, null);
+  }
+
+  private IssuesWs(IssueShowAction showAction, SearchAction esSearchAction, IssueSearchAction searchAction) {
     this.showAction = showAction;
     this.esSearchAction = esSearchAction;
     this.searchAction = searchAction;
@@ -67,8 +71,9 @@ public class IssuesWs implements WebService {
     // TODO remove after transition
     if (esSearchAction != null) {
       esSearchAction.define(controller);
+    } else if (searchAction != null) {
+      searchAction.define(controller);
     }
-    searchAction.define(controller);
 
     defineChangelogAction(controller);
     defineAssignAction(controller);

diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueShowActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueShowActionTest.java
index 251f703401c6dad6b6845b75c68cbcaf50576120..2871fa8cd7cc77574d77f8a212aba915bd34ffcd 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueShowActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueShowActionTest.java
@@ -113,7 +113,6 @@ public class IssueShowActionTest {
     when(i18n.message(any(Locale.class), eq("created"), eq((String) null))).thenReturn("Created");
 
     tester = new WsTester(new IssuesWs(new IssueShowAction(issueFinder, issueChangelogService, new IssueActionsWriter(issueService, actionService), debtModel, i18n, durations),
-      mock(SearchAction.class),
       mock(IssueSearchAction.class)));
   }
 
@@ -134,22 +133,22 @@ public class IssueShowActionTest {
     issues.add(issue);
 
     result.addComponents(Lists.<Component>newArrayList(new ComponentDto()
-        .setId(10L)
-        .setKey("org.sonar.server.issue.IssueClient")
-        .setLongName("SonarQube :: Issue Client")
-        .setName("SonarQube :: Issue Client")
-        .setQualifier("FIL")
-        .setSubProjectId(1L)
-        .setProjectId(1L)
-    ));
+      .setId(10L)
+      .setKey("org.sonar.server.issue.IssueClient")
+      .setLongName("SonarQube :: Issue Client")
+      .setName("SonarQube :: Issue Client")
+      .setQualifier("FIL")
+      .setSubProjectId(1L)
+      .setProjectId(1L)
+      ));
 
     result.addComponents(Lists.<Component>newArrayList(new ComponentDto()
-        .setId(1L)
-        .setKey("org.sonar.Sonar")
-        .setLongName("SonarQube")
-        .setName("SonarQube")
-        .setProjectId(1L)
-    ));
+      .setId(1L)
+      .setKey("org.sonar.Sonar")
+      .setLongName("SonarQube")
+      .setName("SonarQube")
+      .setProjectId(1L)
+      ));
 
     MockUserSession.set();
     WsTester.TestRequest request = tester.newGetRequest("api/issues", "show").setParam("key", issueKey);
@@ -298,7 +297,7 @@ public class IssueShowActionTest {
     result.addUsers(Lists.<User>newArrayList(
       new DefaultUser().setLogin("john").setName("John"),
       new DefaultUser().setLogin("steven").setName("Steven")
-    ));
+      ));
 
     MockUserSession.set();
     WsTester.TestRequest request = tester.newGetRequest("api/issues", "show").setParam("key", issue.key());
@@ -415,7 +414,7 @@ public class IssueShowActionTest {
     result.addUsers(Lists.<User>newArrayList(
       new DefaultUser().setLogin("john").setName("John"),
       new DefaultUser().setLogin("arthur").setName("Arthur")
-    ));
+      ));
 
     when(i18n.ageFromNow(any(Locale.class), eq(date1))).thenReturn("9 days");
     when(i18n.ageFromNow(any(Locale.class), eq(date2))).thenReturn("10 days");
@@ -496,20 +495,20 @@ public class IssueShowActionTest {
 
   private void addComponentAndProject() {
     result.addComponents(Lists.<Component>newArrayList(new ComponentDto()
-        .setId(10L)
-        .setKey("org.sonar.server.issue.IssueClient")
-        .setLongName("SonarQube :: Issue Client")
-        .setQualifier("FIL")
-        .setSubProjectId(1L)
-        .setProjectId(1L)
-    ));
+      .setId(10L)
+      .setKey("org.sonar.server.issue.IssueClient")
+      .setLongName("SonarQube :: Issue Client")
+      .setQualifier("FIL")
+      .setSubProjectId(1L)
+      .setProjectId(1L)
+      ));
 
     result.addComponents(Lists.<Component>newArrayList(new ComponentDto()
-        .setId(1L)
-        .setKey("org.sonar.Sonar")
-        .setLongName("SonarQube")
-        .setProjectId(1L)
-    ));
+      .setId(1L)
+      .setKey("org.sonar.Sonar")
+      .setLongName("SonarQube")
+      .setProjectId(1L)
+      ));
   }
 
 }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssuesWsMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssuesWsMediumTest.java
index 19a095ea4dd3ef6a7c8a0ccacd167acce7e5d607..1a301d2920fb819a4bfe95705f02c4ca8fc4ca40 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssuesWsMediumTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssuesWsMediumTest.java
@@ -43,7 +43,8 @@ import static org.fest.assertions.Assertions.assertThat;
 public class IssuesWsMediumTest {
 
   @ClassRule
-  public static ServerTester tester = new ServerTester();
+  public static ServerTester tester = new ServerTester()
+    .setProperty("sonar.issues.use_es_backend", "true");
 
   IssuesWs ws;
   DbClient db;
@@ -74,7 +75,7 @@ public class IssuesWsMediumTest {
     WebService.Controller controller = context.controller(IssuesWs.API_ENDPOINT);
 
     assertThat(controller).isNotNull();
-    assertThat(controller.actions()).hasSize(15);
+    assertThat(controller.actions()).hasSize(14);
     assertThat(controller.action(IssuesWs.ADD_COMMENT_ACTION)).isNotNull();
     assertThat(controller.action(IssuesWs.ASSIGN_ACTION)).isNotNull();
     assertThat(controller.action(IssuesWs.BULK_CHANGE_ACTION)).isNotNull();
@@ -88,7 +89,6 @@ public class IssuesWsMediumTest {
     assertThat(controller.action(IssuesWs.SET_SEVERITY_ACTION)).isNotNull();
     assertThat(controller.action(IssuesWs.TRANSITIONS_ACTION)).isNotNull();
 
-    assertThat(controller.action(IssueSearchAction.SEARCH_ACTION)).isNotNull();
     assertThat(controller.action(SearchAction.SEARCH_ACTION)).isNotNull();
   }