From: Jean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com>
Date: Wed, 4 Jun 2014 14:19:56 +0000 (+0200)
Subject: SONAR-5334 Remove messages from */app WS
X-Git-Tag: 4.4-RC1~629
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a7a3c8ad4ebc217db744f6dcde43d7604e9e53bf;p=sonarqube.git

SONAR-5334 Remove messages from */app WS
---

diff --git a/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesAppAction.java b/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesAppAction.java
index 228d7b79276..464226f1c03 100644
--- a/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesAppAction.java
+++ b/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesAppAction.java
@@ -34,63 +34,6 @@ import java.util.Locale;
 
 public class QGatesAppAction implements RequestHandler {
 
-  private static final String[] MESSAGE_KEYS = {
-      "add_verb",
-      "alerts.error_tooltip",
-      "alerts.notes.error",
-      "alerts.notes.ok",
-      "alerts.notes.warn",
-      "alerts.select_metric",
-      "alerts.warning_tooltip",
-      "are_you_sure",
-      "cancel",
-      "copy",
-      "create",
-      "default",
-      "delete",
-      "deprecated",
-      "more",
-      "name",
-      "quality_gates.add_condition",
-      "quality_gates.conditions",
-      "quality_gates.copy",
-      "quality_gates.create",
-      "quality_gates.delete",
-      "quality_gates.health_icons",
-      "quality_gates.introduction",
-      "quality_gates.no_conditions",
-      "quality_gates.delete_condition",
-      "quality_gates.noQualityGates",
-      "quality_gates.operator.LT",
-      "quality_gates.operator.GT",
-      "quality_gates.operator.EQ",
-      "quality_gates.operator.NE",
-      "quality_gates.page",
-      "quality_gates.projects",
-      "quality_gates.projects.all",
-      "quality_gates.projects.deselect_hint",
-      "quality_gates.projects.noResults",
-      "quality_gates.projects.select_hint",
-      "quality_gates.projects.with",
-      "quality_gates.projects.without",
-      "quality_gates.projects_for_default",
-      "quality_gates.projects_for_default.edit",
-      "quality_gates.rename",
-      "quality_gates.delete.confirm.message",
-      "quality_gates.delete.confirm.default",
-      "quality_gates.delete_condition.confirm.message",
-      "quality_gates.project_period",
-      "rename",
-      "save",
-      "set_as_default",
-      "unset_as_default",
-      "update_verb",
-      "value",
-      "work_duration.x_days",
-      "work_duration.x_hours",
-      "work_duration.x_minutes",
-  };
-
   private final QualityGates qualityGates;
 
   private final Periods periods;
@@ -117,7 +60,6 @@ public class QGatesAppAction implements RequestHandler {
     addPermissions(writer);
     addPeriods(writer);
     addMetrics(writer);
-    addMessages(writer);
     writer.endObject().close();
   }
 
@@ -141,14 +83,6 @@ public class QGatesAppAction implements RequestHandler {
     ).endObject();
   }
 
-  private void addMessages(JsonWriter writer) {
-    writer.name("messages").beginObject();
-    for (String message: MESSAGE_KEYS) {
-      writer.prop(message, i18n.message(Locale.getDefault(), message, message));
-    }
-    writer.endObject();
-  }
-
   private void addMetrics(JsonWriter writer) {
     writer.name("metrics").beginArray();
     for (Metric metric: qualityGates.gateMetrics()) {
diff --git a/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/QGatesAppActionTest.java b/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/QGatesAppActionTest.java
index 956192c1fbd..53e3fac86d2 100644
--- a/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/QGatesAppActionTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/QGatesAppActionTest.java
@@ -39,12 +39,12 @@ import org.sonar.server.ws.WsTester;
 import java.util.Collection;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
 import static org.fest.assertions.Assertions.assertThat;
 import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
 public class QGatesAppActionTest {
@@ -95,11 +95,6 @@ public class QGatesAppActionTest {
     assertThat((Boolean) responseJson.get("edit")).isFalse();
     Collection<Map> periods = (Collection<Map>) responseJson.get("periods");
     assertThat(periods).hasSize(5);
-    Map messages = (Map) responseJson.get("messages");
-    assertThat(messages).isNotNull().isNotEmpty().hasSize(54);
-    for (Entry message : (Set<Entry>) messages.entrySet()) {
-      assertThat(message.getKey()).isEqualTo(message.getValue());
-    }
     Collection<Map> metrics = (Collection<Map>) responseJson.get("metrics");
     assertThat(metrics).hasSize(1);
     Map metricMap = metrics.iterator().next();