From dd9829b274c2300ac5441931239c3aa76446c023 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com>
Date: Wed, 18 Dec 2013 12:40:13 +0100
Subject: [PATCH] Display active rules (with rule notes) in new profile rule
 search page

---
 .../java/org/sonar/core/rule/RuleDto.java     | 36 ++++++++++
 .../org/sonar/core/rule/RuleMapper.xml        |  3 +-
 .../java/org/sonar/core/rule/RuleDaoTest.java |  1 +
 .../sonar/core/rule/RuleDaoTest/selectAll.xml |  6 +-
 .../java/org/sonar/api/rules/ActiveRule.java  | 52 ++++++++++++--
 .../server/qualityprofile/QProfileRule.java   | 68 +++++++++----------
 .../qualityprofile/QProfileRuleNote.java      | 48 +++++++++++++
 .../qualityprofile/QProfileRuleParam.java     | 51 ++++++++++++++
 .../sonar/server/rule/ActiveRuleDocument.java |  6 ++
 .../org/sonar/server/rule/RuleDocument.java   |  7 ++
 .../org/sonar/server/rule/RuleRegistry.java   | 26 ++++++-
 .../org/sonar/server/search/SearchIndex.java  |  2 +-
 .../com/sonar/search/active_rule_mapping.json | 20 ++++++
 .../com/sonar/search/rule_mapping.json        | 24 +++++++
 .../helpers/new_rules_configuration_helper.rb |  2 +-
 .../_active_rule_note.html.erb                | 12 ++--
 .../new_rules_configuration/_rule.html.erb    |  6 +-
 .../_rule_note.html.erb                       |  8 +--
 .../_rule_param.html.erb                      | 29 ++++----
 .../sonar/server/rule/RuleRegistryTest.java   |  6 +-
 .../rule/RuleRegistryTest/rules/rule3.json    |  8 ++-
 21 files changed, 345 insertions(+), 76 deletions(-)
 create mode 100644 sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileRuleNote.java
 create mode 100644 sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileRuleParam.java

