Remove unused "statuses" field in response of api/rules/app

This field is not used by web app

diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/AppAction.java b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/AppAction.java
index fd5455c4e9ce6c9bf7091c6b1a2c6afb25544738..5c008df76d9aca1ed7cfb3fac6fbf8bfa2d9516e 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/AppAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/AppAction.java
@@ -19,11 +19,8 @@
  */
 package org.sonar.server.rule.ws;
 
-import java.util.Locale;
-import org.sonar.api.i18n.I18n;
 import org.sonar.api.resources.Language;
 import org.sonar.api.resources.Languages;
-import org.sonar.api.rule.RuleStatus;
 import org.sonar.api.server.ws.Request;
 import org.sonar.api.server.ws.Response;
 import org.sonar.api.server.ws.WebService;
@@ -41,14 +38,12 @@ public class AppAction implements RulesWsAction {
 
   private final Languages languages;
   private final DbClient dbClient;
-  private final I18n i18n;
   private final UserSession userSession;
   private final RuleWsSupport wsSupport;
 
-  public AppAction(Languages languages, DbClient dbClient, I18n i18n, UserSession userSession, RuleWsSupport wsSupport) {
+  public AppAction(Languages languages, DbClient dbClient, UserSession userSession, RuleWsSupport wsSupport) {
     this.languages = languages;
     this.dbClient = dbClient;
-    this.i18n = i18n;
     this.userSession = userSession;
     this.wsSupport = wsSupport;
   }
@@ -81,7 +76,6 @@ public class AppAction implements RulesWsAction {
       addProfiles(dbSession, organization, json);
       addLanguages(json);
       addRuleRepositories(json, dbSession);
-      addStatuses(json);
       json.endObject().close();
     }
   }
@@ -130,14 +124,4 @@ public class AppAction implements RulesWsAction {
         .endObject());
     json.endArray();
   }
-
-  private void addStatuses(JsonWriter json) {
-    json.name("statuses").beginObject();
-    for (RuleStatus status : RuleStatus.values()) {
-      if (status != RuleStatus.REMOVED) {
-        json.prop(status.toString(), i18n.message(Locale.getDefault(), "rules.status." + status.toString().toLowerCase(Locale.ENGLISH), status.toString()));
-      }
-    }
-    json.endObject();
-  }
 }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/AppActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/AppActionTest.java
index 61fe819c81e9543e0b1c9b3947d8f2a4dee154ba..a764dc6ab405cce96cddce30038661ba68e2f547 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/AppActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/AppActionTest.java
@@ -19,11 +19,9 @@
  */
 package org.sonar.server.rule.ws;
 
-import java.util.Locale;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.sonar.api.i18n.I18n;
 import org.sonar.api.resources.Language;
 import org.sonar.api.resources.Languages;
 import org.sonar.api.server.ws.WebService;
@@ -43,10 +41,6 @@ import org.sonar.server.ws.WsActionTester;
 
 import static java.util.Arrays.asList;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.isA;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 import static org.sonar.test.JsonAssert.assertJson;
 
 public class AppActionTest {
@@ -63,9 +57,8 @@ public class AppActionTest {
 
   private Languages languages = new Languages(LANG1, LANG2);
   private DefaultOrganizationProvider defaultOrganizationProvider = TestDefaultOrganizationProvider.from(db);
-  private I18n i18n = mock(I18n.class);
   private RuleWsSupport wsSupport = new RuleWsSupport(db.getDbClient(), userSession, defaultOrganizationProvider);
-  private AppAction underTest = new AppAction(languages, db.getDbClient(), i18n, userSession, wsSupport);
+  private AppAction underTest = new AppAction(languages, db.getDbClient(), userSession, wsSupport);
   private WsActionTester tester = new WsActionTester(underTest);
 
   @Test
@@ -221,8 +214,6 @@ public class AppActionTest {
     RuleRepositoryDto repo2 = new RuleRepositoryDto("squid", "ws", "SonarQube");
     db.getDbClient().ruleRepositoryDao().insert(db.getSession(), asList(repo1, repo2));
     db.getSession().commit();
-    when(i18n.message(isA(Locale.class), anyString(), anyString())).thenAnswer(
-      invocation -> invocation.getArguments()[1]);
   }
 
   private void insertQualityProfiles(OrganizationDto organization) {