SONAR-6572 WS metrics/update fix error message when updating with an …

…existing key
SonarSource · Jun 8, 2015 · 5696333 · 5696333
1 parent 9e731cf
commit 5696333
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/server/sonar-server/src/main/java/org/sonar/server/metric/ws/UpdateAction.java b/server/sonar-server/src/main/java/org/sonar/server/metric/ws/UpdateAction.java
@@ -183,9 +183,10 @@ private void checkMetricInDbAndTemplate(DbSession dbSession, @Nullable MetricDto
   }
 
   private void checkNoOtherMetricWithTargetKey(DbSession dbSession, MetricDto metricInDb, MetricDto template) {
-    MetricDto metricWithTargetKey = dbClient.metricDao().selectNullableByKey(dbSession, template.getKey());
+    String targetKey = template.getKey();
+    MetricDto metricWithTargetKey = dbClient.metricDao().selectNullableByKey(dbSession, targetKey);
     if (isMetricFoundInDb(metricWithTargetKey) && !metricInDb.getId().equals(metricWithTargetKey.getId())) {
-      throw new ServerException(HttpURLConnection.HTTP_CONFLICT, "A me metric exists with the key: " + metricInDb.getKey());
+      throw new ServerException(HttpURLConnection.HTTP_CONFLICT, String.format("The key '%s' is already used by an existing metric.", targetKey));
     }
   }
 

diff --git a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/UpdateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/UpdateActionTest.java
@@ -143,6 +143,7 @@ public void update_return_the_full_object_with_id() throws Exception {
   @Test
   public void fail_when_changing_key_for_an_existing_one() throws Exception {
     expectedException.expect(ServerException.class);
+    expectedException.expectMessage("The key 'metric-key' is already used by an existing metric.");
     insertMetric(newDefaultMetric().setKey("metric-key"));
     int id = insertMetric(newDefaultMetric().setKey("another-key"));