From f4b56a5423ef9bc5a6dfced3a91024579d351e77 Mon Sep 17 00:00:00 2001
From: Julien Lancelot <julien.lancelot@sonarsource.com>
Date: Thu, 27 Feb 2014 18:35:49 +0100
Subject: [PATCH] Revert "In the rule tag validation message, do not display
 tag on ui side"

This reverts commit 633d837580f1e86ba2d188e3655b5d932ba4991b.
---
 .../java/org/sonar/api/server/rule/RuleDefinitions.java   | 8 +-------
 .../java/org/sonar/api/server/rule/RuleTagFormat.java     | 2 +-
 .../org/sonar/api/server/rule/RuleDefinitionsTest.java    | 8 +++-----
 .../java/org/sonar/api/server/rule/RuleTagFormatTest.java | 2 +-
 .../src/main/java/org/sonar/server/rule/RuleTags.java     | 2 +-
 5 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/RuleDefinitions.java b/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/RuleDefinitions.java
index 95b7b37c28e..596982289ba 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/RuleDefinitions.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/RuleDefinitions.java
@@ -26,12 +26,10 @@ import org.slf4j.LoggerFactory;
 import org.sonar.api.ServerExtension;
 import org.sonar.api.rule.RuleStatus;
 import org.sonar.api.rule.Severity;
-import org.sonar.api.utils.MessageException;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
@@ -390,11 +388,7 @@ public interface RuleDefinitions extends ServerExtension {
      */
     public NewRule addTags(String... list) {
       for (String tag : list) {
-        try {
-          RuleTagFormat.validate(tag);
-        } catch (IllegalArgumentException e) {
-          throw MessageException.of(String.format("Tag '%s' is invalid. %s", tag, e.getMessage()));
-        }
+        RuleTagFormat.validate(tag);
         tags.add(tag);
       }
       return this;
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/RuleTagFormat.java b/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/RuleTagFormat.java
index 7120628f58d..8701e1aa2cf 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/RuleTagFormat.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/RuleTagFormat.java
@@ -40,7 +40,7 @@ public class RuleTagFormat {
 
   public static void validate(String tag) {
     if (!isValid(tag)) {
-      throw new IllegalArgumentException("Rule tags accept only the following characters: a-z, 0-9, '+', '-', '#', '.'");
+      throw new IllegalArgumentException(String.format("Rule tags accept only the following characters: a-z, 0-9, '+', '-', '#', '.' - '%s'", tag));
     }
   }
 }
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/server/rule/RuleDefinitionsTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/server/rule/RuleDefinitionsTest.java
index 921c2d71928..93af6b0e745 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/server/rule/RuleDefinitionsTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/server/rule/RuleDefinitionsTest.java
@@ -20,9 +20,8 @@
 package org.sonar.api.server.rule;
 
 import org.junit.Test;
-import org.sonar.api.rule.RuleStatus;
 import org.sonar.api.rule.Severity;
-import org.sonar.api.utils.MessageException;
+import org.sonar.api.rule.RuleStatus;
 
 import java.net.URL;
 
@@ -228,9 +227,8 @@ public class RuleDefinitionsTest {
       // whitespaces are not allowed in tags
       context.newRepository("findbugs", "java").newRule("NPE").setTags("coding style");
       fail();
-    } catch (Exception e) {
-      assertThat(e).isInstanceOf(MessageException.class)
-        .hasMessage("Tag 'coding style' is invalid. Rule tags accept only the following characters: a-z, 0-9, '+', '-', '#', '.'");
+    } catch (IllegalArgumentException e) {
+      assertThat(e).hasMessage("Rule tags accept only the following characters: a-z, 0-9, '+', '-', '#', '.' - 'coding style'");
     }
   }
 
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/server/rule/RuleTagFormatTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/server/rule/RuleTagFormatTest.java
index e78aa298c50..0bb5d18acad 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/server/rule/RuleTagFormatTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/server/rule/RuleTagFormatTest.java
@@ -53,7 +53,7 @@ public class RuleTagFormatTest {
       RuleTagFormat.validate("  ");
       fail();
     } catch (IllegalArgumentException e) {
-      assertThat(e).hasMessage("Rule tags accept only the following characters: a-z, 0-9, '+', '-', '#', '.'");
+      assertThat(e).hasMessage("Rule tags accept only the following characters: a-z, 0-9, '+', '-', '#', '.' - '  '");
     }
   }
 }
diff --git a/sonar-server/src/main/java/org/sonar/server/rule/RuleTags.java b/sonar-server/src/main/java/org/sonar/server/rule/RuleTags.java
index cf15e4f18d2..c4346ceab9f 100644
--- a/sonar-server/src/main/java/org/sonar/server/rule/RuleTags.java
+++ b/sonar-server/src/main/java/org/sonar/server/rule/RuleTags.java
@@ -26,7 +26,7 @@ import org.sonar.server.user.UserSession;
 import java.util.Collection;
 
 /**
- * Used through ruby code <pre>Internal.rule_tags</pre>
+ * Used through ruby code <pre>Internal.quality_profiles</pre>
  */
 public class RuleTags implements ServerExtension {
 
-- 
2.39.5