diff --git a/sonar-core/src/main/java/org/sonar/core/rule/RuleDto.java b/sonar-core/src/main/java/org/sonar/core/rule/RuleDto.java
index bff6c368b75..de0b9ce63a7 100644
--- a/sonar-core/src/main/java/org/sonar/core/rule/RuleDto.java
+++ b/sonar-core/src/main/java/org/sonar/core/rule/RuleDto.java
@@ -38,6 +38,10 @@ public final class RuleDto {
   private Long parentId;
   private Date createdAt;
   private Date updatedAt;
+  private String noteData;
+  private String noteUserLogin;
+  private Date noteCreatedAt;
+  private Date noteUpdatedAt;
 
   public Long getId() {
     return id;
@@ -150,4 +154,36 @@ public final class RuleDto {
   public void setUpdatedAt(Date updatedAt) {
     this.updatedAt = updatedAt;
   }
+
+  public String getNoteData() {
+    return noteData;
+  }
+
+  public void setNoteData(String noteData) {
+    this.noteData = noteData;
+  }
+
+  public String getNoteUserLogin() {
+    return noteUserLogin;
+  }
+
+  public void setNoteUserLogin(String noteUserLogin) {
+    this.noteUserLogin = noteUserLogin;
+  }
+
+  public Date getNoteCreatedAt() {
+    return noteCreatedAt;
+  }
+
+  public void setNoteCreatedAt(Date noteCreatedAt) {
+    this.noteCreatedAt = noteCreatedAt;
+  }
+
+  public Date getNoteUpdatedAt() {
+    return noteUpdatedAt;
+  }
+
+  public void setNoteUpdatedAt(Date noteUpdatedAt) {
+    this.noteUpdatedAt = noteUpdatedAt;
+  }
 }
diff --git a/sonar-core/src/main/resources/org/sonar/core/rule/RuleMapper.xml b/sonar-core/src/main/resources/org/sonar/core/rule/RuleMapper.xml
index 263431ba75a..1bf537be962 100644
--- a/sonar-core/src/main/resources/org/sonar/core/rule/RuleMapper.xml
+++ b/sonar-core/src/main/resources/org/sonar/core/rule/RuleMapper.xml
@@ -6,7 +6,8 @@
   <sql id="selectColumns">
     id, plugin_rule_key as "ruleKey", plugin_name as "repositoryKey", description, status, name, plugin_config_key as "configKey",
     priority as "priorityOrdinal", cardinality, language as "language", parent_id as "parentId",
-    created_at as "createdAt", updated_at as "updatedAt"
+    created_at as "createdAt", updated_at as "updatedAt",
+    note_data as "noteData", note_user_login as "noteUserLogin", note_created_at as "noteCreatedAt", note_updated_at as "noteUpdatedAt"
   </sql>
 
   <select id="selectAll" resultType="Rule">
diff --git a/sonar-core/src/test/java/org/sonar/core/rule/RuleDaoTest.java b/sonar-core/src/test/java/org/sonar/core/rule/RuleDaoTest.java
index e0e75e52a19..b9bfbf1a5dc 100644
--- a/sonar-core/src/test/java/org/sonar/core/rule/RuleDaoTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/rule/RuleDaoTest.java
@@ -53,6 +53,7 @@ public class RuleDaoTest extends AbstractDaoTestCase {
     assertThat(ruleDto.getDescription()).isEqualTo("Should avoid NULL");
     assertThat(ruleDto.getStatus()).isEqualTo(Rule.STATUS_READY);
     assertThat(ruleDto.getRepositoryKey()).isEqualTo("checkstyle");
+    assertThat(ruleDto.getNoteData()).isEqualTo("Rule note with accents \u00e9\u00e8\u00e0");
   }
 
   @Test
diff --git a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/selectAll.xml b/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/selectAll.xml
index 1fff3c95170..48221d99f1d 100644
--- a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/selectAll.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/selectAll.xml
@@ -1,5 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <dataset>
 
-  <rules id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY"/>
+  <rules id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY"
+    note_data="Rule note with accents éèà" note_user_login="polop.palap" note_created_at="2013-12-25"/>
 
-</dataset>
\ No newline at end of file
+</dataset>
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/rules/ActiveRule.java b/sonar-plugin-api/src/main/java/org/sonar/api/rules/ActiveRule.java
index 36ff776a867..8b0d89c0c8e 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/rules/ActiveRule.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/rules/ActiveRule.java
@@ -25,11 +25,12 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.builder.ToStringBuilder;
 import org.sonar.api.profiles.RulesProfile;
 
+import javax.persistence.*;
+
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
-import javax.persistence.*;
-
 /**
  * A class to map an ActiveRule to the hibernate model
  */
@@ -63,6 +64,21 @@ public class ActiveRule implements Cloneable {
   @Column(name = "inheritance", updatable = true, nullable = true)
   private String inheritance;
 
+  @Lob
+  @Column(name = "note_data", updatable = true, nullable = true)
+  private String noteData;
+
+  @Column(name = "note_user_login", updatable = true, nullable = true)
+  private String noteUserLogin;
+
+  @Temporal(TemporalType.TIMESTAMP)
+  @Column(name = "note_created_at", updatable = true, nullable = true)
+  private Date noteCreatedAt;
+
+  @Temporal(TemporalType.TIMESTAMP)
+  @Column(name = "note_updated_at", updatable = true, nullable = true)
+  private Date noteUpdatedAt;
+
   /**
    * @deprecated visibility should be reduced to protected or package
    */
@@ -91,7 +107,7 @@ public class ActiveRule implements Cloneable {
 
   /**
    * For internal use only.
-   * 
+   *
    * @since 2.5
    */
   public String getInheritance() {
@@ -100,7 +116,7 @@ public class ActiveRule implements Cloneable {
 
   /**
    * For internal use only.
-   * 
+   *
    * @since 2.5
    */
   public void setInheritance(String s) {
@@ -234,6 +250,34 @@ public class ActiveRule implements Cloneable {
     return rule.getKey();
   }
 
+  /**
+   * @since 4.2
+   */
+  public String getNoteData() {
+    return noteData;
+  }
+
+  /**
+   * @since 4.2
+   */
+  public String getNoteUserLogin() {
+    return noteUserLogin;
+  }
+
+  /**
+   * @since 4.2
+   */
+  public Date getNoteCreatedAt() {
+    return noteCreatedAt;
+  }
+
+  /**
+   * @since 4.2
+   */
+  public Date getNoteUpdatedAt() {
+    return noteUpdatedAt;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileRule.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileRule.java
index d0ed511b6bc..0550f8e89bc 100644
--- a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileRule.java
+++ b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileRule.java
@@ -45,11 +45,13 @@ public class QProfileRule {
   private final String parentKey;
   private final Date createdAt;
   private final Date updatedAt;
+  private final QProfileRuleNote ruleNote;
 
   private final int activeRuleId;
   private final String severity;
   private final String inheritance;
-  private final List<Param> params;
+  private final QProfileRuleNote activeRuleNote;
+  private final List<QProfileRuleParam> params;
 
   public QProfileRule(Map<String, Object> ruleSource, Map<String, Object> activeRuleSource) {
 
@@ -64,9 +66,34 @@ public class QProfileRule {
     createdAt = parseOptionalDate(RuleDocument.FIELD_CREATED_AT, ruleSource);
     updatedAt = parseOptionalDate(RuleDocument.FIELD_UPDATED_AT, ruleSource);
 
+    if (ruleSource.containsKey(RuleDocument.FIELD_NOTE)) {
+      Map<String, Object> ruleNoteDocument = (Map<String, Object>) ruleSource.get(RuleDocument.FIELD_NOTE);
+      ruleNote = new QProfileRuleNote(
+        (String) ruleNoteDocument.get(RuleDocument.FIELD_NOTE_DATA),
+        (String) ruleNoteDocument.get(RuleDocument.FIELD_NOTE_USER_LOGIN),
+        parseOptionalDate(RuleDocument.FIELD_NOTE_CREATED_AT, ruleNoteDocument),
+        parseOptionalDate(RuleDocument.FIELD_NOTE_UPDATED_AT, ruleNoteDocument)
+      );
+    } else {
+      ruleNote = null;
+    }
+
     activeRuleId = (Integer) activeRuleSource.get(ActiveRuleDocument.FIELD_ID);
     severity = (String) activeRuleSource.get(ActiveRuleDocument.FIELD_SEVERITY);
     inheritance = (String) activeRuleSource.get(ActiveRuleDocument.FIELD_INHERITANCE);
+
+    if (activeRuleSource.containsKey(ActiveRuleDocument.FIELD_NOTE)) {
+      Map<String, Object> ruleNoteDocument = (Map<String, Object>) activeRuleSource.get(ActiveRuleDocument.FIELD_NOTE);
+      activeRuleNote = new QProfileRuleNote(
+        (String) ruleNoteDocument.get(ActiveRuleDocument.FIELD_NOTE_DATA),
+        (String) ruleNoteDocument.get(ActiveRuleDocument.FIELD_NOTE_USER_LOGIN),
+        parseOptionalDate(ActiveRuleDocument.FIELD_NOTE_CREATED_AT, ruleNoteDocument),
+        parseOptionalDate(ActiveRuleDocument.FIELD_NOTE_UPDATED_AT, ruleNoteDocument)
+      );
+    } else {
+      activeRuleNote = null;
+    }
+
     params = Lists.newArrayList();
     if (ruleSource.containsKey(RuleDocument.FIELD_PARAMS)) {
       Map<String, Map<String, Object>> ruleParams = Maps.newHashMap();
@@ -80,7 +107,7 @@ public class QProfileRule {
         }
       }
       for(Map.Entry<String, Map<String, Object>> ruleParam: ruleParams.entrySet()) {
-        params.add(new Param(
+        params.add(new QProfileRuleParam(
           (String) ruleParam.getValue().get(RuleDocument.FIELD_PARAM_KEY),
           activeRuleParams.containsKey(ruleParam.getKey()) ? (String) activeRuleParams.get(ruleParam.getKey())
             .get(ActiveRuleDocument.FIELD_PARAM_VALUE) : null,
@@ -163,42 +190,15 @@ public class QProfileRule {
     return parentKey != null;
   }
 
-  public List<Param> params() {
+  public List<QProfileRuleParam> params() {
     return params;
   }
 
-  public String note() {
-    return null;
+  public QProfileRuleNote ruleNote() {
+    return ruleNote;
   }
 
-  static class Param {
-    private final String key;
-    private final String value;
-    private final String description;
-    private final String defaultValue;
-    private final String type;
-    public Param(String key, String value, String description, String defaultValue, String type) {
-      super();
-      this.key = key;
-      this.value = value;
-      this.description = description;
-      this.defaultValue = defaultValue;
-      this.type = type;
-    }
-    public String key() {
-      return key;
-    }
-    public String value() {
-      return value;
-    }
-    public String description() {
-      return description;
-    }
-    public String defaultValue() {
-      return defaultValue;
-    }
-    public String type() {
-      return type;
-    }
+  public QProfileRuleNote activeRuleNote() {
+    return activeRuleNote;
   }
 }
diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileRuleNote.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileRuleNote.java
new file mode 100644
index 00000000000..365bcb35fb7
--- /dev/null
+++ b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileRuleNote.java
@@ -0,0 +1,48 @@
+/*
+ * SonarQube, open source software quality management tool.
+ * Copyright (C) 2008-2013 SonarSource
+ * mailto:contact AT sonarsource DOT com
+ *
+ * SonarQube is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * SonarQube is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+package org.sonar.server.qualityprofile;
+
+import java.util.Date;
+
+public class QProfileRuleNote {
+  private final String data;
+  private final String userLogin;
+  private final Date createdAt;
+  private final Date updatedAt;
+  public QProfileRuleNote(String data, String userLogin, Date createdAt, Date updatedAt) {
+    super();
+    this.data = data;
+    this.userLogin = userLogin;
+    this.createdAt = createdAt;
+    this.updatedAt = updatedAt;
+  }
+  public String data() {
+    return data;
+  }
+  public String userLogin() {
+    return userLogin;
+  }
+  public Date createdAt() {
+    return createdAt;
+  }
+  public Date updatedAt() {
+    return updatedAt;
+  }
+}
diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileRuleParam.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileRuleParam.java
new file mode 100644
index 00000000000..6027f12bf6d
--- /dev/null
+++ b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileRuleParam.java
@@ -0,0 +1,51 @@
+/*
+ * SonarQube, open source software quality management tool.
+ * Copyright (C) 2008-2013 SonarSource
+ * mailto:contact AT sonarsource DOT com
+ *
+ * SonarQube is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * SonarQube is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+package org.sonar.server.qualityprofile;
+
+public class QProfileRuleParam {
+  private final String key;
+  private final String value;
+  private final String description;
+  private final String defaultValue;
+  private final String type;
+  public QProfileRuleParam(String key, String value, String description, String defaultValue, String type) {
+    super();
+    this.key = key;
+    this.value = value;
+    this.description = description;
+    this.defaultValue = defaultValue;
+    this.type = type;
+  }
+  public String key() {
+    return key;
+  }
+  public String value() {
+    return value;
+  }
+  public String description() {
+    return description;
+  }
+  public String defaultValue() {
+    return defaultValue;
+  }
+  public String type() {
+    return type;
+  }
+}
diff --git a/sonar-server/src/main/java/org/sonar/server/rule/ActiveRuleDocument.java b/sonar-server/src/main/java/org/sonar/server/rule/ActiveRuleDocument.java
index 5bc6690537e..2db1b5f48a0 100644
--- a/sonar-server/src/main/java/org/sonar/server/rule/ActiveRuleDocument.java
+++ b/sonar-server/src/main/java/org/sonar/server/rule/ActiveRuleDocument.java
@@ -28,6 +28,12 @@ public class ActiveRuleDocument {
   public static final String FIELD_INHERITANCE = "inheritance";
   public static final String FIELD_PARAMS = "params";
 
+  public static final String FIELD_NOTE = "note";
+  public static final String FIELD_NOTE_DATA = "data";
+  public static final String FIELD_NOTE_USER_LOGIN = "userLogin";
+  public static final String FIELD_NOTE_CREATED_AT = "createdAt";
+  public static final String FIELD_NOTE_UPDATED_AT = "updatedAt";
+
   public static final String FIELD_PARAM_KEY = "key";
   public static final String FIELD_PARAM_VALUE = "value";
 
diff --git a/sonar-server/src/main/java/org/sonar/server/rule/RuleDocument.java b/sonar-server/src/main/java/org/sonar/server/rule/RuleDocument.java
index cf444497f36..5159fa2c27c 100644
--- a/sonar-server/src/main/java/org/sonar/server/rule/RuleDocument.java
+++ b/sonar-server/src/main/java/org/sonar/server/rule/RuleDocument.java
@@ -39,6 +39,13 @@ public final class RuleDocument {
   public static final String FIELD_PARAM_TYPE = "type";
   public static final String FIELD_PARAM_DEFAULT_VALUE = "defaultValue";
   public static final String FIELD_PARAM_DESCRIPTION = "description";
+  public static final String FIELD_CARDINALITY = "cardinality";
+
+  public static final String FIELD_NOTE = "note";
+  public static final String FIELD_NOTE_DATA = "data";
+  public static final String FIELD_NOTE_USER_LOGIN = "userLogin";
+  public static final String FIELD_NOTE_CREATED_AT = "createdAt";
+  public static final String FIELD_NOTE_UPDATED_AT = "updatedAt";
 
   private RuleDocument() {
     // Only constants
diff --git a/sonar-server/src/main/java/org/sonar/server/rule/RuleRegistry.java b/sonar-server/src/main/java/org/sonar/server/rule/RuleRegistry.java
index 71e9085607c..718d0845eee 100644
--- a/sonar-server/src/main/java/org/sonar/server/rule/RuleRegistry.java
+++ b/sonar-server/src/main/java/org/sonar/server/rule/RuleRegistry.java
@@ -207,9 +207,12 @@ public class RuleRegistry {
       index++;
     }
     profiler.stop();
-    profiler.start("Index active rules");
-    searchIndex.bulkIndex(INDEX_RULES, TYPE_ACTIVE_RULE, ids, docs, parentIds);
-    profiler.stop();
+
+    if (!rules.isEmpty()) {
+      profiler.start("Index active rules");
+      searchIndex.bulkIndex(INDEX_RULES, TYPE_ACTIVE_RULE, ids, docs, parentIds);
+      profiler.stop();
+    }
 
     List<String> indexIds = searchIndex.findDocumentIds(SearchQuery.create().index(INDEX_RULES).type(TYPE_ACTIVE_RULE));
     indexIds.removeAll(Arrays.asList(ids));
@@ -232,8 +235,17 @@ public class RuleRegistry {
       .field(RuleDocument.FIELD_REPOSITORY_KEY, rule.getRepositoryKey())
       .field(RuleDocument.FIELD_SEVERITY, rule.getPriority())
       .field(RuleDocument.FIELD_STATUS, rule.getStatus())
+      .field(RuleDocument.FIELD_CARDINALITY, rule.getCardinality())
       .field(RuleDocument.FIELD_CREATED_AT, rule.getCreatedAt())
       .field(RuleDocument.FIELD_UPDATED_AT, rule.getUpdatedAt());
+    if (rule.getNoteData() != null || rule.getNoteUserLogin() != null) {
+      document.startObject(RuleDocument.FIELD_NOTE)
+        .field(RuleDocument.FIELD_NOTE_DATA, rule.getNoteData())
+        .field(RuleDocument.FIELD_NOTE_USER_LOGIN, rule.getNoteUserLogin())
+        .field(RuleDocument.FIELD_NOTE_CREATED_AT, rule.getNoteCreatedAt())
+        .field(RuleDocument.FIELD_NOTE_UPDATED_AT, rule.getNoteUpdatedAt())
+        .endObject();
+    }
     if (!params.isEmpty()) {
       document.startArray(RuleDocument.FIELD_PARAMS);
       for (RuleParamDto param : params) {
@@ -257,6 +269,14 @@ public class RuleRegistry {
       .field(ActiveRuleDocument.FIELD_SEVERITY, rule.getSeverity())
       .field(ActiveRuleDocument.FIELD_PROFILE_ID, rule.getRulesProfile().getId())
       .field(ActiveRuleDocument.FIELD_INHERITANCE, rule.getInheritance());
+    if (rule.getNoteData() != null || rule.getNoteUserLogin() != null) {
+      document.startObject(RuleDocument.FIELD_NOTE)
+        .field(ActiveRuleDocument.FIELD_NOTE_DATA, rule.getNoteData())
+        .field(ActiveRuleDocument.FIELD_NOTE_USER_LOGIN, rule.getNoteUserLogin())
+        .field(ActiveRuleDocument.FIELD_NOTE_CREATED_AT, rule.getNoteCreatedAt())
+        .field(ActiveRuleDocument.FIELD_NOTE_UPDATED_AT, rule.getNoteUpdatedAt())
+        .endObject();
+    }
     if (!rule.getActiveRuleParams().isEmpty()) {
       document.startArray(ActiveRuleDocument.FIELD_PARAMS);
       for (ActiveRuleParam param : rule.getActiveRuleParams()) {
diff --git a/sonar-server/src/main/java/org/sonar/server/search/SearchIndex.java b/sonar-server/src/main/java/org/sonar/server/search/SearchIndex.java
index c14b7fc94ed..5c3bffa208f 100644
--- a/sonar-server/src/main/java/org/sonar/server/search/SearchIndex.java
+++ b/sonar-server/src/main/java/org/sonar/server/search/SearchIndex.java
@@ -255,7 +255,7 @@ public class SearchIndex {
       if (bulkResponse.hasFailures()) {
         for (BulkItemResponse bulkItemResponse : bulkResponse.getItems()) {
           if(bulkItemResponse.isFailed()) {
-            throw new IllegalStateException("Bulk operation partially executed");
+            throw new IllegalStateException("Bulk operation partially executed: " + bulkItemResponse.getFailure().getMessage());
           }
         }
       }
diff --git a/sonar-server/src/main/resources/com/sonar/search/active_rule_mapping.json b/sonar-server/src/main/resources/com/sonar/search/active_rule_mapping.json
index 33badb93f2a..8e700a0f720 100644
--- a/sonar-server/src/main/resources/com/sonar/search/active_rule_mapping.json
+++ b/sonar-server/src/main/resources/com/sonar/search/active_rule_mapping.json
@@ -23,6 +23,26 @@
         "type": "string",
         "index": "not_analyzed"
       },
+      "note": {
+        "properties": {
+          "data": {
+            "type": "string",
+            "index": "no"
+          },
+          "userLogin": {
+            "type": "string",
+            "index": "no"
+          },
+          "createdAt": {
+            "type": "date",
+            "format": "date_optional_time"
+          },
+          "updatedAt": {
+            "type": "date",
+            "format": "date_optional_time"
+          }
+        }
+      },
       "params": {
         "properties": {
           "key": {
diff --git a/sonar-server/src/main/resources/com/sonar/search/rule_mapping.json b/sonar-server/src/main/resources/com/sonar/search/rule_mapping.json
index 2ccc2058f33..464f60aca9c 100644
--- a/sonar-server/src/main/resources/com/sonar/search/rule_mapping.json
+++ b/sonar-server/src/main/resources/com/sonar/search/rule_mapping.json
@@ -39,6 +39,10 @@
         "type": "string",
         "index": "not_analyzed"
       },
+      "cardinality": {
+        "type": "string",
+        "index": "no"
+      },
       "createdAt": {
         "type": "date",
         "format": "date_optional_time"
@@ -47,6 +51,26 @@
         "type": "date",
         "format": "date_optional_time"
       },
+      "note": {
+        "properties": {
+          "data": {
+            "type": "string",
+            "index": "no"
+          },
+          "userLogin": {
+            "type": "string",
+            "index": "no"
+          },
+          "createdAt": {
+            "type": "date",
+            "format": "date_optional_time"
+          },
+          "updatedAt": {
+            "type": "date",
+            "format": "date_optional_time"
+          }
+        }
+      },
       "params": {
         "properties": {
           "key": {
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/new_rules_configuration_helper.rb b/sonar-server/src/main/webapp/WEB-INF/app/helpers/new_rules_configuration_helper.rb
index 6932df3f85e..82a07fd6a7b 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/helpers/new_rules_configuration_helper.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/helpers/new_rules_configuration_helper.rb
@@ -48,7 +48,7 @@ module NewRulesConfigurationHelper
   end
 
   def param_value_input(parameter, value, options = {})
-    type=type_with_compatibility(parameter.param_type)
+    type=type_with_compatibility(parameter.type)
     name = options[:name] || 'value'
     property_input_field name, type, value, 'WIDGET', {:id => parameter.id, :size => options[:size] }.update(options)
   end
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/new_rules_configuration/_active_rule_note.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/new_rules_configuration/_active_rule_note.html.erb
index fb3dc3d9284..a053e5a0523 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/new_rules_configuration/_active_rule_note.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/new_rules_configuration/_active_rule_note.html.erb
@@ -1,5 +1,5 @@
-<% #locals = active_rule, profile
-  note = rule.note
+<% #locals = rule, profile
+  note = rule.activeRuleNote
   active_note_detail_div_id = "and_" + rule.activeRuleId.to_s
   add_active_note_button_id = "aanb_" + rule.activeRuleId.to_s
   edit_active_note_link_id = "eanl_" + rule.activeRuleId.to_s
@@ -10,10 +10,10 @@
 %>
 
 <div id="<%= active_note_detail_div_id -%>">
-  <% if note %>
+  <% if !note.nil? %>
     <blockquote class="spacer-bottom">
       <cite>
-        <b><%= note.user.name -%></b> (<%= distance_of_time_in_words_to_now(note.updated_at) -%>)&nbsp;
+        <b><%= User.find_active_by_login(note.userLogin).name -%></b> (<%= distance_of_time_in_words_to_now(Time.at(note.updatedAt.time/1000)) -%>)&nbsp;
         <% if profiles_administrator? %>
           | &nbsp;
           <a href="#" id="<%= edit_active_note_link_id -%>" class="link-action"
@@ -29,7 +29,7 @@
              href="#!"><%=message('delete')-%></a>
         <% end %>
       </cite>
-      <p><%= note.html_text -%></p>
+      <p><%= note.data -%></p>
     </blockquote>
   <% elsif profiles_administrator? %>
     <a href="#" onclick="$j('#<%= active_note_form_div_id -%>').show();$j('#<%= active_note_detail_div_id -%>').hide();$j('#<%= active_note_textarea_id -%>').focus(); return false;"
@@ -52,7 +52,7 @@
       <tr>
         <td class="width100" colspan="2">
           <textarea name="note" id="<%= active_note_textarea_id -%>" rows="10" style="width:100%"
-                    onkeyup="if (this.value=='') $j('#<%= submit_active_note_update_button_id -%>').prop('disabled', true); else $j('#<%= submit_active_note_update_button_id -%>').prop('disabled', false);"><%= h(note.plain_text) if note -%></textarea>
+                    onkeyup="if (this.value=='') $j('#<%= submit_active_note_update_button_id -%>').prop('disabled', true); else $j('#<%= submit_active_note_update_button_id -%>').prop('disabled', false);"><%= h(note.data) unless note.nil? -%></textarea>
         </td>
       </tr>
     <tr>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/new_rules_configuration/_rule.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/new_rules_configuration/_rule.html.erb
index dbbf38439af..49a714ea9c1 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/new_rules_configuration/_rule.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/new_rules_configuration/_rule.html.erb
@@ -76,14 +76,10 @@
           </tr>
         <% end %>
         <% rule.params.each do |parameter| %>
-        <%
-=begin %>
-          <tr id="param_<%= parameter.id -%>">
+          <tr id="param_<%= parameter.key -%>">
             <%= render :partial => 'rule_param', :object => nil,
                        :locals => {:parameter => parameter, :profile => profile, :rule => rule, :ancestor_active_rule => ancestor_active_rule} %>
           </tr>
-          <%
-=end %>
         <%
            end
         %>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/new_rules_configuration/_rule_note.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/new_rules_configuration/_rule_note.html.erb
index 047267665cc..ed46d04a7e0 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/new_rules_configuration/_rule_note.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/new_rules_configuration/_rule_note.html.erb
@@ -1,5 +1,5 @@
 <% #locals = rule
-  note = rule.note
+  note = rule.ruleNote
   note_detail_div_id = "nd_" + rule.id.to_s
   note_extend_link_id = "nel_" + rule.id.to_s
   note_form_div_id = "nf_" + rule.id.to_s
@@ -18,8 +18,8 @@
   <% end %>
   </div>
 
-  <% if note && !note.text.strip.blank? %>
-    <p><%= note.html_text -%></p>
+  <% unless rule.ruleNote.nil? %>
+    <p><%= rule.ruleNote.data -%></p>
   <% end %>
 
   <% if profiles_administrator? %>
@@ -48,7 +48,7 @@
       </tr>
       <tr>
         <td class="width100" colspan="2">
-          <textarea name="text" id="<%= note_textarea_id -%>" rows="10" style="width:100%"><%= h(note.plain_text) if note -%></textarea>
+          <textarea name="text" id="<%= note_textarea_id -%>" rows="10" style="width:100%"><%= h(note.data) if note -%></textarea>
         </td>
       </tr>
     <tr>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/new_rules_configuration/_rule_param.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/new_rules_configuration/_rule_param.html.erb
index dcd477ee187..36f9da2c544 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/new_rules_configuration/_rule_param.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/new_rules_configuration/_rule_param.html.erb
@@ -1,36 +1,39 @@
-<% param_value = parameter.default_value || ''
-   param_value = active_parameter.value if active_parameter
-   active_param_id = active_parameter.id if active_parameter
-   active_rule_id = active_rule.id if active_rule
-   read_only = !active_rule || !profiles_administrator?
+<% # locals = rule, profile, parameter
+   param_value = parameter.defaultValue || parameter.value || ''
+   active_rule_id = rule.activeRuleId
+   read_only = rule.activeRuleId.nil? || !profiles_administrator?
 %>
 
-<td class="form-key-cell"><%= parameter.name -%></td>
+<td class="form-key-cell"><%= parameter.key -%></td>
 
 <td class="form-val-cell">
-    <form onsubmit="$j.ajax({  url: '<%= ApplicationController.root_context -%>/new_rules_configuration/update_param/<%=active_param_id-%>?active_rule_id=<%=active_rule_id-%>&param_id=<%=parameter.id-%>&profile_id=<%=profile.id-%>',
+    <form onsubmit="$j.ajax({  url: '<%= ApplicationController.root_context -%>/new_rules_configuration/update_param/?active_rule_id=<%=active_rule_id-%>&param_id=<%=parameter.key-%>&profile_id=<%=profile.id-%>',
                                type:'post',beforeSend: function(request){$j('#param_loading_<%=parameter.id-%>').show();$j('#error_<%=parameter.id-%>').hide();},
                                data: $j(this).serialize(),
                                success: function(response){$j('#rule_<%=rule.id-%>').html(response);},
                                complete: function(request){$j('#desc_<%=rule.id-%>').show();$j('#param_loading_<%=parameter.id-%>').hide();},
                                error: function(request){$j('#error_<%=parameter.id-%>').text(request.responseText);$j('#error_<%=parameter.id-%>').show();}
                             }); return false;"
-           name="form-<%=u parameter.name-%>" method="post"
-           action="<%= ApplicationController.root_context -%>/new_rules_configuration/update_param/<%=active_param_id-%>?active_rule_id=<%=active_rule_id-%>&param_id=<%=parameter.id-%>&profile_id=<%=profile.id-%>">
+           name="form-<%=u parameter.key-%>" method="post"
+           action="<%= ApplicationController.root_context -%>/new_rules_configuration/update_param/?active_rule_id=<%=active_rule_id-%>&param_id=<%=parameter.key-%>&profile_id=<%=profile.id-%>">
 
-  <div id="error_<%= parameter.id -%>" class="error" style="display: none"></div>
+  <div id="error_<%= active_rule_id -%><%= parameter.key -%>" class="error" style="display: none"></div>
 
-  <span id="text_<%= parameter.id -%>"><%= param_value_input(parameter, param_value, :disabled => read_only) -%></span>
+  <span id="text_<%= active_rule_id -%><%= parameter.key -%>"><%= param_value_input(parameter, param_value, :disabled => read_only) -%></span>
 
   <% unless read_only %>
     <%= submit_tag(message('update_verb'), :id => 'submit_' + parameter.id.to_s) %>
     <img src="<%= ApplicationController.root_context -%>/images/loading.gif" style="display:none;" id="param_loading_<%= parameter.id -%>" class="rule-param-loading">
+<%
+=begin %>
     <% if active_parameter and active_parameter.errors.size>0 %>
       <span class="error"><%= active_parameter.errors.on 'value' %></span>
     <% end %>
+<%
+=end %>
   <% end %>
 
-  <% if active_rule && active_rule.overrides? && ancestor_active_rule
+  <% if !rule.nil? && rule.overrides? && ancestor_active_rule
        ancestor_param = ancestor_active_rule.active_param_by_param_id(parameter.id)
        ancestor_value = ancestor_param && ancestor_param.value ? ancestor_param.value : ''
   %>
@@ -43,7 +46,7 @@
     <% end %>
   <% end %>
 
-  <div class="form-val-note"><%= h(parameter.description || "") -%> <%= ('(' + readable_type(parameter.param_type) + ')') if !readable_type(parameter.param_type).empty? -%></div>
+  <div class="form-val-note"><%= h(parameter.description || "") -%> <%= ('(' + readable_type(parameter.type) + ')') if !readable_type(parameter.type).empty? -%></div>
 
   </form>
 </td>
diff --git a/sonar-server/src/test/java/org/sonar/server/rule/RuleRegistryTest.java b/sonar-server/src/test/java/org/sonar/server/rule/RuleRegistryTest.java
index d2f1972e0c2..5d38bbd74b6 100644
--- a/sonar-server/src/test/java/org/sonar/server/rule/RuleRegistryTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/rule/RuleRegistryTest.java
@@ -52,7 +52,9 @@ import java.util.HashMap;
 import java.util.List;
 
 import static com.google.common.collect.Lists.newArrayList;
-import static org.elasticsearch.index.query.FilterBuilders.*;
+import static org.elasticsearch.index.query.FilterBuilders.hasChildFilter;
+import static org.elasticsearch.index.query.FilterBuilders.hasParentFilter;
+import static org.elasticsearch.index.query.FilterBuilders.termFilter;
 import static org.fest.assertions.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -169,6 +171,8 @@ public class RuleRegistryTest {
     rule1.setRepositoryKey("repo");
     rule1.setRuleKey("key1");
     rule1.setId(ruleId1);
+    rule1.setNoteData("noteData");
+    rule1.setNoteUserLogin("userLogin");
     long ruleId2 = 4L;
     RuleDto rule2 = new RuleDto();
     rule2.setRepositoryKey("repo");
diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/rules/rule3.json b/sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/rules/rule3.json
index 83ec573d96e..534591d038b 100644
--- a/sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/rules/rule3.json
+++ b/sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/rules/rule3.json
@@ -9,5 +9,11 @@
   "severity": "CRITICAL",
   "status": "REMOVED",
   "createdAt": "2013-10-28T13:07:26.329Z",
-  "updatedAt": "2013-11-08T10:52:53.473Z"
+  "updatedAt": "2013-11-08T10:52:53.473Z",
+  "note": {
+    "userLogin": "freddy.mallet",
+    "data": "",
+    "createdAt": "2013-12-10T13:07:26.329Z",
+    "updatedAt": "2013-12-12T10:52:53.473Z"
+  }
 }
-- 
2.39.5