SONAR-5531 - added transitional state to IssueWS for es and legacy compatibility

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 e2ba96e8ed7fda39c8d501fd843adf85f505a6a7..3c534d2c73409b06885e2640b9cce47aedb4a703 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
@@ -43,12 +43,16 @@ public class IssuesWs implements WebService {
   public static final String BULK_CHANGE_ACTION = "bulk_change";
 
   private final IssueShowAction showAction;
-  private final IssueSearchAction previousSearchAction;
-  private final SearchAction searchAction;
+  private final IssueSearchAction searchAction;
+  private final SearchAction esSearchAction;
 
-  public IssuesWs(IssueShowAction showAction, SearchAction searchAction, IssueSearchAction previousSearchAction) {
+  public IssuesWs(IssueShowAction showAction, IssueSearchAction searchAction) {
+    this(showAction, null, searchAction);
+  }
+
+  public IssuesWs(IssueShowAction showAction, SearchAction esSearchAction, IssueSearchAction searchAction) {
     this.showAction = showAction;
-    this.previousSearchAction = previousSearchAction;
+    this.esSearchAction = esSearchAction;
     this.searchAction = searchAction;
   }
 
@@ -60,7 +64,10 @@ public class IssuesWs implements WebService {
 
     showAction.define(controller);
 
-    previousSearchAction.define(controller);
+    // TODO remove after transition
+    if (esSearchAction != null) {
+      esSearchAction.define(controller);
+    }
     searchAction.define(controller);
 
     defineChangelogAction(controller);

diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueSearchActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueSearchActionTest.java
index 5a5dc1ef0e1bc5a49ade3da4e58387243d0af452..95c8ff3da4d2a356fc3c27634b7290a1188d2331 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueSearchActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueSearchActionTest.java
@@ -104,7 +104,6 @@ public class IssueSearchActionTest {
     when(i18n.formatInteger(any(Locale.class), eq(2))).thenReturn("2");
 
     tester = new WsTester(new IssuesWs(mock(IssueShowAction.class),
-      mock(SearchAction.class),
       new IssueSearchAction(issueFinder, new IssueActionsWriter(issueService, actionService), i18n, durations)));
   }
 
@@ -190,7 +189,7 @@ public class IssueSearchActionTest {
         .setDeadLine(deadLine)
         .setCreatedAt(createdAt)
         .setUpdatedAt(updatedAt)
-    ));
+      ));
 
     WsTester.TestRequest request = tester.newGetRequest("api/issues", "search");
     request.execute().assertJson(getClass(), "issues_with_action_plans.json");
@@ -219,7 +218,7 @@ public class IssueSearchActionTest {
     result.addUsers(Lists.<User>newArrayList(
       new DefaultUser().setName("John Smith").setLogin("john"),
       new DefaultUser().setName("Arthur McEnroy").setLogin("arthur")
-    ));
+      ));
 
     WsTester.TestRequest request = tester.newGetRequest("api/issues", "search");
     request.execute().assertJson(getClass(), "issues_with_comments.json");
@@ -251,7 +250,7 @@ public class IssueSearchActionTest {
     result.addUsers(Lists.<User>newArrayList(
       new DefaultUser().setName("John").setLogin("john"),
       new DefaultUser().setName("Henry").setLogin("henry")
-    ));
+      ));
 
     WsTester.TestRequest request = tester.newGetRequest("api/issues", "search").setParam("extra_fields", "actions,transitions,assigneeName,reporterName,actionPlanName");
     request.execute().assertJson(getClass(), "issues_with_extra_fields.json");
@@ -334,7 +333,7 @@ public class IssueSearchActionTest {
 
     result.addRules(newArrayList(
       Rule.create("squid", "AvoidCycle").setName("Avoid cycle").setDescription("Avoid cycle description")
-    ));
+      ));
 
     WsTester.TestRequest request = tester.newGetRequest("api/issues", "search");
     request.execute().assertJson(getClass(), "issues_with_rules.json");
@@ -350,7 +349,7 @@ public class IssueSearchActionTest {
 
     result.addUsers(Lists.<User>newArrayList(
       new DefaultUser().setName("John").setLogin("john").setActive(true).setEmail("john@email.com")
-    ));
+      ));
 
     WsTester.TestRequest request = tester.newGetRequest("api/issues", "search");
     request.execute().assertJson(getClass(), "issues_with_users.json");

diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssuesWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssuesWsTest.java
index 7ffbb233b40c33c9d1c9fdb90851bcc53681fde7..ff2fb0fea5a06ada878987d067ccbad451e01159 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssuesWsTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssuesWsTest.java
@@ -52,7 +52,7 @@ public class IssuesWsTest {
 
     showAction = new IssueShowAction(issueFinder, issueChangelogService, actionsWriter, debtModelService, i18n, durations);
     searchAction = new IssueSearchAction(issueFinder, actionsWriter, i18n, durations);
-    tester = new WsTester(new IssuesWs(showAction, mock(SearchAction.class), searchAction));
+    tester = new WsTester(new IssuesWs(showAction, searchAction));
   }
 
   @Test