From aed2ea7a145c6f3b8a1fbcf61b3e230b92594e37 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com>
Date: Thu, 3 Jul 2014 11:02:18 +0200
Subject: Fix availability of Inheritance filter in Coding Rules

---
 .../coffee/coding-rules/views/filters/inheritance-filter-view.coffee  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'sonar-server/src/main')

diff --git a/sonar-server/src/main/coffee/coding-rules/views/filters/inheritance-filter-view.coffee b/sonar-server/src/main/coffee/coding-rules/views/filters/inheritance-filter-view.coffee
index b3cda3c1be2..99e8fd57ec1 100644
--- a/sonar-server/src/main/coffee/coding-rules/views/filters/inheritance-filter-view.coffee
+++ b/sonar-server/src/main/coffee/coding-rules/views/filters/inheritance-filter-view.coffee
@@ -19,8 +19,8 @@ define [
       qualityProfileKey = @qualityProfileFilter.get 'value'
       if _.isArray(qualityProfileKey) && qualityProfileKey.length == 1
         qualityProfile = @options.app.getQualityProfileByKey qualityProfileKey[0]
-        if qualityProfile.parent
-          parentQualityProfile = @options.app.getQualityProfile qualityProfile.parent
+        if qualityProfile.parentKey
+          parentQualityProfile = @options.app.getQualityProfile qualityProfile.parentKey
           if parentQualityProfile
             @makeActive()
           else
-- 
cgit v1.2.3


From 417f1afa08fdae0c5d3d8a633c44e4e848abaead Mon Sep 17 00:00:00 2001
From: Stephane Gamard <stephane.gamard@searchbox.com>
Date: Thu, 3 Jul 2014 15:05:05 +0200
Subject: SONAR-5007 - added createdAt and updatedAt fields for ActiveRuleDto

---
 .../main/java/org/sonar/core/persistence/Dto.java  |  8 +++---
 .../core/qualityprofile/db/QualityProfileDto.java  | 17 ------------
 .../core/qualityprofile/db/ActiveRuleMapper.xml    | 30 ++++++++++++++--------
 .../src/main/java/org/sonar/server/db/BaseDao.java | 24 ++++++++---------
 .../sonar/server/qualityprofile/ActiveRule.java    |  5 ++++
 .../server/qualityprofile/index/ActiveRuleDoc.java | 12 +++++++++
 .../qualityprofile/index/ActiveRuleNormalizer.java | 14 +++++++++-
 .../qualityprofile/RuleActivatorMediumTest.java    | 11 +++++---
 8 files changed, 73 insertions(+), 48 deletions(-)

(limited to 'sonar-server/src/main')

diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/Dto.java b/sonar-core/src/main/java/org/sonar/core/persistence/Dto.java
index d604962cbf9..891ebcd595c 100644
--- a/sonar-core/src/main/java/org/sonar/core/persistence/Dto.java
+++ b/sonar-core/src/main/java/org/sonar/core/persistence/Dto.java
@@ -29,19 +29,19 @@ public abstract class Dto<K extends Serializable> {
 
   public abstract K getKey();
 
-  public void setCreatedAt(Date datetime){
+  public final void setCreatedAt(Date datetime) {
     this.createdAt = datetime;
   }
 
-  public void setUpdatedAt(Date datetime){
+  public final void setUpdatedAt(Date datetime) {
     this.updatedAt = datetime;
   }
 
-  public Date getCreatedAt(){
+  public final Date getCreatedAt() {
     return this.createdAt;
   }
 
-  public Date getUpdatedAt(){
+  public final Date getUpdatedAt() {
     return this.updatedAt;
   }
 }
diff --git a/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/QualityProfileDto.java b/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/QualityProfileDto.java
index ae9eab457df..b11695a519a 100644
--- a/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/QualityProfileDto.java
+++ b/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/QualityProfileDto.java
@@ -34,7 +34,6 @@ public class QualityProfileDto extends Dto<String> {
   private String name;
   private String language;
   private String parentKee;
-  private Date createdAt, updatedAt;
   private String rulesUpdatedAt;
 
   /**
@@ -100,22 +99,6 @@ public class QualityProfileDto extends Dto<String> {
     return this;
   }
 
-  public Date getCreatedAt() {
-    return createdAt;
-  }
-
-  public void setCreatedAt(Date createdAt) {
-    this.createdAt = createdAt;
-  }
-
-  public Date getUpdatedAt() {
-    return updatedAt;
-  }
-
-  public void setUpdatedAt(Date updatedAt) {
-    this.updatedAt = updatedAt;
-  }
-
   public String getRulesUpdatedAt() {
     return rulesUpdatedAt;
   }
diff --git a/sonar-core/src/main/resources/org/sonar/core/qualityprofile/db/ActiveRuleMapper.xml b/sonar-core/src/main/resources/org/sonar/core/qualityprofile/db/ActiveRuleMapper.xml
index 5ff6c7c59fb..fd3c1a00fe2 100644
--- a/sonar-core/src/main/resources/org/sonar/core/qualityprofile/db/ActiveRuleMapper.xml
+++ b/sonar-core/src/main/resources/org/sonar/core/qualityprofile/db/ActiveRuleMapper.xml
@@ -11,7 +11,9 @@
     a.inheritance as "inheritance",
     r.plugin_rule_key as "rulefield",
     r.plugin_name as "repository",
-    qp.kee as "profileKey"
+    qp.kee as "profileKey",
+    a.created_at as "createdAt",
+    a.updated_at as "updatedAt"
   </sql>
 
   <sql id="activeRuleKeyJoin">
@@ -26,7 +28,9 @@
     a.rule_id as ruleId,
     a.failure_level as severity,
     a.inheritance as inheritance,
-    active_rule_parent.id as parentId
+    active_rule_parent.id as parentId,
+    a.created_at as "createdAt",
+    a.updated_at as "updatedAt"
   </sql>
 
   <sql id="activeRuleJoin">
@@ -48,8 +52,8 @@
   </select>
 
   <insert id="insert" parameterType="ActiveRule" keyColumn="id" useGeneratedKeys="true" keyProperty="id">
-    INSERT INTO active_rules (profile_id, rule_id, failure_level, inheritance)
-    VALUES (#{profileId}, #{ruleId}, #{severity}, #{inheritance})
+    INSERT INTO active_rules (profile_id, rule_id, failure_level, inheritance, created_at, updated_at)
+    VALUES (#{profileId}, #{ruleId}, #{severity}, #{inheritance}, #{createdAt}, #{updatedAt})
   </insert>
 
   <update id="update" parameterType="ActiveRule">
@@ -57,7 +61,8 @@
     profile_id=#{profileId},
     rule_id=#{ruleId},
     failure_level=#{severity},
-    inheritance=#{inheritance}
+    inheritance=#{inheritance},
+    updated_at=#{updatedAt}
     WHERE id=#{id}
   </update>
 
@@ -78,7 +83,8 @@
   </select>
 
   <select id="selectById" parameterType="int" resultType="ActiveRule">
-    SELECT <include refid="activeRuleColumns"/>
+    SELECT
+    <include refid="activeRuleColumns"/>
     FROM active_rules a
     <include refid="activeRuleJoin"/>
     WHERE a.id=#{id}
@@ -91,13 +97,14 @@
     FROM active_rules a
     <include refid="activeRuleKeyJoin"/>
     WHERE
-      qp.kee = #{profileKey}
-      AND r.plugin_rule_key = #{rule}
-      AND r.plugin_name = #{repository}
+    qp.kee = #{profileKey}
+    AND r.plugin_rule_key = #{rule}
+    AND r.plugin_name = #{repository}
   </select>
 
   <select id="selectByProfileKey" parameterType="string" resultType="ActiveRule">
-    SELECT <include refid="activeRuleKeyColumns"/>
+    SELECT
+    <include refid="activeRuleKeyColumns"/>
     FROM active_rules a
     <include refid="activeRuleKeyJoin"/>
     where qp.kee=#{id}
@@ -171,7 +178,8 @@
   </select>
 
   <select id="selectParamByActiveRuleAndKey" parameterType="map" resultType="ActiveRuleParam">
-    SELECT <include refid="activeRuleParamColumns"/>
+    SELECT
+    <include refid="activeRuleParamColumns"/>
     FROM active_rule_parameters p
     <where>
       AND p.active_rule_id=#{activeRuleId}
diff --git a/sonar-server/src/main/java/org/sonar/server/db/BaseDao.java b/sonar-server/src/main/java/org/sonar/server/db/BaseDao.java
index b79ee901583..f14365889f8 100644
--- a/sonar-server/src/main/java/org/sonar/server/db/BaseDao.java
+++ b/sonar-server/src/main/java/org/sonar/server/db/BaseDao.java
@@ -146,7 +146,7 @@ public abstract class BaseDao<M, E extends Dto<K>, K extends Serializable> imple
     return doGetNullableByKey(session, key);
   }
 
-  public E getByKey(DbSession session, K key) {
+  public final E getByKey(DbSession session, K key) {
     E value = doGetNullableByKey(session, key);
     if (value == null) {
       throw new NotFoundException(String.format("Key '%s' not found", key));
@@ -155,14 +155,14 @@ public abstract class BaseDao<M, E extends Dto<K>, K extends Serializable> imple
   }
 
   @Override
-  public E update(DbSession session, E item) {
+  public final E update(DbSession session, E item) {
     Date now = new Date(system2.now());
     update(session, item, now);
     return item;
   }
 
   @Override
-  public E update(DbSession session, E item, E... others) {
+  public final E update(DbSession session, E item, E... others) {
     Date now = new Date(system2.now());
     update(session, item, now);
     for (E other : others) {
@@ -172,7 +172,7 @@ public abstract class BaseDao<M, E extends Dto<K>, K extends Serializable> imple
   }
 
   @Override
-  public Collection<E> update(DbSession session, Collection<E> items) {
+  public final Collection<E> update(DbSession session, Collection<E> items) {
     Date now = new Date(system2.now());
     for (E item : items) {
       update(session, item, now);
@@ -189,13 +189,13 @@ public abstract class BaseDao<M, E extends Dto<K>, K extends Serializable> imple
   }
 
   @Override
-  public E insert(DbSession session, E item) {
+  public final E insert(DbSession session, E item) {
     insert(session, item, new Date(system2.now()));
     return item;
   }
 
   @Override
-  public Collection<E> insert(DbSession session, Collection<E> items) {
+  public final Collection<E> insert(DbSession session, Collection<E> items) {
     Date now = new Date(system2.now());
     for (E item : items) {
       insert(session, item, now);
@@ -204,7 +204,7 @@ public abstract class BaseDao<M, E extends Dto<K>, K extends Serializable> imple
   }
 
   @Override
-  public E insert(DbSession session, E item, E... others) {
+  public final E insert(DbSession session, E item, E... others) {
     Date now = new Date(system2.now());
     insert(session, item, now);
     for (E other : others) {
@@ -225,12 +225,12 @@ public abstract class BaseDao<M, E extends Dto<K>, K extends Serializable> imple
   }
 
   @Override
-  public void delete(DbSession session, E item) {
+  public final void delete(DbSession session, E item) {
     deleteByKey(session, item.getKey());
   }
 
   @Override
-  public void delete(DbSession session, E item, E... others) {
+  public final void delete(DbSession session, E item, E... others) {
     delete(session, item);
     for (E e : others) {
       delete(session, e);
@@ -238,14 +238,14 @@ public abstract class BaseDao<M, E extends Dto<K>, K extends Serializable> imple
   }
 
   @Override
-  public void delete(DbSession session, Collection<E> items) {
+  public final void delete(DbSession session, Collection<E> items) {
     for (E item : items) {
       delete(session, item);
     }
   }
 
   @Override
-  public void deleteByKey(DbSession session, K key) {
+  public final void deleteByKey(DbSession session, K key) {
     Preconditions.checkNotNull(key, "Missing key");
     doDeleteByKey(session, key);
     if (hasIndex()) {
@@ -253,7 +253,7 @@ public abstract class BaseDao<M, E extends Dto<K>, K extends Serializable> imple
     }
   }
 
-  protected void enqueueUpdate(Object nestedItem, K key, DbSession session) {
+  protected final void enqueueUpdate(Object nestedItem, K key, DbSession session) {
     if (hasIndex()) {
       session.enqueue(new EmbeddedIndexAction<K>(
         this.getIndexType(), IndexAction.Method.UPSERT, key, nestedItem));
diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/ActiveRule.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ActiveRule.java
index 5258c43bc15..649ef441a13 100644
--- a/sonar-server/src/main/java/org/sonar/server/qualityprofile/ActiveRule.java
+++ b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ActiveRule.java
@@ -23,6 +23,7 @@ import com.google.common.collect.ImmutableList;
 import org.sonar.core.qualityprofile.db.ActiveRuleKey;
 
 import javax.annotation.CheckForNull;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -33,6 +34,10 @@ public interface ActiveRule {
     public static final List<Inheritance> ALL = ImmutableList.of(NONE, OVERRIDES, INHERITED);
   }
 
+  Date createdAt();
+
+  Date updatedAt();
+
   ActiveRuleKey key();
 
   String severity();
diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleDoc.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleDoc.java
index 24ce64dd9e4..66048c8ba45 100644
--- a/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleDoc.java
+++ b/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleDoc.java
@@ -23,8 +23,10 @@ import com.google.common.base.Preconditions;
 import org.sonar.core.qualityprofile.db.ActiveRuleKey;
 import org.sonar.server.qualityprofile.ActiveRule;
 import org.sonar.server.search.BaseDoc;
+import org.sonar.server.search.IndexUtils;
 
 import javax.annotation.CheckForNull;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -39,6 +41,16 @@ public class ActiveRuleDoc extends BaseDoc implements ActiveRule {
     Preconditions.checkArgument(key!=null, "Invalid ActiveRuleKey!");
   }
 
+  @Override
+  public Date createdAt() {
+    return IndexUtils.parseDateTime((String) getNullableField(ActiveRuleNormalizer.ActiveRuleField.CREATED_AT.field()));
+  }
+
+  @Override
+  public Date updatedAt() {
+    return IndexUtils.parseDateTime((String) getNullableField(ActiveRuleNormalizer.ActiveRuleField.UPDATED_AT.field()));
+  }
+
   @Override
   public ActiveRuleKey key() {
     return this.key;
diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleNormalizer.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleNormalizer.java
index 3160acf8854..e3fa5b12271 100644
--- a/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleNormalizer.java
+++ b/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleNormalizer.java
@@ -37,7 +37,12 @@ import org.sonar.server.search.Indexable;
 import org.sonar.server.search.es.ListUpdate;
 
 import java.lang.reflect.Field;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 public class ActiveRuleNormalizer extends BaseNormalizer<ActiveRuleDto, ActiveRuleKey> {
 
@@ -51,6 +56,9 @@ public class ActiveRuleNormalizer extends BaseNormalizer<ActiveRuleDto, ActiveRu
     public static final IndexField RULE_KEY = add(IndexField.Type.STRING, "ruleKey");
     public static final IndexField PARAMS = addEmbedded("params", ActiveRuleParamField.ALL_FIELDS);
 
+    public static final IndexField CREATED_AT = addSortable(IndexField.Type.DATE, "createdAt");
+    public static final IndexField UPDATED_AT = addSortable(IndexField.Type.DATE, UPDATED_AT_FIELD);
+
     public static Set<IndexField> ALL_FIELDS = getAllFields();
 
     private static Set<IndexField> getAllFields() {
@@ -123,6 +131,10 @@ public class ActiveRuleNormalizer extends BaseNormalizer<ActiveRuleDto, ActiveRu
         activeRuleDto.getInheritance() :
         ActiveRule.Inheritance.NONE.name());
     newRule.put(ActiveRuleField.SEVERITY.field(), activeRuleDto.getSeverityString());
+    newRule.put(ActiveRuleField.KEY.field(), key.toString());
+
+    newRule.put(ActiveRuleField.CREATED_AT.field(), activeRuleDto.getCreatedAt());
+    newRule.put(ActiveRuleField.UPDATED_AT.field(), activeRuleDto.getUpdatedAt());
 
     DbSession session = db.openSession(false);
     try {
diff --git a/sonar-server/src/test/java/org/sonar/server/qualityprofile/RuleActivatorMediumTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/RuleActivatorMediumTest.java
index 83d1ff1775e..c26899f1576 100644
--- a/sonar-server/src/test/java/org/sonar/server/qualityprofile/RuleActivatorMediumTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/qualityprofile/RuleActivatorMediumTest.java
@@ -20,7 +20,10 @@
 package org.sonar.server.qualityprofile;
 
 import com.google.common.collect.ImmutableMap;
-import org.junit.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Test;
 import org.sonar.api.rule.RuleKey;
 import org.sonar.api.rule.RuleStatus;
 import org.sonar.api.rule.Severity;
@@ -42,7 +45,6 @@ import org.sonar.server.search.QueryOptions;
 import org.sonar.server.tester.ServerTester;
 
 import javax.annotation.Nullable;
-
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -52,7 +54,6 @@ import static org.fest.assertions.Assertions.assertThat;
 import static org.fest.assertions.Fail.fail;
 import static org.sonar.server.qualityprofile.QProfileTesting.*;
 
-@Ignore
 public class RuleActivatorMediumTest {
 
   static final RuleKey MANUAL_RULE_KEY = RuleKey.of(RuleKey.MANUAL_REPOSITORY_KEY, "m1");
@@ -988,6 +989,10 @@ public class RuleActivatorMediumTest {
         assertThat(activeRule.severity()).isEqualTo(expectedSeverity);
         assertThat(activeRule.inheritance()).isEqualTo(expectedInheritance == null ? ActiveRule.Inheritance.NONE : ActiveRule.Inheritance.valueOf(expectedInheritance));
 
+        // Dates should be set
+        assertThat(activeRule.createdAt()).isNotNull();
+        assertThat(activeRule.updatedAt()).isNotNull();
+
         // verify parameters in es
         assertThat(activeRule.params()).hasSize(expectedParams.size());
         for (Map.Entry<String, String> entry : expectedParams.entrySet()) {
-- 
cgit v1.2.3


From bdc44605d38868e7d797c4e0218deef12fc1a949 Mon Sep 17 00:00:00 2001
From: Stephane Gamard <stephane.gamard@searchbox.com>
Date: Thu, 3 Jul 2014 15:14:54 +0200
Subject: SONAR-5007 - Reverted final modifier for base method because of
 legacy @Mock

---
 .../src/main/java/org/sonar/server/db/BaseDao.java         | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'sonar-server/src/main')

diff --git a/sonar-server/src/main/java/org/sonar/server/db/BaseDao.java b/sonar-server/src/main/java/org/sonar/server/db/BaseDao.java
index f14365889f8..10cedfdfcc3 100644
--- a/sonar-server/src/main/java/org/sonar/server/db/BaseDao.java
+++ b/sonar-server/src/main/java/org/sonar/server/db/BaseDao.java
@@ -146,7 +146,7 @@ public abstract class BaseDao<M, E extends Dto<K>, K extends Serializable> imple
     return doGetNullableByKey(session, key);
   }
 
-  public final E getByKey(DbSession session, K key) {
+  public E getByKey(DbSession session, K key) {
     E value = doGetNullableByKey(session, key);
     if (value == null) {
       throw new NotFoundException(String.format("Key '%s' not found", key));
@@ -155,14 +155,14 @@ public abstract class BaseDao<M, E extends Dto<K>, K extends Serializable> imple
   }
 
   @Override
-  public final E update(DbSession session, E item) {
+  public E update(DbSession session, E item) {
     Date now = new Date(system2.now());
     update(session, item, now);
     return item;
   }
 
   @Override
-  public final E update(DbSession session, E item, E... others) {
+  public E update(DbSession session, E item, E... others) {
     Date now = new Date(system2.now());
     update(session, item, now);
     for (E other : others) {
@@ -172,7 +172,7 @@ public abstract class BaseDao<M, E extends Dto<K>, K extends Serializable> imple
   }
 
   @Override
-  public final Collection<E> update(DbSession session, Collection<E> items) {
+  public Collection<E> update(DbSession session, Collection<E> items) {
     Date now = new Date(system2.now());
     for (E item : items) {
       update(session, item, now);
@@ -189,13 +189,13 @@ public abstract class BaseDao<M, E extends Dto<K>, K extends Serializable> imple
   }
 
   @Override
-  public final E insert(DbSession session, E item) {
+  public E insert(DbSession session, E item) {
     insert(session, item, new Date(system2.now()));
     return item;
   }
 
   @Override
-  public final Collection<E> insert(DbSession session, Collection<E> items) {
+  public Collection<E> insert(DbSession session, Collection<E> items) {
     Date now = new Date(system2.now());
     for (E item : items) {
       insert(session, item, now);
@@ -204,7 +204,7 @@ public abstract class BaseDao<M, E extends Dto<K>, K extends Serializable> imple
   }
 
   @Override
-  public final E insert(DbSession session, E item, E... others) {
+  public E insert(DbSession session, E item, E... others) {
     Date now = new Date(system2.now());
     insert(session, item, now);
     for (E other : others) {
-- 
cgit v1.2.3


From 2f6dea76d6b86441612b036361a4ae354843805d Mon Sep 17 00:00:00 2001
From: Stephane Gamard <stephane.gamard@searchbox.com>
Date: Thu, 3 Jul 2014 15:24:25 +0200
Subject: SONAR-5007 - Ignore test for SONAR-5183

---
 .../sonar/server/rule/index/RuleNormalizer.java    | 41 +++++++++++++---------
 .../ActiveRuleBackendMediumTest.java               |  2 ++
 2 files changed, 27 insertions(+), 16 deletions(-)

(limited to 'sonar-server/src/main')

diff --git a/sonar-server/src/main/java/org/sonar/server/rule/index/RuleNormalizer.java b/sonar-server/src/main/java/org/sonar/server/rule/index/RuleNormalizer.java
index 8fff85e9166..1c2c91db539 100644
--- a/sonar-server/src/main/java/org/sonar/server/rule/index/RuleNormalizer.java
+++ b/sonar-server/src/main/java/org/sonar/server/rule/index/RuleNormalizer.java
@@ -26,6 +26,7 @@ import org.elasticsearch.action.WriteConsistencyLevel;
 import org.elasticsearch.action.support.replication.ReplicationType;
 import org.elasticsearch.action.update.UpdateRequest;
 import org.sonar.api.rule.RuleKey;
+import org.sonar.api.rule.RuleStatus;
 import org.sonar.api.server.debt.DebtCharacteristic;
 import org.sonar.core.persistence.DbSession;
 import org.sonar.core.rule.RuleDto;
@@ -39,7 +40,12 @@ import org.sonar.server.search.Indexable;
 import org.sonar.server.search.es.ListUpdate;
 
 import java.lang.reflect.Field;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 public class RuleNormalizer extends BaseNormalizer<RuleDto, RuleKey> {
 
@@ -179,7 +185,10 @@ public class RuleNormalizer extends BaseNormalizer<RuleDto, RuleKey> {
       update.put(RuleField.HTML_DESCRIPTION.field(), rule.getDescription());
       update.put(RuleField.FIX_DESCRIPTION.field(), rule.getEffortToFixDescription());
       update.put(RuleField.SEVERITY.field(), rule.getSeverityString());
-      update.put(RuleField.STATUS.field(), rule.getStatus().name());
+
+      RuleStatus status = rule.getStatus();
+      update.put(RuleField.STATUS.field(), status != null ? rule.getStatus().name() : null);
+
       update.put(RuleField.LANGUAGE.field(), rule.getLanguage());
       update.put(RuleField.INTERNAL_KEY.field(), rule.getConfigKey());
       update.put(RuleField.IS_TEMPLATE.field(), rule.isTemplate());
@@ -316,24 +325,24 @@ public class RuleNormalizer extends BaseNormalizer<RuleDto, RuleKey> {
     newParam.put(RuleParamField.DEFAULT_VALUE.field(), param.getDefaultValue());
 
     return ImmutableList.of(new UpdateRequest()
-      .id(key.toString())
-      .script(ListUpdate.NAME)
-      .addScriptParam(ListUpdate.FIELD, RuleField.PARAMS.field())
-      .addScriptParam(ListUpdate.VALUE, newParam)
-      .addScriptParam(ListUpdate.ID_FIELD, RuleParamField.NAME.field())
-      .addScriptParam(ListUpdate.ID_VALUE, param.getName())
-      );
+        .id(key.toString())
+        .script(ListUpdate.NAME)
+        .addScriptParam(ListUpdate.FIELD, RuleField.PARAMS.field())
+        .addScriptParam(ListUpdate.VALUE, newParam)
+        .addScriptParam(ListUpdate.ID_FIELD, RuleParamField.NAME.field())
+        .addScriptParam(ListUpdate.ID_VALUE, param.getName())
+    );
   }
 
   private List<UpdateRequest> nestedDelete(RuleParamDto param, RuleKey key) {
     return ImmutableList.of(new UpdateRequest()
-      .id(key.toString())
-      .script(ListUpdate.NAME)
-      .addScriptParam(ListUpdate.FIELD, RuleField.PARAMS.field())
-      .addScriptParam(ListUpdate.VALUE, null)
-      .addScriptParam(ListUpdate.ID_FIELD, RuleParamField.NAME.field())
-      .addScriptParam(ListUpdate.ID_VALUE, param.getName())
-      );
+        .id(key.toString())
+        .script(ListUpdate.NAME)
+        .addScriptParam(ListUpdate.FIELD, RuleField.PARAMS.field())
+        .addScriptParam(ListUpdate.VALUE, null)
+        .addScriptParam(ListUpdate.ID_FIELD, RuleParamField.NAME.field())
+        .addScriptParam(ListUpdate.ID_VALUE, param.getName())
+    );
   }
 
 }
diff --git a/sonar-server/src/test/java/org/sonar/server/qualityprofile/ActiveRuleBackendMediumTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ActiveRuleBackendMediumTest.java
index 1882cf33f33..2c5ff0f035f 100644
--- a/sonar-server/src/test/java/org/sonar/server/qualityprofile/ActiveRuleBackendMediumTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ActiveRuleBackendMediumTest.java
@@ -23,6 +23,7 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Multimap;
 import org.junit.Before;
 import org.junit.ClassRule;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.sonar.api.rule.RuleKey;
 import org.sonar.api.rule.RuleStatus;
@@ -66,6 +67,7 @@ public class ActiveRuleBackendMediumTest {
   }
 
   @Test
+  @Ignore("To be fixed with DB Time zone sprint -- SONAR-5183")
   public void synchronize_index() throws Exception {
     QualityProfileDto profile1 = QProfileTesting.newXooP1();
     db.qualityProfileDao().insert(dbSession, profile1);
-- 
cgit v1.2.3


From 6086a6ea7b314b50dfdf617f9f2de3e1a8129601 Mon Sep 17 00:00:00 2001
From: Stephane Gamard <stephane.gamard@searchbox.com>
Date: Thu, 3 Jul 2014 16:05:30 +0200
Subject: fix quality flaw (possible NPE)

---
 .../java/org/sonar/server/search/IndexQueue.java    | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'sonar-server/src/main')

diff --git a/sonar-server/src/main/java/org/sonar/server/search/IndexQueue.java b/sonar-server/src/main/java/org/sonar/server/search/IndexQueue.java
index 8a1d4c01689..70ad14f7af2 100644
--- a/sonar-server/src/main/java/org/sonar/server/search/IndexQueue.java
+++ b/sonar-server/src/main/java/org/sonar/server/search/IndexQueue.java
@@ -74,13 +74,16 @@ public class IndexQueue extends LinkedBlockingQueue<Runnable>
         indexTime = System.currentTimeMillis();
         this.offer(action, 1000, TimeUnit.SECONDS);
         latch.await(1000, TimeUnit.MILLISECONDS);
-        bcount ++;
+        bcount++;
         indexTime = System.currentTimeMillis() - indexTime;
         // refresh the index.
-        refreshTime = System.currentTimeMillis();
-        action.getIndex().refresh();
-        refreshTime = System.currentTimeMillis() - refreshTime;
-        refreshes.add(action.getIndex().getIndexName());
+        Index<?, ?, ?> index = action.getIndex();
+        if (index != null) {
+          refreshTime = System.currentTimeMillis();
+          index.refresh();
+          refreshTime = System.currentTimeMillis() - refreshTime;
+          refreshes.add(action.getIndex().getIndexName());
+        }
         types.add(action.getPayloadClass().getSimpleName());
       } catch (InterruptedException e) {
         throw new IllegalStateException("ES update has been interrupted", e);
@@ -93,7 +96,7 @@ public class IndexQueue extends LinkedBlockingQueue<Runnable>
       List<IndexAction> embeddedActions = Lists.newArrayList();
 
       for (IndexAction action : actions) {
-        if(action.getClass().isAssignableFrom(EmbeddedIndexAction.class)){
+        if (action.getClass().isAssignableFrom(EmbeddedIndexAction.class)) {
           embeddedActions.add(action);
         } else {
           itemActions.add(action);
@@ -124,7 +127,7 @@ public class IndexQueue extends LinkedBlockingQueue<Runnable>
           action.setLatch(embeddedLatch);
           this.offer(action, 1000, TimeUnit.SECONDS);
           types.add(action.getPayloadClass().getSimpleName());
-          ecount ++;
+          ecount++;
         }
         embeddedLatch.await(1500, TimeUnit.MILLISECONDS);
         embeddedTime = System.currentTimeMillis() - embeddedTime;
@@ -134,7 +137,7 @@ public class IndexQueue extends LinkedBlockingQueue<Runnable>
         refreshTime = System.currentTimeMillis();
         for (IndexAction action : actions) {
           if (action.getIndex() != null &&
-            !refreshedIndexes.contains(action.getIndex().getIndexName())){
+            !refreshedIndexes.contains(action.getIndex().getIndexName())) {
             refreshedIndexes.add(action.getIndex().getIndexName());
             action.getIndex().refresh();
             refreshes.add(action.getIndex().getIndexName());
@@ -146,7 +149,7 @@ public class IndexQueue extends LinkedBlockingQueue<Runnable>
       }
       LOGGER.debug("INDEX - time:{}ms ({}ms index, {}ms embedded, {}ms refresh)\ttypes:[{}],\tbulk:{}\tembedded:{}\trefresh:[{}]",
         (System.currentTimeMillis() - all_start), indexTime, embeddedTime, refreshTime,
-        StringUtils.join(types,","),
+        StringUtils.join(types, ","),
         bcount, ecount, StringUtils.join(refreshes, ","));
     }
   }
-- 
cgit v1.2.3


From 266d901ba901b8cfd33727610efeb6a0fcfa0e2a Mon Sep 17 00:00:00 2001
From: Stephane Gamard <stephane.gamard@searchbox.com>
Date: Thu, 3 Jul 2014 16:08:33 +0200
Subject: fix quality flaw (possible NPE)

---
 sonar-server/src/main/java/org/sonar/server/search/IndexQueue.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sonar-server/src/main')

diff --git a/sonar-server/src/main/java/org/sonar/server/search/IndexQueue.java b/sonar-server/src/main/java/org/sonar/server/search/IndexQueue.java
index 70ad14f7af2..e556a6635c6 100644
--- a/sonar-server/src/main/java/org/sonar/server/search/IndexQueue.java
+++ b/sonar-server/src/main/java/org/sonar/server/search/IndexQueue.java
@@ -82,7 +82,7 @@ public class IndexQueue extends LinkedBlockingQueue<Runnable>
           refreshTime = System.currentTimeMillis();
           index.refresh();
           refreshTime = System.currentTimeMillis() - refreshTime;
-          refreshes.add(action.getIndex().getIndexName());
+          refreshes.add(index.getIndexName());
         }
         types.add(action.getPayloadClass().getSimpleName());
       } catch (InterruptedException e) {
-- 
cgit v1.2.3


From 1ad2570e7a3712f002f445822967e8cc58812301 Mon Sep 17 00:00:00 2001
From: Julien Lancelot <julien.lancelot@sonarsource.com>
Date: Thu, 3 Jul 2014 17:50:55 +0200
Subject: SONAR-5007 Fix profile links on profiles compare page

---
 .../src/main/webapp/WEB-INF/app/views/profiles/compare.html.erb   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'sonar-server/src/main')

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/compare.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/compare.html.erb
index a70b6c3939d..2568aff56e8 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/compare.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/compare.html.erb
@@ -45,7 +45,7 @@
             <thead>
             <tr>
               <th><a name="in1"/><%= message('quality_profiles.x_rules_only_in', :params => @in1.size) %>
-                <a href="<%= url_for :controller => 'profiles', :action => 'show', :id => @profile1.id -%>"><%= h @profile1.name %></a>
+                <a href="<%= url_for :controller => 'profiles', :action => 'show', :key => @profile1.kee -%>"><%= h @profile1.name %></a>
               </th>
             </tr>
             </thead>
@@ -72,7 +72,7 @@
             <thead>
             <tr>
               <th><a name="in2"/><%= message('quality_profiles.x_rules_only_in', :params => @in2.size) %>
-                <a href="<%= url_for :controller => 'profiles', :action => 'show', :id => @profile2.id -%>"><%= h @profile2.name %></a>
+                <a href="<%= url_for :controller => 'profiles', :action => 'show', :key => @profile2.kee -%>"><%= h @profile2.name %></a>
               </th>
             </tr>
             </thead>
@@ -96,11 +96,11 @@
             <thead>
             <tr>
               <th width="49%"><a name="modified"/><%= message('quality_profiles.x_rules_have_different_configuration', :params =>@modified.size) -%><br/>
-                <a href="<%= url_for :controller => 'profiles', :action => 'show', :id => @profile1.id -%>"><%= h @profile1.name %></a>
+                <a href="<%= url_for :controller => 'profiles', :action => 'show', :key => @profile1.kee -%>"><%= h @profile1.name %></a>
               </th>
               <th width="2%"></th>
               <th width="49%">
-                <br/><a href="<%= url_for :controller => 'profiles', :action => 'show', :id => @profile2.id -%>"><%= h @profile2.name %></a>
+                <br/><a href="<%= url_for :controller => 'profiles', :action => 'show', :key => @profile2.kee -%>"><%= h @profile2.name %></a>
               </th>
             </tr>
             </thead>
-- 
cgit v1.2.3


From 5c5f3c6ead9a6ed2c1d51df31f653674196f1ffe Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Thu, 3 Jul 2014 18:13:01 +0200
Subject: Fix loading of project DSM in drilldown page

---
 .../org/sonar/plugins/design/DesignPlugin.java     | 10 +--
 .../main/java/org/sonar/server/ui/JRubyFacade.java |  4 +
 sonar-server/src/main/js/application.js            | 89 +---------------------
 .../WEB-INF/app/controllers/resource_controller.rb | 14 ++++
 .../WEB-INF/app/views/drilldown/_footer.html.erb   | 17 +++--
 .../WEB-INF/app/views/drilldown/_header.html.erb   | 24 ++++--
 .../WEB-INF/app/views/drilldown/issues.html.erb    |  2 +-
 .../WEB-INF/app/views/drilldown/measures.html.erb  |  2 +-
 .../app/views/gwt/_resource_viewers.html.erb       |  9 +++
 .../WEB-INF/app/views/layouts/_breadcrumb.html.erb |  4 +-
 .../WEB-INF/app/views/resource/_tabs.html.erb      | 54 +++++++++++++
 .../WEB-INF/app/views/resource/_view.html.erb      | 16 ++++
 .../app/views/shared/_source_coverage.html.erb     |  2 +-
 13 files changed, 139 insertions(+), 108 deletions(-)
 create mode 100644 sonar-server/src/main/webapp/WEB-INF/app/views/gwt/_resource_viewers.html.erb
 create mode 100644 sonar-server/src/main/webapp/WEB-INF/app/views/resource/_tabs.html.erb
 create mode 100644 sonar-server/src/main/webapp/WEB-INF/app/views/resource/_view.html.erb

(limited to 'sonar-server/src/main')

diff --git a/plugins/sonar-design-plugin/src/main/java/org/sonar/plugins/design/DesignPlugin.java b/plugins/sonar-design-plugin/src/main/java/org/sonar/plugins/design/DesignPlugin.java
index 4929ad0e5c3..a2879d5cf8c 100644
--- a/plugins/sonar-design-plugin/src/main/java/org/sonar/plugins/design/DesignPlugin.java
+++ b/plugins/sonar-design-plugin/src/main/java/org/sonar/plugins/design/DesignPlugin.java
@@ -37,11 +37,11 @@ public class DesignPlugin extends SonarPlugin {
 
   public List<Class<? extends Extension>> getExtensions() {
     return ImmutableList.of(
-        // Batch
-        MavenDependenciesSensor.class,
-        ProjectDsmDecorator.class,
-        PackageTangleIndexDecorator.class,
-        FileTangleIndexDecorator.class,
+      // Batch
+      MavenDependenciesSensor.class,
+      ProjectDsmDecorator.class,
+      PackageTangleIndexDecorator.class,
+      FileTangleIndexDecorator.class,
 
       // UI
       GwtLibrariesPage.class,
diff --git a/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java b/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java
index 47ede48b641..4c93d8a66cb 100644
--- a/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java
+++ b/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java
@@ -211,6 +211,10 @@ public final class JRubyFacade {
     return get(Views.class).getPages(section, resourceScope, resourceQualifier, resourceLanguage, (String[]) availableMeasures);
   }
 
+  public List<ViewProxy<Page>> getResourceTabs() {
+    return get(Views.class).getPages(NavigationSection.RESOURCE_TAB, null, null, null, null);
+  }
+
   public List<ViewProxy<Page>> getResourceTabs(String scope, String qualifier, String language, Object[] availableMeasures) {
     return get(Views.class).getPages(NavigationSection.RESOURCE_TAB, scope, qualifier, language, (String[]) availableMeasures);
   }
diff --git a/sonar-server/src/main/js/application.js b/sonar-server/src/main/js/application.js
index 00723b0fe60..e84f1158318 100644
--- a/sonar-server/src/main/js/application.js
+++ b/sonar-server/src/main/js/application.js
@@ -381,44 +381,7 @@ function supportsHTML5Storage() {
 
 //******************* HANDLING OF ACCORDION NAVIGATION [BEGIN] ******************* //
 
-function openAccordionItem(url, elt, updateCurrentElement) {
-  var htmlClass = 'accordion-item';
-  var currentElement = $j(elt).closest('.'+ htmlClass);
-
-  // Create loading image
-  var loadingImg = new Image();
-  loadingImg.src = baseUrl + "/images/loading.gif";
-  loadingImg.className = 'accordion-loading';
-  var loading = $j(loadingImg);
-  var existingLoading = currentElement.find('.accordion-loading');
-  if (updateCurrentElement && existingLoading.length) {
-    existingLoading.show();
-    loading.hide();
-  }
-
-  // Remove elements under current element
-  if (currentElement.length) {
-    // Fix the height in order to not change the position on the screen when removing elements under current element
-    var elementToRemove = currentElement.nextAll('.'+ htmlClass);
-    if (elementToRemove.height()) {
-      $j("#accordion-panel").height($j("#accordion-panel").height() + elementToRemove.height());
-    }
-    // Remove all accordion items after current element
-    elementToRemove.remove();
-    // Display loading image only if not already displayed (if previous call was not finished)
-    if (currentElement.next('.accordion-loading').length === 0) {
-      loading.insertAfter(currentElement);
-    }
-  } else {
-    // Current element is not in a working view, remove all working views
-    $j('.'+ htmlClass).remove();
-    // Display loading image only if not already displayed (if previous call was not finished)
-    if ($j("#accordion-panel").next('.accordion-loading').length === 0) {
-      loading.insertAfter($j("#accordion-panel"));
-    }
-  }
-
-  // Get content from url
+function openAccordionItem(url) {
   var ajaxRequest = $j.ajax({
       url: url
       }).fail(function (jqXHR, textStatus) {
@@ -426,58 +389,14 @@ function openAccordionItem(url, elt, updateCurrentElement) {
         console.log(error);
         $j("#accordion-panel").append($j('<div class="error">').append(error));
       }).done(function (html) {
-        if (currentElement.length) {
-          var body = currentElement.find('.accordion-item-body');
-          if (!updateCurrentElement && !body.hasClass('accordion-item-body-medium')) {
-            body.addClass("accordion-item-body-medium");
-            elt.scrollIntoView(false);
-          }
-        } else {
-          $j("#accordion-panel").height('auto');
-
-          // Current element is not in a working view, remove again all working views to purge elements that could be added just before this one
-          $j('.'+ htmlClass).remove();
-        }
-
-        if (updateCurrentElement) {
-          // Fix the height in order to not change the position on the screen
-          var prevHeight = $j("#accordion-panel").height();
-          currentElement.html(html);
-          $j("#accordion-panel").height('auto');
-          var newHeight = $j("#accordion-panel").height();
-          if (prevHeight > newHeight) {
-            $j("#accordion-panel").height(prevHeight);
-          } else {
-            $j("#accordion-panel").height(newHeight);
-          }
-        } else {
-          // Add new item add the end of the panel and restore the height param
-          var nbElement = $j("."+htmlClass).size();
-          var newElement = $j('<div id="'+ htmlClass + nbElement +'" class="'+ htmlClass +'">');
-          $j("#accordion-panel").append(newElement);
-
-          // Add html after having adding the new element in the page in order to scripts (for instance for GWT) to be well executed
-          newElement.append(html);
-          $j("#accordion-panel").height('auto');
-
-          // Set the focus on the top of the current item with animation
-          if (currentElement.length) {
-            $j('html, body').animate({
-              scrollTop: currentElement.offset().top}, 500
-            );
-          }
-        }
-        loading.remove();
+          var panel = $j("#accordion-panel");
+          panel.html(html);
+            panel.scrollIntoView(false);
       });
   return ajaxRequest;
 }
 
 
-function expandAccordionItem(elt) {
-  var currentElement = $j(elt).closest('.accordion-item');
-  currentElement.find('.accordion-item-body').removeClass("accordion-item-body-medium");
-}
-
 //******************* HANDLING OF ACCORDION NAVIGATION [END] ******************* //
 
 
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/resource_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/resource_controller.rb
index c67ee3048ad..5f595b8daac 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/resource_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/resource_controller.rb
@@ -41,6 +41,20 @@ class ResourceController < ApplicationController
     redirect_to :controller => 'component', :action => 'index', :anchor => anchor
   end
 
+  # deprecated stuff for drilldown
+  def view
+    require_parameters 'id'
+    @resource = Project.by_key(params[:id])
+    access_denied unless has_role?(:user, @resource)
+    @snapshot = @resource.last_snapshot
+    load_extensions() if @snapshot
+    if @extension
+      render :partial => 'view'
+    else
+      not_found('Extension not found')
+    end
+  end
+
   #
   # Call by new component viewer to display plugin extension
   #
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/_footer.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/_footer.html.erb
index 1f871e66399..17986d4857f 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/_footer.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/_footer.html.erb
@@ -1,7 +1,14 @@
 <div id="resource_container"> </div>
 
-<% if @display_viewers && @drilldown.highlighted_resource %>
-<script>
-  d(<%= @drilldown.highlighted_resource.id -%>, true);
-</script>
-<% end %>
+<%
+   if @display_viewers
+     resource = @drilldown.highlighted_resource || @drilldown.resource
+     if resource
+%>
+  <script>
+    d(<%= resource.id -%>, <%= resource.source_code? -%>);
+  </script>
+<%
+     end
+   end
+%>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/_header.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/_header.html.erb
index 0b3a70e75bf..7049f5f5469 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/_header.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/_header.html.erb
@@ -1,12 +1,13 @@
+<%= render :partial => 'gwt/base', :locals => {:resource => nil, :popup => false, :metric => (@metric ? @metric.key : nil)} -%>
+<%= render :partial => 'gwt/resource_viewers' -%>
+
 <script type="text/javascript">
   /* display resource */
-  function d(resourceId, display_title) {
-    if (display_title == undefined) {
-      display_title = true;
-    }
-    var url = '<%= ApplicationController.root_context -%>/resource/index/' + resourceId + '?metric=<%= @metric.id if @metric -%>' +
-        '&rule=<%= @rule ? @rule.id : @severity -%>&period=<%= @period -%>&project=<%= @resource.id -%>&display_title=' + display_title;
-    openAccordionItem(url, this);
+  function d(resourceId, is_file) {
+    var action = is_file ? 'index' : 'view';
+    var url = '<%= ApplicationController.root_context -%>/resource/' + action + '/' + resourceId + '?metric=<%= @metric.id if @metric -%>' +
+        '&rule=<%= @rule ? @rule.id : @severity -%>&period=<%= @period -%>&project=<%= @resource.id -%>';
+    openAccordionItem(url);
     return false;
   }
 
@@ -19,4 +20,13 @@
       window.location.reload();
     }
   }
+
+  function loadGWT(gwtId, resourceId, resourceKey, resourceName, resourceScope, resourceQualifier, resourceLanguage) {
+    config["resource"] = [
+      {"id":resourceId, "key":resourceKey, "name":resourceName, "scope":resourceScope, "qualifier":resourceQualifier,
+        "lang":resourceLanguage}
+    ];
+    config["resource_key"] = resourceId;
+    modules[gwtId]();
+  }
 </script>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/issues.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/issues.html.erb
index 206cc9ee36e..8aef0011a5e 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/issues.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/issues.html.erb
@@ -213,7 +213,7 @@
     };
 
     var url = '<%= ApplicationController.root_context -%>/issues/search?' + jQuery.param(params);
-    openAccordionItem(url, this, false);
+    openAccordionItem(url);
     return false;
   }
 
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/measures.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/measures.html.erb
index 8d42abe34ab..0bea2a00709 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/measures.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/measures.html.erb
@@ -87,7 +87,7 @@
                   <a href="#" title="<%= h resource.name(true) -%>" data-key="<%= resource.key -%>"
                      class="js-drilldown-link underlined-link"><%= h resource.name(false) %></a>
                 <% else %>
-                  <%= link_to(h(resource.name), {:only_path => true, :overwrite_params => {:rids => (selected ? rids-[resource.id] : rids+[resource.id])}}, :class => 'underlined-link') -%>
+                  <%= link_to(h(resource.name), params.merge({:only_path => true, :rids => (selected ? rids-[resource.id] : rids+[resource.id])}), :class => 'underlined-link') -%>
                 <% end %>
               </td>
               <td class="right">
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/gwt/_resource_viewers.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/gwt/_resource_viewers.html.erb
new file mode 100644
index 00000000000..f382653f6b3
--- /dev/null
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/gwt/_resource_viewers.html.erb
@@ -0,0 +1,9 @@
+<%
+   controller.java_facade.getResourceTabs().each do |tab|
+     if tab.isGwt()
+%>
+    <script src="<%= ApplicationController.root_context -%>/deploy/gwt/<%= tab.getId() -%>/<%= tab.getId() -%>.nocache.js"></script>
+  <%
+     end
+     end
+  %>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_breadcrumb.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_breadcrumb.html.erb
index 817ee0c470e..e3dcb357702 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_breadcrumb.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_breadcrumb.html.erb
@@ -79,9 +79,7 @@
           <li>
             <%= qualifier_icon(resource) -%>
             &nbsp;
-            <%= link_to(h(resource.name),
-                        {:overwrite_params => {:id => resource.key}.merge(resource_link)}
-                ) -%>
+            <%= link_to(h(resource.name), params.merge({:id => resource.key}.merge(resource_link))) -%>
           </li>
         <%
            end
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_tabs.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_tabs.html.erb
new file mode 100644
index 00000000000..6d896b6dfbb
--- /dev/null
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_tabs.html.erb
@@ -0,0 +1,54 @@
+<%
+   if @extensions.empty?
+%>
+  <span class="note"><%= message('code_viewer.no_info_displayed_due_to_security') -%></span>
+<%
+   else
+     display_title=(params[:display_title]=='true')
+%>
+
+  <% if display_title %>
+    <div class="source_title">
+      <% if @resource.project %>
+        <div class="subtitle">
+          <%= h @resource.ancestor_projects.reverse.map{|p| p.name(true)}.join(' / ') -%>
+        </div>
+      <% end %>
+      <% if logged_in? %><%= link_to_favourite(@resource) -%><% end %>
+      <span class="h1"><%= qualifier_icon(@resource) -%> <%= h @resource.name(true) -%></span>
+    </div>
+  <% end %>
+
+  <div class="source_tabs">
+    <ul class="tablinks">
+      <% first=true %>
+      <% if @snapshot.has_source && has_role?(:codeviewer, @snapshot) %>
+        <li class="<%= 'first' if first -%>">
+          <a href="<%= ApplicationController.root_context -%>/api/sources?resource=<%= @resource.key -%>&amp;format=txt"><%= message('raw') -%></a>
+        </li>
+      <% first=false
+         end %>
+      <% unless @popup_mode %>
+        <li class="<%= 'first' if first -%>">
+          <a href="<%= url_for :controller => 'resource', :action => 'index', :id => @resource.key, :period => params[:period], :metric => params[:metric],
+                               :rule => params[:rule] ? params[:rule] : params[:rule_sev], :display_title => 'true' -%>"
+             onclick="window.open(this.href,'resource','height=800,width=900,scrollbars=1,resizable=1');return false;"
+             id="new-window-<%= @resource.key.parameterize -%>"><%= image_tag 'new-window-16.gif', :alt => message('new_window') -%></a>
+        </li>
+      <% end %>
+    </ul>
+    <ul class="tabs">
+      <% @extensions.each do |extension| %>
+        <li>
+          <a href="#" onclick="return loadResourceViewer('<%= @resource.id -%>','<%= extension.getId() -%>',<%= display_title -%>,'<%= params[:period] -%>', this)"
+             class="<%= 'selected' if @extension && @extension.getId()==extension.getId() -%>"><%= message(extension.getId() + '.page', :default => extension.getTitle()) %></a>
+        </li>
+      <% end %>
+      <li>
+        <img src="<%= ApplicationController.root_context -%>/images/loading.gif" id="resource_loading" class="accordion-loading" style="display:none"/>
+      </li>
+    </ul>
+  </div>
+
+
+<%  end %>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_view.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_view.html.erb
new file mode 100644
index 00000000000..1e6e4762245
--- /dev/null
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_view.html.erb
@@ -0,0 +1,16 @@
+<div>
+  <div class="accordion-item-header">
+    <%= render :partial => 'tabs' -%>
+  </div>
+  <div class="accordion-item-body">
+    <% if @extension.isGwt() %>
+      <div id="gwtpage"> </div>
+      <script>
+        loadGWT('<%= @extension.getId() -%>', <%= @resource.id -%>,'<%= escape_javascript(@resource.key) -%>', '<%= escape_javascript(@resource.name) -%>',
+            '<%= @resource.scope -%>', '<%= @resource.qualifier -%>', '<%= escape_javascript(@resource.language) -%>');
+      </script>
+    <% elsif @extension.getTarget() # ruby on rails page %>
+      <%= render :inline => @extension.getTarget().getTemplate() -%>
+    <% end %>
+  </div>
+</div>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/shared/_source_coverage.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/shared/_source_coverage.html.erb
index d0ffca59fb2..8ba427b716e 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/shared/_source_coverage.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/shared/_source_coverage.html.erb
@@ -2,7 +2,7 @@
   <td class="ind <%= statuses[:hits] -%>" title="<%= message('coverage_viewer.line_covered_by_x_tests', {:params => line.covered_lines.to_s}) if line.covered_lines > 0 -%>">
     <% if line.covered_lines > 0 %>
       <a href="<%= ApplicationController.root_context -%>/test/testable/<%= h resource_key -%>?line=<%= index+1 -%>"
-         class="sources-testable-link-<%= index+1 -%>" onclick="openAccordionItem(this.href, this); return false;"><%= line.covered_lines -%></a>
+         class="sources-testable-link-<%= index+1 -%>" onclick="openAccordionItem(this.href); return false;"><%= line.covered_lines -%></a>
     <% end %>
   </td>
   <td class="ind <%= statuses[:conditions] -%>">
-- 
cgit v1.2.3


From 57ee9d671e4be6f940bd7a84a046633449cab1e0 Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Thu, 3 Jul 2014 23:28:17 +0200
Subject: SONAR-5001 SONAR-5405 improve clean-up of duplicated rules and users

---
 .../app/views/measures/_search_header.html.erb     |  2 +-
 .../db/migrate/546_inverse_rule_key_index.rb       | 28 ++++++++++++++++++----
 .../migrate/554_add_missing_user_unique_index.rb   | 27 +++++++++++++++++++--
 3 files changed, 50 insertions(+), 7 deletions(-)

(limited to 'sonar-server/src/main')

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_search_header.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_search_header.html.erb
index 20001f1b102..259f667463b 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_search_header.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_search_header.html.erb
@@ -11,7 +11,7 @@
           [<%= message 'measure_filter.private' -%>]
         <% elsif logged_in? && @filter.user_id==current_user.id %>
           [<%= message 'measure_filter.shared_with_all_users' -%>]
-        <% elsif @filter.user_id %>
+        <% elsif @filter.user_id && @filter.user %>
           [<%= message 'shared_by' -%> <%= @filter.user.name -%>]
         <% else %>
           [<%= message 'shared_by' -%> Sonar]
diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/546_inverse_rule_key_index.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/546_inverse_rule_key_index.rb
index f1e0d98dde7..6cf46b03186 100644
--- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/546_inverse_rule_key_index.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/546_inverse_rule_key_index.rb
@@ -25,16 +25,30 @@
 require 'set'
 class InverseRuleKeyIndex < ActiveRecord::Migration
 
-  class Rule < ActiveRecord::Base
-  end
 
   class ActiveRule < ActiveRecord::Base
+    set_table_name 'active_rules'
+  end
+
+  class Characteristic < ActiveRecord::Base
+    set_table_name 'characteristics'
+  end
+
+  class Issue < ActiveRecord::Base
+    set_table_name 'issues'
+  end
+
+  class ActiveRuleChange < ActiveRecord::Base
+    set_table_name 'active_rule_changes'
   end
 
   class ProjectMeasure < ActiveRecord::Base
     set_table_name 'project_measures'
   end
 
+  class Rule < ActiveRecord::Base
+  end
+
   class RuleParameter < ActiveRecord::Base
     set_table_name 'rules_parameters'
   end
@@ -54,9 +68,12 @@ class InverseRuleKeyIndex < ActiveRecord::Migration
 
   private
   def self.delete_duplicated_rules
-    Rule.reset_column_information
     ActiveRule.reset_column_information
+    ActiveRuleChange.reset_column_information
+    Characteristic.reset_column_information
+    Issue.reset_column_information
     ProjectMeasure.reset_column_information
+    Rule.reset_column_information
     RuleParameter.reset_column_information
 
     say_with_time 'Delete duplicated rules' do
@@ -66,10 +83,13 @@ class InverseRuleKeyIndex < ActiveRecord::Migration
         key = "#{rule.plugin_name}:#{rule.plugin_rule_key}"
         if existing_keys.include?(key)
           say "Delete duplicated rule '#{key}' (id=#{rule.id})"
-          rule.destroy
           ActiveRule.delete_all(['rule_id=?', rule.id])
+          ActiveRuleChange.delete_all(['rule_id=?', rule.id])
+          Characteristic.delete_all(['rule_id=?', rule.id])
+          Issue.delete_all(['rule_id=?', rule.id])
           ProjectMeasure.delete_all(['rule_id=?', rule.id])
           RuleParameter.delete_all(['rule_id=?', rule.id])
+          rule.destroy
         else
           existing_keys.add(key)
         end
diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/554_add_missing_user_unique_index.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/554_add_missing_user_unique_index.rb
index 6aca45f8b82..3101ce1beef 100644
--- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/554_add_missing_user_unique_index.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/554_add_missing_user_unique_index.rb
@@ -40,13 +40,30 @@ class AddMissingUserUniqueIndex < ActiveRecord::Migration
     set_table_name 'groups_users'
   end
 
+  class Dashboard < ActiveRecord::Base
+    set_table_name 'dashboards'
+    has_many :active_dashboards, :dependent => :destroy, :inverse_of => :dashboard
+  end
+
   class ActiveDashboard < ActiveRecord::Base
+    set_table_name 'active_dashboards'
+    belongs_to :dashboard
   end
 
   class PermTemplatesUser < ActiveRecord::Base
     set_table_name 'perm_templates_users'
   end
 
+  class MeasureFilter < ActiveRecord::Base
+    set_table_name 'measure_filters'
+    has_many :measure_filter_favourites, :dependent => :delete_all
+  end
+
+  class MeasureFilterFavourite < ActiveRecord::Base
+    set_table_name 'measure_filter_favourites'
+    belongs_to :measure_filter
+  end
+
   def self.up
     unless index_exists?(:users, :login, nil)
       delete_duplicated_users
@@ -60,8 +77,11 @@ class AddMissingUserUniqueIndex < ActiveRecord::Migration
     UserRole.reset_column_information
     Property.reset_column_information
     GroupsUsers.reset_column_information
+    Dashboard.reset_column_information
     ActiveDashboard.reset_column_information
     PermTemplatesUser.reset_column_information
+    MeasureFilter.reset_column_information
+    MeasureFilterFavourite.reset_column_information
 
     say_with_time 'Delete duplicated users' do
       existing_logins = Set.new
@@ -72,8 +92,11 @@ class AddMissingUserUniqueIndex < ActiveRecord::Migration
           UserRole.delete_all(['user_id=?', user.id])
           Property.delete_all(['user_id=?', user.id])
           GroupsUsers.delete_all(['user_id=?', user.id])
-          ActiveDashboard.delete_all(['user_id=?', user.id])
-          PermTemplatesUser.delete_all(['user_id=?', user.id])
+          Dashboard.destroy_all(['user_id=?', user.id])
+          ActiveDashboard.destroy_all(['user_id=?', user.id])
+          PermTemplatesUser.destroy_all(['user_id=?', user.id])
+          MeasureFilter.destroy_all(['user_id=?', user.id])
+          MeasureFilterFavourite.destroy_all(['user_id=?', user.id])
           user.destroy
         else
           existing_logins.add(user.login)
-- 
cgit v1.2.3


From aa5964b5438693f7768c46fd9c674e6c2e391bd3 Mon Sep 17 00:00:00 2001
From: Stas Vilchik <vilchiks@gmail.com>
Date: Fri, 4 Jul 2014 11:49:33 +0600
Subject: Fix assign_to_me issue action

---
 sonar-server/src/main/coffee/issues/issue-view.coffee        |  2 +-
 .../src/main/coffee/issues/views/assign-form-view.coffee     | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'sonar-server/src/main')

diff --git a/sonar-server/src/main/coffee/issues/issue-view.coffee b/sonar-server/src/main/coffee/issues/issue-view.coffee
index 21039ad32c2..6f9022f6f66 100644
--- a/sonar-server/src/main/coffee/issues/issue-view.coffee
+++ b/sonar-server/src/main/coffee/issues/issue-view.coffee
@@ -230,7 +230,7 @@ define [
         url: baseUrl + '/api/issues/assign'
         data:
           issue: @model.get('key')
-          assignee: window.SS.currentUser
+          me: true
       .done => @resetIssue()
       .fail (r) =>
         alert  _.pluck(r.responseJSON.errors, 'msg').join(' ')
diff --git a/sonar-server/src/main/coffee/issues/views/assign-form-view.coffee b/sonar-server/src/main/coffee/issues/views/assign-form-view.coffee
index 08e8832fe6a..b51435b63af 100644
--- a/sonar-server/src/main/coffee/issues/views/assign-form-view.coffee
+++ b/sonar-server/src/main/coffee/issues/views/assign-form-view.coffee
@@ -7,6 +7,7 @@ define [
 ) ->
 
   $ = jQuery
+  ME = '#me#'
 
 
   class AssignFormView extends Marionette.ItemView
@@ -28,7 +29,7 @@ define [
       additionalChoices = []
 
       if !assignee || currentUser != assignee
-        additionalChoices.push id: currentUser, text: t('assigned_to_me')
+        additionalChoices.push id: ME, text: t('assigned_to_me')
 
       if !!assignee
         additionalChoices.push id: '', text: t('unassigned')
@@ -68,14 +69,13 @@ define [
 
     submit: ->
       @options.detailView.showActionSpinner()
-
+      data = issue: @options.issue.get('key')
+      if @ui.select.val() == ME then data.me = true else data.assignee = @ui.select.val()
       $.ajax
         type: 'POST'
         url: baseUrl + '/api/issues/assign'
-        data:
-          issue: @options.issue.get('key')
-          assignee: @ui.select.val()
+        data: data
       .done => @options.detailView.updateAfterAction true
       .fail (r) =>
         alert _.pluck(r.responseJSON.errors, 'msg').join(' ')
-        @options.detailView.hideActionSpinner()
\ No newline at end of file
+        @options.detailView.hideActionSpinner()
-- 
cgit v1.2.3


From c561396fb47457704a2ebc12f6fd153ab7706ccb Mon Sep 17 00:00:00 2001
From: Stephane Gamard <stephane.gamard@searchbox.com>
Date: Thu, 3 Jul 2014 18:19:28 +0200
Subject: SONAR-5007 - Fix date-synch for ES Synchronizer

---
 .../main/java/org/sonar/server/search/BaseIndex.java  | 19 +++++++++++++------
 .../qualityprofile/ActiveRuleBackendMediumTest.java   |  3 ++-
 2 files changed, 15 insertions(+), 7 deletions(-)

(limited to 'sonar-server/src/main')

diff --git a/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java b/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java
index 83d457c1d59..6dd84f084df 100644
--- a/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java
+++ b/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java
@@ -26,6 +26,8 @@ import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsRespon
 import org.elasticsearch.action.bulk.BulkRequestBuilder;
 import org.elasticsearch.action.get.GetResponse;
 import org.elasticsearch.action.index.IndexRequest;
+import org.elasticsearch.action.search.SearchRequestBuilder;
+import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.action.search.SearchScrollRequestBuilder;
 import org.elasticsearch.action.update.UpdateRequest;
 import org.elasticsearch.client.Client;
@@ -42,8 +44,9 @@ import org.elasticsearch.search.aggregations.AggregationBuilders;
 import org.elasticsearch.search.aggregations.Aggregations;
 import org.elasticsearch.search.aggregations.bucket.terms.StringTerms;
 import org.elasticsearch.search.aggregations.bucket.terms.Terms;
+import org.elasticsearch.search.aggregations.metrics.max.Max;
 import org.elasticsearch.search.aggregations.metrics.valuecount.InternalValueCount;
-import org.elasticsearch.search.sort.SortOrder;
+import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.sonar.core.cluster.WorkQueue;
@@ -199,13 +202,17 @@ public abstract class BaseIndex<DOMAIN, DTO extends Dto<KEY>, KEY extends Serial
   public Date getLastSynchronization() {
     Date date;
     try {
-      date = getClient().prepareSearch(this.getIndexName())
+      SearchRequestBuilder request = getClient().prepareSearch(this.getIndexName())
         .setTypes(this.getIndexType())
         .setQuery(QueryBuilders.matchAllQuery())
-        .setSize(1)
-        .addField(BaseNormalizer.UPDATED_AT_FIELD)
-        .addSort(BaseNormalizer.UPDATED_AT_FIELD, SortOrder.DESC)
-        .get().getHits().getAt(0).field(BaseNormalizer.UPDATED_AT_FIELD).getValue();
+        .setSize(0)
+        .addAggregation(AggregationBuilders.max("latest")
+          .field(BaseNormalizer.UPDATED_AT_FIELD));
+
+      SearchResponse response = request.get();
+
+      Max max = (Max) response.getAggregations().get("latest");
+      return new DateTime(Double.valueOf(max.getValue()).longValue()).toDate();
     } catch (Exception e) {
       date = new Date(0L);
     }
diff --git a/sonar-server/src/test/java/org/sonar/server/qualityprofile/ActiveRuleBackendMediumTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ActiveRuleBackendMediumTest.java
index ce38f3781b4..66662c8203f 100644
--- a/sonar-server/src/test/java/org/sonar/server/qualityprofile/ActiveRuleBackendMediumTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ActiveRuleBackendMediumTest.java
@@ -97,9 +97,10 @@ public class ActiveRuleBackendMediumTest {
 
     // 3. Assert startup picks it up
     tester.clearIndexes();
+    Date before = index.getLastSynchronization();
     tester.get(Platform.class).executeStartupTasks();
     assertThat(index.getByKey(activeRule.getKey())).isNotNull();
-
+    assertThat(before.before(index.getLastSynchronization())).isTrue();
   }
 
   @Test
-- 
cgit v1.2.3


From 3e243829512cf5d818a2dc9d167277026fe4240a Mon Sep 17 00:00:00 2001
From: Stephane Gamard <stephane.gamard@searchbox.com>
Date: Fri, 4 Jul 2014 08:54:15 +0200
Subject: fix quality flaw (removed non necessary try/catch)

---
 .../java/org/sonar/server/search/BaseIndex.java    | 23 +++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'sonar-server/src/main')

diff --git a/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java b/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java
index 6dd84f084df..fda4682574a 100644
--- a/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java
+++ b/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java
@@ -201,21 +201,22 @@ public abstract class BaseIndex<DOMAIN, DTO extends Dto<KEY>, KEY extends Serial
   @Override
   public Date getLastSynchronization() {
     Date date;
-    try {
-      SearchRequestBuilder request = getClient().prepareSearch(this.getIndexName())
-        .setTypes(this.getIndexType())
-        .setQuery(QueryBuilders.matchAllQuery())
-        .setSize(0)
-        .addAggregation(AggregationBuilders.max("latest")
-          .field(BaseNormalizer.UPDATED_AT_FIELD));
+    SearchRequestBuilder request = getClient().prepareSearch(this.getIndexName())
+      .setTypes(this.getIndexType())
+      .setQuery(QueryBuilders.matchAllQuery())
+      .setSize(0)
+      .addAggregation(AggregationBuilders.max("latest")
+        .field(BaseNormalizer.UPDATED_AT_FIELD));
 
-      SearchResponse response = request.get();
+    SearchResponse response = request.get();
 
-      Max max = (Max) response.getAggregations().get("latest");
-      return new DateTime(Double.valueOf(max.getValue()).longValue()).toDate();
-    } catch (Exception e) {
+    Max max = (Max) response.getAggregations().get("latest");
+    if (Double.isNaN(max.getValue())) {
       date = new Date(0L);
+    } else {
+      date = new DateTime(Double.valueOf(max.getValue()).longValue()).toDate();
     }
+
     LOG.info("Index {}:{} has last update of {}", this.getIndexName(), this.getIndexType(), date);
     return date;
   }
-- 
cgit v1.2.3


From 605d2ad539c8962454b3ec35874b3222326eabb0 Mon Sep 17 00:00:00 2001
From: Stephane Gamard <stephane.gamard@searchbox.com>
Date: Fri, 4 Jul 2014 09:28:18 +0200
Subject: SONAR-5007 - Fix date-synch for ES Synchronizer when date == null
 (initial start)

---
 sonar-server/src/main/java/org/sonar/server/rule/db/RuleDao.java   | 2 +-
 sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java  | 7 ++++---
 .../src/main/java/org/sonar/server/search/IndexSynchronizer.java   | 3 +--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'sonar-server/src/main')

diff --git a/sonar-server/src/main/java/org/sonar/server/rule/db/RuleDao.java b/sonar-server/src/main/java/org/sonar/server/rule/db/RuleDao.java
index c7cd45ef14a..f1476dafc5b 100644
--- a/sonar-server/src/main/java/org/sonar/server/rule/db/RuleDao.java
+++ b/sonar-server/src/main/java/org/sonar/server/rule/db/RuleDao.java
@@ -35,7 +35,6 @@ import org.sonar.server.search.action.IndexAction;
 import org.sonar.server.search.action.KeyIndexAction;
 
 import javax.annotation.CheckForNull;
-
 import java.sql.Timestamp;
 import java.util.Date;
 import java.util.List;
@@ -103,6 +102,7 @@ public class RuleDao extends BaseDao<RuleMapper, RuleDto, RuleKey> {
           RuleKey.of(map.get("repoField"), map.get("ruleField"))));
       }
     });
+    session.commit();
   }
 
   /**
diff --git a/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java b/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java
index fda4682574a..abd9c742e70 100644
--- a/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java
+++ b/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java
@@ -211,10 +211,11 @@ public abstract class BaseIndex<DOMAIN, DTO extends Dto<KEY>, KEY extends Serial
     SearchResponse response = request.get();
 
     Max max = (Max) response.getAggregations().get("latest");
-    if (Double.isNaN(max.getValue())) {
-      date = new Date(0L);
-    } else {
+
+    if (max.getValue() > 0) {
       date = new DateTime(Double.valueOf(max.getValue()).longValue()).toDate();
+    } else {
+      date = new Date(0L);
     }
 
     LOG.info("Index {}:{} has last update of {}", this.getIndexName(), this.getIndexType(), date);
diff --git a/sonar-server/src/main/java/org/sonar/server/search/IndexSynchronizer.java b/sonar-server/src/main/java/org/sonar/server/search/IndexSynchronizer.java
index 0bb354aa314..18c0490a438 100644
--- a/sonar-server/src/main/java/org/sonar/server/search/IndexSynchronizer.java
+++ b/sonar-server/src/main/java/org/sonar/server/search/IndexSynchronizer.java
@@ -52,7 +52,7 @@ public class IndexSynchronizer {
     synchronize(session, db.activeRuleDao(), index.get(ActiveRuleIndex.class));
     synchronize(session, db.activityDao(), index.get(ActivityIndex.class));
     session.commit();
-    LOG.info("Synchronization done in {}ms...", System.currentTimeMillis()-start);
+    LOG.info("Synchronization done in {}ms...", System.currentTimeMillis() - start);
     session.close();
   }
 
@@ -60,6 +60,5 @@ public class IndexSynchronizer {
     long start = System.currentTimeMillis();
     dao.synchronizeAfter(session,
       index.getLastSynchronization());
-    LOG.info("-- Synchronized {} in {}ms", index.getIndexType(), System.currentTimeMillis() - start);
   }
 }
-- 
cgit v1.2.3


From 97914a0c51b773c6d519a01aa4ecf097e3268fac Mon Sep 17 00:00:00 2001
From: Stas Vilchik <vilchiks@gmail.com>
Date: Fri, 4 Jul 2014 14:25:38 +0600
Subject: SONAR-5209 Show error message when component api fails

---
 .../src/main/resources/org/sonar/l10n/core.properties      |  1 +
 sonar-server/src/main/coffee/component-viewer/main.coffee  | 14 ++++++++++----
 sonar-server/src/main/less/ui.less                         |  7 +++++++
 3 files changed, 18 insertions(+), 4 deletions(-)

(limited to 'sonar-server/src/main')

diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
index 8c2868f8c2b..c54b49a5d05 100644
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -2672,6 +2672,7 @@ component_viewer.get_permalink=Get Permalink
 component_viewer.covered_lines=Covered Lines
 component_viewer.issues_limit_reached=For usability reasons, only the {0} first issues will be fully displayed. Remaining issues will simply be underlined.
 component_viewer.issues_limit_reached_tooltip={0}\n\nRefine your filter to be able to see the details of this issue.
+component_viewer.cannot_show=We're sorry, but something went wrong. Please try back in a few minutes and contact support if the problem persists.
 
 component_viewer.workspace=Workspace
 component_viewer.workspace.tooltip=Keeps track of history of navigation
diff --git a/sonar-server/src/main/coffee/component-viewer/main.coffee b/sonar-server/src/main/coffee/component-viewer/main.coffee
index 6a7ea195a0c..775aa7b08bb 100644
--- a/sonar-server/src/main/coffee/component-viewer/main.coffee
+++ b/sonar-server/src/main/coffee/component-viewer/main.coffee
@@ -246,10 +246,16 @@ define [
           if @settings.get('scm') then @showSCM() else @hideSCM()
           @trigger 'loaded'
       .fail =>
-        @state.set 'removed', true
-        @state.set 'hasSource', false
-        @render()
-        @trigger 'loaded'
+        if component.status == 404
+          @state.set 'removed', true
+          @state.set 'hasSource', false
+          @render()
+          @trigger 'loaded'
+        else @cannotOpen()
+
+
+    cannotOpen: ->
+      @$el.html "<div class='message-error'>#{t 'component_viewer.cannot_show'}</div>"
 
 
     toggleWorkspace: (store = false) ->
diff --git a/sonar-server/src/main/less/ui.less b/sonar-server/src/main/less/ui.less
index c687af8f6ee..b4e98b5bd54 100644
--- a/sonar-server/src/main/less/ui.less
+++ b/sonar-server/src/main/less/ui.less
@@ -285,3 +285,10 @@ input[type=button] {
   padding: 5px 8px;
   border: 2px solid @orange;
 }
+
+.message-error {
+  display: block;
+  padding: 5px 8px;
+  background-color: @red;
+  color: #fff;
+}
-- 
cgit v1.2.3


From 87a4d8544e68cba6e15ea83ae4140257202d7139 Mon Sep 17 00:00:00 2001
From: Stas Vilchik <vilchiks@gmail.com>
Date: Fri, 4 Jul 2014 14:35:23 +0600
Subject: SONAR-5209 Fix showing several issues on issues page

---
 sonar-server/src/main/js/issues/extra.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'sonar-server/src/main')

diff --git a/sonar-server/src/main/js/issues/extra.js b/sonar-server/src/main/js/issues/extra.js
index 9fb745c0f26..388fdfcb211 100644
--- a/sonar-server/src/main/js/issues/extra.js
+++ b/sonar-server/src/main/js/issues/extra.js
@@ -159,7 +159,8 @@ define(
                 jQuery('.navigator-details').removeClass('navigator-fetching');
                 app.detailsRegion.show(componentViewer);
                 componentViewer.settings.set('issues', false);
-                componentViewer.open(that.model.get('component')).always(function() {
+                componentViewer.open(that.model.get('component'));
+                componentViewer.on('loaded', function() {
                   componentViewer.showIssues(false, that.model.toJSON());
                 });
               };
-- 
cgit v1.2.3


From 564e06f06197cb3faecc4e705bf4bbddd54f29a9 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com>
Date: Fri, 4 Jul 2014 10:33:43 +0200
Subject: SONAR-5334 Fix l10n cache issue (304 passing as done)

---
 sonar-server/src/main/js/translate.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'sonar-server/src/main')

diff --git a/sonar-server/src/main/js/translate.js b/sonar-server/src/main/js/translate.js
index b185c0c447c..207b93363e4 100644
--- a/sonar-server/src/main/js/translate.js
+++ b/sonar-server/src/main/js/translate.js
@@ -81,7 +81,7 @@
           window.messages = JSON.parse(localStorage.getItem('l10n.bundle'));
         }
       }
-    }).done(function(bundle) {
+    }).done(function(bundle, textStatus, jqXHR) {
       if(bundle !== undefined) {
         bundleTimestamp = new Date().toISOString();
         bundleTimestamp = bundleTimestamp.substr(0, bundleTimestamp.indexOf('.')) + '+0000';
@@ -90,6 +90,8 @@
 
         window.messages = bundle;
         localStorage.setItem('l10n.bundle', JSON.stringify(bundle));
+      } else if (jqXHR.status == 304) {
+        window.messages = JSON.parse(localStorage.getItem('l10n.bundle'));
       }
     });
   };
-- 
cgit v1.2.3


From efd87445594729b4ae9658567c7af22caa7387e6 Mon Sep 17 00:00:00 2001
From: Julien Lancelot <julien.lancelot@sonarsource.com>
Date: Fri, 4 Jul 2014 14:50:13 +0200
Subject: Add the possibility to search for all rules (used by SQALE Sunbirst
 widget)

---
 .../org/sonar/server/rule/RubyRuleService.java     | 21 ++++--
 .../org/sonar/server/rule/RubyRuleServiceTest.java | 83 ++++++++++++++++++++++
 2 files changed, 97 insertions(+), 7 deletions(-)

(limited to 'sonar-server/src/main')

diff --git a/sonar-server/src/main/java/org/sonar/server/rule/RubyRuleService.java b/sonar-server/src/main/java/org/sonar/server/rule/RubyRuleService.java
index 5ea09af178c..c276aa55d7b 100644
--- a/sonar-server/src/main/java/org/sonar/server/rule/RubyRuleService.java
+++ b/sonar-server/src/main/java/org/sonar/server/rule/RubyRuleService.java
@@ -69,9 +69,10 @@ public class RubyRuleService implements ServerComponent, Startable {
 
   /**
    * Used in SQALE
+   * If 'pageSize' params is set no -1, all rules are returned (using scrolling)
    */
   public PagedResult<Rule> find(Map<String, Object> params) {
-    RuleQuery query = service.newRuleQuery();
+    RuleQuery query = new RuleQuery();
     query.setQueryText(Strings.emptyToNull((String) params.get("searchQuery")));
     query.setKey(Strings.emptyToNull((String) params.get("key")));
     query.setLanguages(RubyUtils.toStrings(params.get("languages")));
@@ -84,13 +85,19 @@ public class RubyRuleService implements ServerComponent, Startable {
     query.setSortField(RuleNormalizer.RuleField.NAME);
 
     QueryOptions options = new QueryOptions();
-    Integer page = RubyUtils.toInteger(params.get("p"));
-    int pageIndex = page != null ? page : 1;
     Integer pageSize = RubyUtils.toInteger(params.get("pageSize"));
-    options.setPage(pageIndex, pageSize != null ? pageSize : 50);
-
-    Result<Rule> result = service.search(query, options);
-    return new PagedResult<Rule>(result.getHits(), PagingResult.create(options.getLimit(), pageIndex, result.getTotal()));
+    int size = pageSize != null ? pageSize : 50;
+    if (size > -1) {
+      Integer page = RubyUtils.toInteger(params.get("p"));
+      int pageIndex = page != null ? page : 1;
+      options.setPage(pageIndex, size);
+      Result<Rule> result = service.search(query, options);
+      return new PagedResult<Rule>(result.getHits(), PagingResult.create(options.getLimit(), pageIndex, result.getTotal()));
+    } else {
+      options = new QueryOptions().setScroll(true);
+      List<Rule> rules = newArrayList(service.search(query, options).scroll());
+      return new PagedResult<Rule>(rules, PagingResult.create(Integer.MAX_VALUE, 1, rules.size()));
+    }
   }
 
   /**
diff --git a/sonar-server/src/test/java/org/sonar/server/rule/RubyRuleServiceTest.java b/sonar-server/src/test/java/org/sonar/server/rule/RubyRuleServiceTest.java
index 9cfc9ca41a2..c16f5c4d890 100644
--- a/sonar-server/src/test/java/org/sonar/server/rule/RubyRuleServiceTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/rule/RubyRuleServiceTest.java
@@ -24,14 +24,24 @@ import com.google.common.collect.ImmutableMap;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.sonar.api.rule.RuleKey;
+import org.sonar.api.rule.RuleStatus;
+import org.sonar.server.paging.PagedResult;
 import org.sonar.server.rule.index.RuleQuery;
 import org.sonar.server.search.QueryOptions;
 import org.sonar.server.search.Result;
 import org.sonar.server.user.UserSession;
 
+import java.util.HashMap;
+import java.util.List;
+
+import static com.google.common.collect.Lists.newArrayList;
+import static com.google.common.collect.Maps.newHashMap;
+import static org.fest.assertions.Assertions.assertThat;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.*;
 
@@ -44,6 +54,12 @@ public class RubyRuleServiceTest {
   @Mock
   RuleUpdater updater;
 
+  @Captor
+  ArgumentCaptor<QueryOptions> optionsCaptor;
+
+  @Captor
+  ArgumentCaptor<RuleQuery> ruleQueryCaptor;
+
   RubyRuleService service;
 
   @Before
@@ -57,6 +73,73 @@ public class RubyRuleServiceTest {
     verify(ruleService).getByKey(RuleKey.of("squid", "S001"));
   }
 
+  @Test
+  public void search_rules() throws Exception {
+    when(ruleService.search(any(RuleQuery.class), any(QueryOptions.class))).thenReturn(mock(Result.class));
+
+    HashMap<String, Object> params = newHashMap();
+    params.put("searchQuery", "Exception");
+    params.put("key", "S001");
+    params.put("languages", "xoo,js");
+    params.put("repositories", "checkstyle,pmd");
+    params.put("severities", "MAJOR,MINOR");
+    params.put("statuses", "BETA,READY");
+    params.put("tags", "tag1,tag2");
+    params.put("debtCharacteristics", "char1,char2");
+    params.put("hasDebtCharacteristic", "true");
+    params.put("p", "1");
+    params.put("pageSize", "40");
+    service.find(params);
+
+    verify(ruleService).search(ruleQueryCaptor.capture(), optionsCaptor.capture());
+
+    assertThat(ruleQueryCaptor.getValue().getQueryText()).isEqualTo("Exception");
+    assertThat(ruleQueryCaptor.getValue().getKey()).isEqualTo("S001");
+    assertThat(ruleQueryCaptor.getValue().getLanguages()).containsOnly("xoo", "js");
+    assertThat(ruleQueryCaptor.getValue().getRepositories()).containsOnly("checkstyle", "pmd");
+    assertThat(ruleQueryCaptor.getValue().getRepositories()).containsOnly("checkstyle", "pmd");
+    assertThat(ruleQueryCaptor.getValue().getSeverities()).containsOnly("MAJOR", "MINOR");
+    assertThat(ruleQueryCaptor.getValue().getStatuses()).containsOnly(RuleStatus.BETA, RuleStatus.READY);
+    assertThat(ruleQueryCaptor.getValue().getTags()).containsOnly("tag1", "tag2");
+    assertThat(ruleQueryCaptor.getValue().getDebtCharacteristics()).containsOnly("char1", "char2");
+    assertThat(ruleQueryCaptor.getValue().getHasDebtCharacteristic()).isTrue();
+
+    assertThat(optionsCaptor.getValue().getLimit()).isEqualTo(40);
+    assertThat(optionsCaptor.getValue().getOffset()).isEqualTo(0);
+  }
+
+  @Test
+  public void search_rules_without_page_size_param() throws Exception {
+    when(ruleService.search(any(RuleQuery.class), any(QueryOptions.class))).thenReturn(mock(Result.class));
+
+    HashMap<String, Object> params = newHashMap();
+    params.put("p", "1");
+    service.find(params);
+
+    verify(ruleService).search(ruleQueryCaptor.capture(), optionsCaptor.capture());
+
+    assertThat(optionsCaptor.getValue().getLimit()).isEqualTo(50);
+    assertThat(optionsCaptor.getValue().getOffset()).isEqualTo(0);
+  }
+
+  @Test
+  public void search_all_rules() throws Exception {
+    List<Rule> rules = newArrayList(mock(Rule.class));
+    Result serviceResult = mock(Result.class);
+    when(serviceResult.scroll()).thenReturn(rules.iterator());
+
+    when(ruleService.search(any(RuleQuery.class), any(QueryOptions.class))).thenReturn(serviceResult);
+
+    HashMap<String, Object> params = newHashMap();
+    params.put("pageSize", "-1");
+    PagedResult<Rule> result = service.find(params);
+
+    verify(serviceResult).scroll();
+
+    verify(ruleService).search(ruleQueryCaptor.capture(), optionsCaptor.capture());
+    assertThat(result.paging().pageSize()).isEqualTo(Integer.MAX_VALUE);
+  }
+
   @Test
   public void update_rule() throws Exception {
     when(ruleService.search(any(RuleQuery.class), any(QueryOptions.class))).thenReturn(mock(Result.class));
-- 
cgit v1.2.3


From 1b7df698521c060b67a592a3dda95b8af488010b Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com>
Date: Fri, 4 Jul 2014 15:45:32 +0200
Subject: SONAR-5007 Sort languages by label (instead of id) in Coding Rules
 filter

---
 .../main/coffee/coding-rules/views/filters/language-filter-view.coffee  | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'sonar-server/src/main')

diff --git a/sonar-server/src/main/coffee/coding-rules/views/filters/language-filter-view.coffee b/sonar-server/src/main/coffee/coding-rules/views/filters/language-filter-view.coffee
index 96a07561137..b52dcb2bbbb 100644
--- a/sonar-server/src/main/coffee/coding-rules/views/filters/language-filter-view.coffee
+++ b/sonar-server/src/main/coffee/coding-rules/views/filters/language-filter-view.coffee
@@ -15,6 +15,8 @@ define [
 
     initialize: ->
       super
+      @choices.comparator = 'text'
+      @choices.sort()
       @app = @model.get 'app'
       @listenTo @app.qualityProfileFilter, 'change:value', @onChangeProfile
       @selectedFromProfile = false
-- 
cgit v1.2.3


From d46c21ff3399c898fc08f2d56c1259786a71ea85 Mon Sep 17 00:00:00 2001
From: Stephane Gamard <stephane.gamard@searchbox.com>
Date: Fri, 4 Jul 2014 15:53:19 +0200
Subject: fix quality flaw (Throw exception when ES fails within timeout)

---
 .../main/java/org/sonar/server/search/IndexQueue.java | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'sonar-server/src/main')

diff --git a/sonar-server/src/main/java/org/sonar/server/search/IndexQueue.java b/sonar-server/src/main/java/org/sonar/server/search/IndexQueue.java
index e556a6635c6..28d8210acc7 100644
--- a/sonar-server/src/main/java/org/sonar/server/search/IndexQueue.java
+++ b/sonar-server/src/main/java/org/sonar/server/search/IndexQueue.java
@@ -43,6 +43,7 @@ public class IndexQueue extends LinkedBlockingQueue<Runnable>
   private static final Logger LOGGER = LoggerFactory.getLogger(IndexQueue.class);
 
   private static final Integer DEFAULT_QUEUE_SIZE = 200;
+  private static final int TIMEOUT = 3000;
 
   public IndexQueue() {
     super(DEFAULT_QUEUE_SIZE);
@@ -72,8 +73,10 @@ public class IndexQueue extends LinkedBlockingQueue<Runnable>
       action.setLatch(latch);
       try {
         indexTime = System.currentTimeMillis();
-        this.offer(action, 1000, TimeUnit.SECONDS);
-        latch.await(1000, TimeUnit.MILLISECONDS);
+        this.offer(action, TIMEOUT, TimeUnit.SECONDS);
+        if (!latch.await(TIMEOUT, TimeUnit.MILLISECONDS)) {
+          throw new IllegalStateException("ES update could not be completed within: " + TIMEOUT + "ms");
+        }
         bcount++;
         indexTime = System.currentTimeMillis() - indexTime;
         // refresh the index.
@@ -112,12 +115,14 @@ public class IndexQueue extends LinkedBlockingQueue<Runnable>
         indexTime = System.currentTimeMillis();
         for (IndexAction action : itemActions) {
           action.setLatch(itemLatch);
-          this.offer(action, 1000, TimeUnit.SECONDS);
+          this.offer(action, TIMEOUT, TimeUnit.SECONDS);
           types.add(action.getPayloadClass().getSimpleName());
           bcount++;
 
         }
-        itemLatch.await(2000, TimeUnit.MILLISECONDS);
+        if (!itemLatch.await(TIMEOUT, TimeUnit.MILLISECONDS)) {
+          throw new IllegalStateException("ES update could not be completed within: " + TIMEOUT + "ms");
+        }
         indexTime = System.currentTimeMillis() - indexTime;
 
         /* and now push the embedded */
@@ -125,11 +130,13 @@ public class IndexQueue extends LinkedBlockingQueue<Runnable>
         embeddedTime = System.currentTimeMillis();
         for (IndexAction action : embeddedActions) {
           action.setLatch(embeddedLatch);
-          this.offer(action, 1000, TimeUnit.SECONDS);
+          this.offer(action, TIMEOUT, TimeUnit.SECONDS);
           types.add(action.getPayloadClass().getSimpleName());
           ecount++;
         }
-        embeddedLatch.await(1500, TimeUnit.MILLISECONDS);
+        if (!embeddedLatch.await(TIMEOUT, TimeUnit.MILLISECONDS)) {
+          throw new IllegalStateException("ES embedded update could not be completed within: " + TIMEOUT + "ms");
+        }
         embeddedTime = System.currentTimeMillis() - embeddedTime;
 
         /* Finally refresh affected indexes */
-- 
cgit v1.2.3


From 05be0dff7b176e4f5236da44098ea4c24ec750b7 Mon Sep 17 00:00:00 2001
From: Stephane Gamard <stephane.gamard@searchbox.com>
Date: Fri, 4 Jul 2014 17:19:52 +0200
Subject: fix quality flaw (Using production ready timeout value)

---
 sonar-server/src/main/java/org/sonar/server/search/IndexQueue.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sonar-server/src/main')

diff --git a/sonar-server/src/main/java/org/sonar/server/search/IndexQueue.java b/sonar-server/src/main/java/org/sonar/server/search/IndexQueue.java
index 28d8210acc7..edb234c5e55 100644
--- a/sonar-server/src/main/java/org/sonar/server/search/IndexQueue.java
+++ b/sonar-server/src/main/java/org/sonar/server/search/IndexQueue.java
@@ -43,7 +43,7 @@ public class IndexQueue extends LinkedBlockingQueue<Runnable>
   private static final Logger LOGGER = LoggerFactory.getLogger(IndexQueue.class);
 
   private static final Integer DEFAULT_QUEUE_SIZE = 200;
-  private static final int TIMEOUT = 3000;
+  private static final int TIMEOUT = 30000;
 
   public IndexQueue() {
     super(DEFAULT_QUEUE_SIZE);
-- 
cgit v1.2.3


From 7fc7eec87bc2c56543e9e4ce6a2d66c5f94442b5 Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Fri, 4 Jul 2014 18:18:15 +0200
Subject: Improve exception handling in BaseDao

---
 .../src/main/java/org/sonar/server/db/BaseDao.java | 33 +++++++++++++++-------
 1 file changed, 23 insertions(+), 10 deletions(-)

(limited to 'sonar-server/src/main')

diff --git a/sonar-server/src/main/java/org/sonar/server/db/BaseDao.java b/sonar-server/src/main/java/org/sonar/server/db/BaseDao.java
index 10cedfdfcc3..d79460478a0 100644
--- a/sonar-server/src/main/java/org/sonar/server/db/BaseDao.java
+++ b/sonar-server/src/main/java/org/sonar/server/db/BaseDao.java
@@ -33,6 +33,7 @@ import org.sonar.server.search.action.KeyIndexAction;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
+
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.Date;
@@ -181,10 +182,14 @@ public abstract class BaseDao<M, E extends Dto<K>, K extends Serializable> imple
   }
 
   private void update(DbSession session, E item, Date now) {
-    item.setUpdatedAt(now);
-    doUpdate(session, item);
-    if (hasIndex()) {
-      session.enqueue(new DtoIndexAction<E>(getIndexType(), IndexAction.Method.UPSERT, item));
+    try {
+      item.setUpdatedAt(now);
+      doUpdate(session, item);
+      if (hasIndex()) {
+        session.enqueue(new DtoIndexAction<E>(getIndexType(), IndexAction.Method.UPSERT, item));
+      }
+    } catch (Exception e) {
+      throw new IllegalStateException("Fail to update item in db: " + item, e);
     }
   }
 
@@ -218,9 +223,13 @@ public abstract class BaseDao<M, E extends Dto<K>, K extends Serializable> imple
       item.setCreatedAt(now);
     }
     item.setUpdatedAt(now);
-    doInsert(session, item);
-    if (hasIndex()) {
-      session.enqueue(new DtoIndexAction<E>(getIndexType(), IndexAction.Method.UPSERT, item));
+    try {
+      doInsert(session, item);
+      if (hasIndex()) {
+        session.enqueue(new DtoIndexAction<E>(getIndexType(), IndexAction.Method.UPSERT, item));
+      }
+    } catch (Exception e) {
+      throw new IllegalStateException("Fail to insert item in db: " + item, e.getCause());
     }
   }
 
@@ -247,9 +256,13 @@ public abstract class BaseDao<M, E extends Dto<K>, K extends Serializable> imple
   @Override
   public final void deleteByKey(DbSession session, K key) {
     Preconditions.checkNotNull(key, "Missing key");
-    doDeleteByKey(session, key);
-    if (hasIndex()) {
-      session.enqueue(new KeyIndexAction<K>(getIndexType(), IndexAction.Method.DELETE, key));
+    try {
+      doDeleteByKey(session, key);
+      if (hasIndex()) {
+        session.enqueue(new KeyIndexAction<K>(getIndexType(), IndexAction.Method.DELETE, key));
+      }
+    } catch (Exception e) {
+      throw new IllegalStateException("Fail to delete item from db: " + key, e);
     }
   }
 
-- 
cgit v1.2.3


From dd0787bbb5d6412f3acf98c68c2a786dc07c3532 Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Fri, 4 Jul 2014 19:18:37 +0200
Subject: Remove detach link in project viewers

---
 .../webapp/WEB-INF/app/views/resource/_tabs.html.erb    | 17 -----------------
 1 file changed, 17 deletions(-)

(limited to 'sonar-server/src/main')

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_tabs.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_tabs.html.erb
index 6d896b6dfbb..9b1e13a610f 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_tabs.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_tabs.html.erb
@@ -20,23 +20,6 @@
   <% end %>
 
   <div class="source_tabs">
-    <ul class="tablinks">
-      <% first=true %>
-      <% if @snapshot.has_source && has_role?(:codeviewer, @snapshot) %>
-        <li class="<%= 'first' if first -%>">
-          <a href="<%= ApplicationController.root_context -%>/api/sources?resource=<%= @resource.key -%>&amp;format=txt"><%= message('raw') -%></a>
-        </li>
-      <% first=false
-         end %>
-      <% unless @popup_mode %>
-        <li class="<%= 'first' if first -%>">
-          <a href="<%= url_for :controller => 'resource', :action => 'index', :id => @resource.key, :period => params[:period], :metric => params[:metric],
-                               :rule => params[:rule] ? params[:rule] : params[:rule_sev], :display_title => 'true' -%>"
-             onclick="window.open(this.href,'resource','height=800,width=900,scrollbars=1,resizable=1');return false;"
-             id="new-window-<%= @resource.key.parameterize -%>"><%= image_tag 'new-window-16.gif', :alt => message('new_window') -%></a>
-        </li>
-      <% end %>
-    </ul>
     <ul class="tabs">
       <% @extensions.each do |extension| %>
         <li>
-- 
cgit v1.2.3


From b10cb73c508662f3f027589f01c4f50b811747ac Mon Sep 17 00:00:00 2001
From: Stas Vilchik <vilchiks@gmail.com>
Date: Mon, 7 Jul 2014 11:55:36 +0600
Subject: SONAR-5209 Improve the message of removed component

---
 sonar-server/src/main/coffee/component-viewer/main.coffee | 3 ++-
 sonar-server/src/main/hbs/component-viewer/header.hbs     | 2 +-
 sonar-server/src/main/less/component-viewer.less          | 2 --
 3 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'sonar-server/src/main')

diff --git a/sonar-server/src/main/coffee/component-viewer/main.coffee b/sonar-server/src/main/coffee/component-viewer/main.coffee
index 775aa7b08bb..32e4cd8697c 100644
--- a/sonar-server/src/main/coffee/component-viewer/main.coffee
+++ b/sonar-server/src/main/coffee/component-viewer/main.coffee
@@ -245,9 +245,10 @@ define [
           if @settings.get('duplications') then @showDuplications() else @hideDuplications()
           if @settings.get('scm') then @showSCM() else @hideSCM()
           @trigger 'loaded'
-      .fail =>
+      .fail (r) =>
         if component.status == 404
           @state.set 'removed', true
+          @state.set 'removedMessage', _.pluck(r.responseJSON.errors, 'msg').join '. '
           @state.set 'hasSource', false
           @render()
           @trigger 'loaded'
diff --git a/sonar-server/src/main/hbs/component-viewer/header.hbs b/sonar-server/src/main/hbs/component-viewer/header.hbs
index 313d7c3ffde..5f6619ce5b6 100644
--- a/sonar-server/src/main/hbs/component-viewer/header.hbs
+++ b/sonar-server/src/main/hbs/component-viewer/header.hbs
@@ -22,7 +22,7 @@
         {{/if}}
       </div>
     {{else}}
-      <div class="component-viewer-header-component-project removed">{{t 'issue.component_deleted'}}</div>
+      <div class="component-viewer-header-component-project removed">{{state.removedMessage}}</div>
     {{/unless}}
   </div>
 
diff --git a/sonar-server/src/main/less/component-viewer.less b/sonar-server/src/main/less/component-viewer.less
index 07798e0ad74..da5027d78f5 100644
--- a/sonar-server/src/main/less/component-viewer.less
+++ b/sonar-server/src/main/less/component-viewer.less
@@ -335,8 +335,6 @@
 .component-viewer-header-component-project {
   color: #777;
   font-size: @smallFontSize;
-
-  &.removed { text-decoration: line-through; }
 }
 
 .component-viewer-header-component-name {
-- 
cgit v1.2.3


From 677170cacfe360a17b30c23d5c06d17d671ebfb8 Mon Sep 17 00:00:00 2001
From: Stas Vilchik <vilchiks@gmail.com>
Date: Mon, 7 Jul 2014 12:12:56 +0600
Subject: Slight UI adjustments on rule activation details

---
 sonar-server/src/main/less/coding-rules.less | 1 +
 1 file changed, 1 insertion(+)

(limited to 'sonar-server/src/main')

diff --git a/sonar-server/src/main/less/coding-rules.less b/sonar-server/src/main/less/coding-rules.less
index 072d883d456..428f7b7d4c8 100644
--- a/sonar-server/src/main/less/coding-rules.less
+++ b/sonar-server/src/main/less/coding-rules.less
@@ -99,6 +99,7 @@
   }
 
   .value {
+    display: inline-block;
     max-width: 300px;
     white-space: nowrap;
     overflow: hidden;
-- 
cgit v1.2.3


From 40a4c471d55c31c4f261be99599769f0d7d4e220 Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Mon, 7 Jul 2014 10:43:12 +0200
Subject: SONAR-5007 fix update of param activation when no default value

---
 .../server/qualityprofile/RuleActivatorContext.java |  5 ++++-
 .../qualityprofile/RuleActivatorMediumTest.java     | 21 ++++++++++++---------
 2 files changed, 16 insertions(+), 10 deletions(-)

(limited to 'sonar-server/src/main')

diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivatorContext.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivatorContext.java
index 81c470690ba..e779be00911 100644
--- a/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivatorContext.java
+++ b/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivatorContext.java
@@ -214,7 +214,10 @@ class RuleActivatorContext {
     }
     for (Map.Entry<String, String> changeParam : change.getParameters().entrySet()) {
       ActiveRuleParamDto param = activeRuleParams.get(changeParam.getKey());
-      if (param != null && !StringUtils.equals(changeParam.getValue(), param.getValue())) {
+      if (changeParam.getValue()==null && param != null && param.getValue()!=null) {
+        return false;
+      }
+      if (changeParam.getValue()!=null && (param == null || !StringUtils.equals(changeParam.getValue(), param.getValue()))) {
         return false;
       }
     }
diff --git a/sonar-server/src/test/java/org/sonar/server/qualityprofile/RuleActivatorMediumTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/RuleActivatorMediumTest.java
index 3e1f5ae6c50..5d55a161de7 100644
--- a/sonar-server/src/test/java/org/sonar/server/qualityprofile/RuleActivatorMediumTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/qualityprofile/RuleActivatorMediumTest.java
@@ -112,12 +112,14 @@ public class RuleActivatorMediumTest {
     RuleActivation activation = new RuleActivation(RuleTesting.XOO_X1);
     activation.setSeverity(Severity.BLOCKER);
     activation.setParameter("max", "7");
+    activation.setParameter("min", "3");
     List<ActiveRuleChange> changes = ruleActivator.activate(dbSession, activation, XOO_P1_KEY);
     dbSession.commit();
     dbSession.clearCache();
 
     assertThat(countActiveRules(XOO_P1_KEY)).isEqualTo(1);
-    verifyHasActiveRule(ActiveRuleKey.of(XOO_P1_KEY, RuleTesting.XOO_X1), Severity.BLOCKER, null, ImmutableMap.of("max", "7"));
+    verifyHasActiveRule(ActiveRuleKey.of(XOO_P1_KEY, RuleTesting.XOO_X1), Severity.BLOCKER, null,
+      ImmutableMap.of("max", "7", "min", "3"));
     assertThat(changes).hasSize(1);
     assertThat(changes.get(0).getType()).isEqualTo(ActiveRuleChange.Type.ACTIVATED);
   }
@@ -127,7 +129,8 @@ public class RuleActivatorMediumTest {
     activate(new RuleActivation(RuleTesting.XOO_X1), XOO_P1_KEY);
 
     assertThat(countActiveRules(XOO_P1_KEY)).isEqualTo(1);
-    verifyHasActiveRule(ActiveRuleKey.of(XOO_P1_KEY, RuleTesting.XOO_X1), Severity.MINOR, null, ImmutableMap.of("max", "10"));
+    verifyHasActiveRule(ActiveRuleKey.of(XOO_P1_KEY, RuleTesting.XOO_X1), Severity.MINOR, null,
+      ImmutableMap.of("max", "10"));
   }
 
   @Test
@@ -160,21 +163,21 @@ public class RuleActivatorMediumTest {
   }
 
   @Test
-  @Ignore
   public void update_activation_with_parameter_without_default_value() throws Exception {
-    // initial activation
+    // initial activation -> param "max" has a default value
     RuleActivation activation = new RuleActivation(RuleTesting.XOO_X1);
     activation.setSeverity(Severity.BLOCKER);
     activate(activation, XOO_P1_KEY);
+    verifyHasActiveRule(ActiveRuleKey.of(XOO_P1_KEY, RuleTesting.XOO_X1), Severity.BLOCKER, null,
+      ImmutableMap.of("max", "10"));
 
-    // update
+    // update param "min", which has no default value
     RuleActivation update = new RuleActivation(RuleTesting.XOO_X1);
-    // parameter min has no default value
-    update.setParameter("min", "42");
+    update.setParameter("min", "3");
     List<ActiveRuleChange> changes = activate(update, XOO_P1_KEY);
-
     assertThat(countActiveRules(XOO_P1_KEY)).isEqualTo(1);
-    verifyHasActiveRule(ActiveRuleKey.of(XOO_P1_KEY, RuleTesting.XOO_X1), Severity.BLOCKER, null, ImmutableMap.of("min", "42"));
+    verifyHasActiveRule(ActiveRuleKey.of(XOO_P1_KEY, RuleTesting.XOO_X1), Severity.BLOCKER, null,
+      ImmutableMap.of("min", "3", "max", "10"));
     assertThat(changes).hasSize(1);
     assertThat(changes.get(0).getType()).isEqualTo(ActiveRuleChange.Type.UPDATED);
   }
-- 
cgit v1.2.3


From c5f3ff40749fb8eeb1d953571420b62f04d2aee5 Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Mon, 7 Jul 2014 13:09:36 +0200
Subject: SONAR-5007 fix removal of param value

---
 .../sonar/server/qualityprofile/RuleActivator.java | 16 ++++++------
 .../main/java/org/sonar/server/search/ESNode.java  | 30 ++++++++++------------
 .../qualityprofile/RuleActivatorMediumTest.java    |  6 +++--
 3 files changed, 25 insertions(+), 27 deletions(-)

(limited to 'sonar-server/src/main')

diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivator.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivator.java
index 9c6e935c196..2fb2b565d6d 100644
--- a/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivator.java
+++ b/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivator.java
@@ -164,25 +164,25 @@ public class RuleActivator implements ServerComponent {
   private void applySeverityAndParamToChange(RuleActivation request, RuleActivatorContext context, ActiveRuleChange change) {
     if (request.isReset()) {
       // load severity and params from parent profile, else from default values
-      change.setSeverity(firstNonEmpty(
+      change.setSeverity(firstNonNull(
         context.parentSeverity(), context.defaultSeverity()));
       for (RuleParamDto ruleParamDto : context.ruleParams()) {
         String paramKey = ruleParamDto.getName();
-        change.setParameter(paramKey, validateParam(ruleParamDto, firstNonEmpty(
+        change.setParameter(paramKey, validateParam(ruleParamDto, firstNonNull(
           context.parentParamValue(paramKey), context.defaultParamValue(paramKey))));
       }
 
     } else if (context.activeRule() != null) {
       // already activated -> load severity and parameters from request, else keep existing ones, else from parent,
       // else from default
-      change.setSeverity(firstNonEmpty(
+      change.setSeverity(firstNonNull(
         request.getSeverity(),
         context.currentSeverity(),
         context.parentSeverity(),
         context.defaultSeverity()));
       for (RuleParamDto ruleParamDto : context.ruleParams()) {
         String paramKey = ruleParamDto.getName();
-        change.setParameter(paramKey, validateParam(ruleParamDto, firstNonEmpty(
+        change.setParameter(paramKey, validateParam(ruleParamDto, firstNonNull(
           context.requestParamValue(request, paramKey),
           context.currentParamValue(paramKey),
           context.parentParamValue(paramKey),
@@ -191,13 +191,13 @@ public class RuleActivator implements ServerComponent {
 
     } else if (context.activeRule() == null) {
       // not activated -> load severity and parameters from request, else from parent, else from defaults
-      change.setSeverity(firstNonEmpty(
+      change.setSeverity(firstNonNull(
         request.getSeverity(),
         context.parentSeverity(),
         context.defaultSeverity()));
       for (RuleParamDto ruleParamDto : context.ruleParams()) {
         String paramKey = ruleParamDto.getName();
-        change.setParameter(paramKey, validateParam(ruleParamDto, firstNonEmpty(
+        change.setParameter(paramKey, validateParam(ruleParamDto, firstNonNull(
           context.requestParamValue(request, paramKey),
           context.parentParamValue(paramKey),
           context.defaultParamValue(paramKey))));
@@ -206,9 +206,9 @@ public class RuleActivator implements ServerComponent {
   }
 
   @CheckForNull
-  String firstNonEmpty(String... strings) {
+  String firstNonNull(String... strings) {
     for (String s : strings) {
-      if (StringUtils.isNotEmpty(s)) {
+      if (s!=null) {
         return s;
       }
     }
diff --git a/sonar-server/src/main/java/org/sonar/server/search/ESNode.java b/sonar-server/src/main/java/org/sonar/server/search/ESNode.java
index 0bf101085f8..f568a09c97e 100644
--- a/sonar-server/src/main/java/org/sonar/server/search/ESNode.java
+++ b/sonar-server/src/main/java/org/sonar/server/search/ESNode.java
@@ -23,7 +23,6 @@ package org.sonar.server.search;
 import com.google.common.annotations.VisibleForTesting;
 import org.apache.commons.io.FileUtils;
 import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus;
-import org.elasticsearch.action.admin.indices.template.put.PutIndexTemplateResponse;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.common.logging.ESLoggerFactory;
 import org.elasticsearch.common.logging.slf4j.Slf4jESLoggerFactory;
@@ -112,13 +111,11 @@ public class ESNode implements Startable {
       .node();
     node.start();
 
-
-    if (
-      node.client().admin().cluster().prepareHealth()
-        .setWaitForYellowStatus()
-        .setTimeout(healthTimeout)
-        .get()
-        .getStatus() == ClusterHealthStatus.RED) {
+    if (node.client().admin().cluster().prepareHealth()
+      .setWaitForYellowStatus()
+      .setTimeout(healthTimeout)
+      .get()
+      .getStatus() == ClusterHealthStatus.RED) {
       throw new IllegalStateException(
         String.format("Elasticsearch index is corrupt, please delete directory '%s/%s' and relaunch the SonarQube server.", fileSystem.getHomeDir().getAbsolutePath(), DATA_DIR));
     }
@@ -174,41 +171,40 @@ public class ESNode implements Startable {
     esSettings
       .put("index.mapper.dynamic", false)
 
-        // Sortable text analyzer
+      // Sortable text analyzer
       .put("index.analysis.analyzer.sortable.type", "custom")
       .put("index.analysis.analyzer.sortable.tokenizer", "keyword")
       .putArray("index.analysis.analyzer.sortable.filter", "trim", "lowercase", "truncate")
 
-        // Edge NGram index-analyzer
+      // Edge NGram index-analyzer
       .put("index.analysis.analyzer.index_grams.type", "custom")
       .put("index.analysis.analyzer.index_grams.tokenizer", "whitespace")
       .putArray("index.analysis.analyzer.index_grams.filter", "trim", "lowercase", "gram_filter")
 
-        // Edge NGram search-analyzer
+      // Edge NGram search-analyzer
       .put("index.analysis.analyzer.search_grams.type", "custom")
       .put("index.analysis.analyzer.search_grams.tokenizer", "whitespace")
       .putArray("index.analysis.analyzer.search_grams.filter", "trim", "lowercase")
 
-        // Word index-analyzer
+      // Word index-analyzer
       .put("index.analysis.analyzer.index_words.type", "custom")
       .put("index.analysis.analyzer.index_words.tokenizer", "standard")
       .putArray("index.analysis.analyzer.index_words.filter",
         "standard", "word_filter", "lowercase", "stop", "asciifolding", "porter_stem")
 
-        // Word search-analyzer
+      // Word search-analyzer
       .put("index.analysis.analyzer.search_words.type", "custom")
       .put("index.analysis.analyzer.search_words.tokenizer", "standard")
       .putArray("index.analysis.analyzer.search_words.filter",
         "standard", "lowercase", "stop", "asciifolding", "porter_stem")
 
-
-        // Edge NGram filter
+      // Edge NGram filter
       .put("index.analysis.filter.gram_filter.type", "edgeNGram")
       .put("index.analysis.filter.gram_filter.min_gram", 2)
       .put("index.analysis.filter.gram_filter.max_gram", 15)
       .putArray("index.analysis.filter.gram_filter.token_chars", "letter", "digit", "punctuation", "symbol")
 
-        // Word filter
+      // Word filter
       .put("index.analysis.filter.word_filter.type", "word_delimiter")
       .put("index.analysis.filter.word_filter.generate_word_parts", true)
       .put("index.analysis.filter.word_filter.catenate_words", true)
@@ -219,7 +215,7 @@ public class ESNode implements Startable {
       .put("index.analysis.filter.word_filter.split_on_numerics", true)
       .put("index.analysis.filter.word_filter.stem_english_possessive", true)
 
-        // Path Analyzer
+      // Path Analyzer
       .put("index.analysis.analyzer.path_analyzer.type", "custom")
       .put("index.analysis.analyzer.path_analyzer.tokenizer", "path_hierarchy");
 
diff --git a/sonar-server/src/test/java/org/sonar/server/qualityprofile/RuleActivatorMediumTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/RuleActivatorMediumTest.java
index 5d55a161de7..cf4cd585bff 100644
--- a/sonar-server/src/test/java/org/sonar/server/qualityprofile/RuleActivatorMediumTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/qualityprofile/RuleActivatorMediumTest.java
@@ -245,14 +245,16 @@ public class RuleActivatorMediumTest {
     RuleActivation activation = new RuleActivation(RuleTesting.XOO_X1);
     activation.setSeverity(Severity.BLOCKER);
     activation.setParameter("max", "7");
+    activation.setParameter("min", "3");
     activate(activation, XOO_P1_KEY);
 
     // update without any severity or params = reset
     RuleActivation update = new RuleActivation(RuleTesting.XOO_X1).setReset(true);
     activate(update, XOO_P1_KEY);
-
     assertThat(countActiveRules(XOO_P1_KEY)).isEqualTo(1);
-    verifyHasActiveRule(activeRuleKey, Severity.MINOR, null, ImmutableMap.of("max", "10"));
+    verifyHasActiveRule(activeRuleKey, Severity.MINOR, null,
+      // only default values
+      ImmutableMap.of("max", "10"));
   }
 
   @Test
-- 
cgit v1.2.3


From 62f864da77f43b056b98b78932b1d20860da26b4 Mon Sep 17 00:00:00 2001
From: Stephane Gamard <stephane.gamard@searchbox.com>
Date: Mon, 7 Jul 2014 16:41:36 +0200
Subject: SONAR-5007 - Fixed hasDebt filter in RuleIndex

---
 .../java/org/sonar/server/rule/index/RuleIndex.java    | 18 +++++++++++-------
 .../sonar/server/rule/index/RuleIndexMediumTest.java   | 16 +++++++++++-----
 2 files changed, 22 insertions(+), 12 deletions(-)

(limited to 'sonar-server/src/main')

diff --git a/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java b/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java
index df2756104bc..3906b7f27fd 100644
--- a/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java
+++ b/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java
@@ -58,7 +58,6 @@ import org.sonar.server.search.QueryOptions;
 import org.sonar.server.search.Result;
 
 import javax.annotation.CheckForNull;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -233,16 +232,16 @@ public class RuleIndex extends BaseIndex<Rule, RuleDto, RuleKey> {
     if (debtCharacteristics != null && !debtCharacteristics.isEmpty()) {
       fb.must(
         FilterBuilders.orFilter(
-          // Match only when NOT NONE overriden
+          // Match only when NONE (overridden)
           FilterBuilders.andFilter(
             FilterBuilders.notFilter(
               FilterBuilders.termsFilter(RuleNormalizer.RuleField.SUB_CHARACTERISTIC.field(), DebtCharacteristic.NONE)),
             FilterBuilders.orFilter(
               FilterBuilders.termsFilter(RuleNormalizer.RuleField.SUB_CHARACTERISTIC.field(), debtCharacteristics),
               FilterBuilders.termsFilter(RuleNormalizer.RuleField.CHARACTERISTIC.field(), debtCharacteristics))
-            ),
+          ),
 
-          // Match only when NOT NONE overriden
+          // Match only when NOT NONE (not overridden)
           FilterBuilders.andFilter(
             FilterBuilders.orFilter(
               FilterBuilders.termsFilter(RuleNormalizer.RuleField.SUB_CHARACTERISTIC.field(), ""),
@@ -250,14 +249,19 @@ public class RuleIndex extends BaseIndex<Rule, RuleDto, RuleKey> {
             FilterBuilders.orFilter(
               FilterBuilders.termsFilter(RuleNormalizer.RuleField.DEFAULT_SUB_CHARACTERISTIC.field(), debtCharacteristics),
               FilterBuilders.termsFilter(RuleNormalizer.RuleField.DEFAULT_CHARACTERISTIC.field(), debtCharacteristics)))
-          )
-        );
+        )
+      );
     }
 
     // Debt char exist filter
     Boolean hasDebtCharacteristic = query.getHasDebtCharacteristic();
     if (hasDebtCharacteristic != null && hasDebtCharacteristic) {
-      fb.must(FilterBuilders.existsFilter(RuleNormalizer.RuleField.SUB_CHARACTERISTIC.field()));
+      fb.mustNot(
+        FilterBuilders.termsFilter(RuleNormalizer.RuleField.SUB_CHARACTERISTIC.field(), DebtCharacteristic.NONE))
+        .should(
+          FilterBuilders.existsFilter(RuleNormalizer.RuleField.SUB_CHARACTERISTIC.field()))
+        .should(
+          FilterBuilders.existsFilter(RuleNormalizer.RuleField.DEFAULT_SUB_CHARACTERISTIC.field()));
     }
 
     if (query.getAvailableSince() != null) {
diff --git a/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexMediumTest.java b/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexMediumTest.java
index f6fd64b2513..3b3950d6993 100644
--- a/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexMediumTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexMediumTest.java
@@ -24,7 +24,10 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Sets;
 import org.apache.commons.lang.time.DateUtils;
-import org.junit.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Test;
 import org.sonar.api.rule.RuleKey;
 import org.sonar.api.rule.RuleStatus;
 import org.sonar.api.rule.Severity;
@@ -47,8 +50,12 @@ import org.sonar.server.search.Result;
 import org.sonar.server.tester.ServerTester;
 
 import javax.annotation.Nullable;
-
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
 
 import static com.google.common.collect.Lists.newArrayList;
 import static org.fest.assertions.Assertions.assertThat;
@@ -284,8 +291,7 @@ public class RuleIndexMediumTest {
   }
 
   @Test
-  @Ignore("To be fixed")
-  public void search_by_has_debt_characteristic() {
+  public void search_by_has_debt_characteristic() throws InterruptedException {
     CharacteristicDto char1 = DebtTesting.newCharacteristicDto("c1")
       .setEnabled(true)
       .setName("char1");
-- 
cgit v1.2.3


From 237a04796fd693fa5b8e435884c7e2f2653340a1 Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Mon, 7 Jul 2014 17:51:28 +0200
Subject: SONAR-5007 fix registration of template rules

* update severity of custom rules on template changes
* fix removal of custom rules on removal of templates
---
 .../java/org/sonar/server/rule/RegisterRules.java  |  61 +-
 .../sonar/server/rule/RegisterRulesMediumTest.java | 715 ++++++++++-----------
 2 files changed, 388 insertions(+), 388 deletions(-)

(limited to 'sonar-server/src/main')

diff --git a/sonar-server/src/main/java/org/sonar/server/rule/RegisterRules.java b/sonar-server/src/main/java/org/sonar/server/rule/RegisterRules.java
index f0b388b98cf..6da4f4f4dd7 100644
--- a/sonar-server/src/main/java/org/sonar/server/rule/RegisterRules.java
+++ b/sonar-server/src/main/java/org/sonar/server/rule/RegisterRules.java
@@ -47,6 +47,7 @@ import org.sonar.server.startup.RegisterDebtModel;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -71,7 +72,7 @@ public class RegisterRules implements Startable {
   /**
    * @param registerDebtModel used only to be started after init of the technical debt model
    */
-  public RegisterRules(RuleDefinitionsLoader defLoader, RuleActivator ruleActivator, DbClient dbClient,  RegisterDebtModel registerDebtModel) {
+  public RegisterRules(RuleDefinitionsLoader defLoader, RuleActivator ruleActivator, DbClient dbClient, RegisterDebtModel registerDebtModel) {
     this(defLoader, ruleActivator, dbClient, System2.INSTANCE);
   }
 
@@ -350,40 +351,44 @@ public class RegisterRules implements Startable {
     return changed;
   }
 
-  private List<RuleDto> processRemainingDbRules(Collection<RuleDto> ruleDtos, DbSession session) {
+  private List<RuleDto> processRemainingDbRules(Collection<RuleDto> existingRules, DbSession session) {
+    // custom rules check status of template, so they must be processed at the end
+    List<RuleDto> customRules = newArrayList();
     List<RuleDto> removedRules = newArrayList();
-    for (RuleDto ruleDto : ruleDtos) {
-      boolean toBeRemoved = true;
-
-      // 0. Case Rule is a Custom rule
-      if (ruleDto.getTemplateId() != null) {
-        RuleDto template = dbClient.ruleDao().getTemplate(ruleDto, session);
 
-        // 0.1 CustomRule has an Active Template
-        if (template != null && RuleStatus.REMOVED != template.getStatus()) {
-          if (updateCustomRuleFromTemplateRule(ruleDto, template)) {
-            dbClient.ruleDao().update(session, ruleDto);
-          }
-          toBeRemoved = false;
-        }
+    for (RuleDto rule : existingRules) {
+      if (rule.getTemplateId() != null) {
+        customRules.add(rule);
+      } else if (rule.getStatus() != RuleStatus.REMOVED) {
+        removeRule(session, removedRules, rule);
       }
-      if (toBeRemoved && RuleStatus.REMOVED != ruleDto.getStatus()) {
-        LOG.info(String.format("Disable rule %s", ruleDto.getKey()));
-        ruleDto.setStatus(RuleStatus.REMOVED);
-        ruleDto.setSystemTags(Collections.<String>emptySet());
-        ruleDto.setTags(Collections.<String>emptySet());
-        dbClient.ruleDao().update(session, ruleDto);
-        removedRules.add(ruleDto);
-        if (removedRules.size() % 100 == 0) {
-          session.commit();
+    }
+
+    for (RuleDto customRule : customRules) {
+      RuleDto template = dbClient.ruleDao().getTemplate(customRule, session);
+      if (template != null && template.getStatus() != RuleStatus.REMOVED) {
+        if (updateCustomRuleFromTemplateRule(customRule, template)) {
+          dbClient.ruleDao().update(session, customRule);
         }
+      } else {
+        removeRule(session, removedRules, customRule);
       }
     }
 
-    if (!removedRules.isEmpty()) {
+    session.commit();
+    return removedRules;
+  }
+
+  private void removeRule(DbSession session, List<RuleDto> removedRules, RuleDto rule) {
+    LOG.info(String.format("Disable rule %s", rule.getKey()));
+    rule.setStatus(RuleStatus.REMOVED);
+    rule.setSystemTags(Collections.<String>emptySet());
+    rule.setTags(Collections.<String>emptySet());
+    dbClient.ruleDao().update(session, rule);
+    removedRules.add(rule);
+    if (removedRules.size() % 100 == 0) {
       session.commit();
     }
-    return removedRules;
   }
 
   private static boolean updateCustomRuleFromTemplateRule(RuleDto customRule, RuleDto templateRule) {
@@ -420,6 +425,10 @@ public class RegisterRules implements Startable {
       customRule.setStatus(templateRule.getStatus());
       changed = true;
     }
+    if (!StringUtils.equals(customRule.getSeverityString(), templateRule.getSeverityString())) {
+      customRule.setSeverity(templateRule.getSeverityString());
+      changed = true;
+    }
     return changed;
   }
 
diff --git a/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesMediumTest.java b/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesMediumTest.java
index ab9df337f33..ad9ac91c5f1 100644
--- a/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesMediumTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesMediumTest.java
@@ -50,6 +50,8 @@ import org.sonar.server.tester.ServerTester;
 import org.sonar.server.user.MockUserSession;
 import org.sonar.server.user.UserSession;
 
+import javax.annotation.Nullable;
+
 import java.util.Date;
 import java.util.List;
 
@@ -59,56 +61,89 @@ import static org.fest.assertions.Fail.fail;
 
 public class RegisterRulesMediumTest {
 
-  static XooRulesDefinition rulesDefinition = new XooRulesDefinition();
+  static final XooRulesDefinition RULE_DEFS = new XooRulesDefinition();
 
   @ClassRule
-  public static ServerTester tester = new ServerTester().addComponents(rulesDefinition);
+  public static final ServerTester TESTER = new ServerTester().addComponents(RULE_DEFS);
 
   RuleIndex index;
-
   DbClient db;
   DbSession dbSession;
 
   @Before
   public void before() {
-    tester.clearDbAndIndexes();
-    rulesDefinition.includeX1 = true;
-    rulesDefinition.includeX1bis = false;
-    rulesDefinition.includeX2 = true;
-    rulesDefinition.includeTemplate1 = true;
-    rulesDefinition.includeRuleLinkedToRootCharacteristic = false;
-    tester.get(Platform.class).executeStartupTasks();
-    db = tester.get(DbClient.class);
-    dbSession = tester.get(DbClient.class).openSession(false);
+    TESTER.clearDbAndIndexes();
+    db = TESTER.get(DbClient.class);
+    dbSession = TESTER.get(DbClient.class).openSession(false);
     dbSession.clearCache();
-
-    index = tester.get(RuleIndex.class);
+    index = TESTER.get(RuleIndex.class);
   }
 
   @After
   public void after() {
-    dbSession.close();
+    if (dbSession != null) {
+      dbSession.close();
+    }
+  }
+
+  private void register(@Nullable Rules rules) {
+    if (dbSession != null) {
+      dbSession.close();
+    }
+    RULE_DEFS.set(rules);
+    TESTER.get(Platform.class).executeStartupTasks();
+    db = TESTER.get(DbClient.class);
+    dbSession = TESTER.get(DbClient.class).openSession(false);
+    dbSession.clearCache();
+    index = TESTER.get(RuleIndex.class);
   }
 
   @Test
   public void register_rules_at_startup() throws Exception {
-    verifyRulesInDb();
+    register(new Rules() {
+      @Override
+      public void init(RulesDefinition.NewRepository repository) {
+        RulesDefinition.NewRule x1Rule = repository.createRule("x1")
+          .setName("x1 name")
+          .setHtmlDescription("x1 desc")
+          .setSeverity(Severity.MINOR)
+          .setEffortToFixDescription("x1 effort to fix")
+          .setTags("tag1");
+        x1Rule.createParam("acceptWhitespace")
+          .setType(RuleParamType.BOOLEAN)
+          .setDefaultValue("false")
+          .setDescription("Accept whitespaces on the line");
+        x1Rule.createParam("min")
+          .setType(RuleParamType.INTEGER);
+        x1Rule
+          .setDebtSubCharacteristic(RulesDefinition.SubCharacteristics.INTEGRATION_TESTABILITY)
+          .setDebtRemediationFunction(x1Rule.debtRemediationFunctions().linearWithOffset("1h", "30min"));
+      }
+    });
 
-    Result<Rule> searchResult = index.search(new RuleQuery(), new QueryOptions());
-    assertThat(searchResult.getTotal()).isEqualTo(3);
-    assertThat(searchResult.getHits()).hasSize(3);
+    // verify db
+    List<RuleDto> rules = db.ruleDao().findAll(dbSession);
+    assertThat(rules).hasSize(1);
+    assertThat(rules.get(0).getKey()).isEqualTo(RuleKey.of("xoo", "x1"));
+    List<RuleParamDto> ruleParams = db.ruleDao().findAllRuleParams(dbSession);
+    assertThat(ruleParams).hasSize(2);
 
-    Rule rule = index.getByKey(RuleTesting.XOO_X1);
+    // verify es
+    Result<Rule> searchResult = index.search(new RuleQuery(), new QueryOptions());
+    assertThat(searchResult.getTotal()).isEqualTo(1);
+    assertThat(searchResult.getHits()).hasSize(1);
+    Rule rule = index.getByKey(RuleKey.of("xoo", "x1"));
     assertThat(rule.severity()).isEqualTo(Severity.MINOR);
     assertThat(rule.name()).isEqualTo("x1 name");
     assertThat(rule.htmlDescription()).isEqualTo("x1 desc");
     assertThat(rule.systemTags()).contains("tag1");
-
-    assertThat(rule.params()).hasSize(1);
+    assertThat(rule.params()).hasSize(2);
     assertThat(rule.param("acceptWhitespace").type()).isEqualTo(RuleParamType.BOOLEAN);
     assertThat(rule.param("acceptWhitespace").defaultValue()).isEqualTo("false");
     assertThat(rule.param("acceptWhitespace").description()).isEqualTo("Accept whitespaces on the line");
-
+    assertThat(rule.param("min").type()).isEqualTo(RuleParamType.INTEGER);
+    assertThat(rule.param("min").defaultValue()).isNull();
+    assertThat(rule.param("min").description()).isNull();
     assertThat(rule.debtSubCharacteristicKey()).isEqualTo(RulesDefinition.SubCharacteristics.INTEGRATION_TESTABILITY);
     assertThat(rule.debtRemediationFunction().type()).isEqualTo(DebtRemediationFunction.Type.LINEAR_OFFSET);
     assertThat(rule.debtRemediationFunction().coefficient()).isEqualTo("1h");
@@ -117,76 +152,114 @@ public class RegisterRulesMediumTest {
   }
 
   /**
-   * support the use-case:
+   * Use-case:
    * 1. start server
    * 2. stop server
    * 3. drop elasticsearch index: rm -rf data/es
    * 4. start server -> db is up-to-date (no changes) but rules must be re-indexed
    */
   @Test
-  public void index_even_if_no_changes() throws Exception {
-    verifyRulesInDb();
+  public void index_rules_even_if_no_changes() throws Exception {
+    Rules rules = new Rules() {
+      @Override
+      public void init(RulesDefinition.NewRepository repository) {
+        repository.createRule("x1")
+          .setName("x1 name")
+          .setHtmlDescription("x1 desc");
+      }
+    };
+    register(rules);
 
     // clear ES but keep db
-    tester.clearIndexes();
-    verifyRulesInDb();
-    Result<Rule> searchResult = index.search(new RuleQuery(), new QueryOptions());
-    assertThat(searchResult.getTotal()).isEqualTo(0);
-    assertThat(searchResult.getHits()).hasSize(0);
-
-    // db is not updated (same rules) but es must be reindexed
-    tester.get(Platform.class).executeStartupTasks();
-
-    index = tester.get(RuleIndex.class);
+    TESTER.clearIndexes();
+    register(rules);
 
-    verifyRulesInDb();
+    // verify that rules are indexed
+    Result<Rule> searchResult = index.search(new RuleQuery(), new QueryOptions());
     searchResult = index.search(new RuleQuery().setKey("xoo:x1"), new QueryOptions());
     assertThat(searchResult.getTotal()).isEqualTo(1);
     assertThat(searchResult.getHits()).hasSize(1);
-    assertThat(searchResult.getHits().get(0).params()).hasSize(1);
+    assertThat(searchResult.getHits().get(0).key()).isEqualTo(RuleKey.of("xoo", "x1"));
   }
 
   @Test
-  public void update_rule() {
-    verifyRulesInDb();
-
-    // The plugin X1 will be updated
-    rulesDefinition.includeX1 = false;
-    rulesDefinition.includeX1bis = true;
-    tester.get(Platform.class).executeStartupTasks();
+  public void update_existing_rules() {
+    register(new Rules() {
+      @Override
+      public void init(RulesDefinition.NewRepository repository) {
+        RulesDefinition.NewRule x1Rule = repository.createRule("x1")
+          .setName("Name1")
+          .setHtmlDescription("Desc1")
+          .setSeverity(Severity.MINOR)
+          .setEffortToFixDescription("Effort1")
+          .setTags("tag1", "tag2");
+        x1Rule.createParam("max")
+          .setType(RuleParamType.INTEGER)
+          .setDefaultValue("10")
+          .setDescription("Maximum1");
+        x1Rule.createParam("min")
+          .setType(RuleParamType.INTEGER);
+        x1Rule
+          .setDebtSubCharacteristic(RulesDefinition.SubCharacteristics.INTEGRATION_TESTABILITY)
+          .setDebtRemediationFunction(x1Rule.debtRemediationFunctions().linearWithOffset("1h", "30min"));
+      }
+    });
+
+    register(new Rules() {
+      @Override
+      public void init(RulesDefinition.NewRepository repository) {
+        RulesDefinition.NewRule x1Rule = repository.createRule(RuleTesting.XOO_X1.rule())
+          .setName("Name2")
+          .setHtmlDescription("Desc2")
+          .setSeverity(Severity.INFO)
+          .setEffortToFixDescription("Effort2")
+          .setTags("tag2", "tag3");
+        // Param "max" is updated, "min" is removed, "format" is added
+        x1Rule.createParam("max")
+          .setType(RuleParamType.INTEGER)
+          .setDefaultValue("15")
+          .setDescription("Maximum2");
+        x1Rule.createParam("format").setType(RuleParamType.TEXT);
+        x1Rule
+          .setDebtSubCharacteristic(RulesDefinition.SubCharacteristics.INSTRUCTION_RELIABILITY)
+          .setDebtRemediationFunction(x1Rule.debtRemediationFunctions().linear("2h"));
+      }
+    });
 
     Rule rule = index.getByKey(RuleTesting.XOO_X1);
     assertThat(rule.severity()).isEqualTo(Severity.INFO);
-    assertThat(rule.name()).isEqualTo("x1 name updated");
-    assertThat(rule.htmlDescription()).isEqualTo("x1 desc updated");
-    assertThat(rule.systemTags()).contains("tag1", "tag2");
-
+    assertThat(rule.name()).isEqualTo("Name2");
+    assertThat(rule.htmlDescription()).isEqualTo("Desc2");
+    assertThat(rule.systemTags()).contains("tag2", "tag3");
     assertThat(rule.params()).hasSize(2);
-
-    assertThat(rule.param("acceptWhitespace").type()).isEqualTo(RuleParamType.BOOLEAN);
-    assertThat(rule.param("acceptWhitespace").defaultValue()).isEqualTo("true");
-    assertThat(rule.param("acceptWhitespace").description()).isEqualTo("Accept whitespaces on the line updated");
-
-    // New parameter
+    assertThat(rule.param("max").type()).isEqualTo(RuleParamType.INTEGER);
+    assertThat(rule.param("max").defaultValue()).isEqualTo("15");
+    assertThat(rule.param("max").description()).isEqualTo("Maximum2");
     assertThat(rule.param("format").type()).isEqualTo(RuleParamType.TEXT);
-    assertThat(rule.param("format").defaultValue()).isEqualTo("txt");
-    assertThat(rule.param("format").description()).isEqualTo("Format");
-
+    assertThat(rule.param("format").defaultValue()).isNull();
+    assertThat(rule.param("format").description()).isNull();
     assertThat(rule.debtSubCharacteristicKey()).isEqualTo(RulesDefinition.SubCharacteristics.INSTRUCTION_RELIABILITY);
     assertThat(rule.debtRemediationFunction().type()).isEqualTo(DebtRemediationFunction.Type.LINEAR);
     assertThat(rule.debtRemediationFunction().coefficient()).isEqualTo("2h");
     assertThat(rule.debtRemediationFunction().offset()).isNull();
-    assertThat(rule.effortToFixDescription()).isEqualTo("x1 effort to fix updated");
+    assertThat(rule.effortToFixDescription()).isEqualTo("Effort2");
   }
 
   @Test
-  public void not_update_rule_if_no_change() throws Exception {
+  public void do_not_update_rules_if_no_changes() throws Exception {
+    Rules rules = new Rules() {
+      @Override
+      public void init(RulesDefinition.NewRepository repository) {
+        repository.createRule("x1").setName("x1 name").setHtmlDescription("x1 desc");
+      }
+    };
+    register(rules);
+
     // Store updated at date
     Date updatedAt = index.getByKey(RuleTesting.XOO_X1).updatedAt();
 
     // Re-execute startup tasks
-    tester.get(Platform.class).executeStartupTasks();
-    dbSession.clearCache();
+    register(rules);
 
     // Verify rule has not been updated
     Rule customRuleReloaded = index.getByKey(RuleTesting.XOO_X1);
@@ -194,54 +267,55 @@ public class RegisterRulesMediumTest {
   }
 
   @Test
-  public void mark_rule_as_removed() throws Exception {
-    verifyRulesInDb();
-
-    rulesDefinition.includeX2 = false;
-    tester.get(Platform.class).executeStartupTasks();
-
-    verifyRulesInDb();
-    RuleDto rule = db.ruleDao().getByKey(dbSession, RuleKey.of("xoo", "x2"));
-    assertThat(rule.getStatus()).isEqualTo(RuleStatus.REMOVED);
-  }
-
-  @Test
-  public void reactivate_disabled_rules() {
-    verifyRulesInDb();
-
-    // Disable plugin X1
-    rulesDefinition.includeX1 = false;
-    tester.get(Platform.class).executeStartupTasks();
+  public void uninstall_and_reinstall_rules() {
+    Rules rules = new Rules() {
+      @Override
+      public void init(RulesDefinition.NewRepository repository) {
+        repository.createRule("x1").setName("x1 name").setHtmlDescription("x1 desc");
+      }
+    };
+    register(rules);
 
+    // Uninstall plugin
+    register(null);
     RuleDto rule = db.ruleDao().getByKey(dbSession, RuleTesting.XOO_X1);
     assertThat(rule.getStatus()).isEqualTo(RuleStatus.REMOVED);
-    dbSession.clearCache();
-
-    // Reactivate plugin X1
-    rulesDefinition.includeX1 = true;
-    tester.get(Platform.class).executeStartupTasks();
-
-    RuleDto ruleReloaded = db.ruleDao().getByKey(dbSession, RuleTesting.XOO_X1);
-    assertThat(ruleReloaded.getStatus()).isEqualTo(RuleStatus.READY);
+    Rule indexedRule = index.getByKey(RuleTesting.XOO_X1);
+    assertThat(indexedRule.status()).isEqualTo(RuleStatus.REMOVED);
+
+    // Re-install plugin
+    register(rules);
+    rule = db.ruleDao().getByKey(dbSession, RuleTesting.XOO_X1);
+    assertThat(rule.getStatus()).isEqualTo(RuleStatus.READY);
+    indexedRule = index.getByKey(RuleTesting.XOO_X1);
+    assertThat(indexedRule.status()).isEqualTo(RuleStatus.READY);
   }
 
   @Test
   public void deactivate_removed_rules_only_if_repository_still_exists() throws Exception {
+    register(new Rules() {
+      @Override
+      public void init(RulesDefinition.NewRepository repository) {
+        repository.createRule("x1").setName("x1 name").setHtmlDescription("x1 desc");
+      }
+    });
+
+    // Create a profile and activate rule
     MockUserSession.set().setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN).setLogin("me");
 
-    // create a profile and activate rule
     db.qualityProfileDao().insert(dbSession, QProfileTesting.newXooP1());
     dbSession.commit();
     dbSession.clearCache();
     RuleActivation activation = new RuleActivation(RuleTesting.XOO_X1);
-    tester.get(QProfileService.class).activate(QProfileTesting.XOO_P1_KEY, activation);
-    dbSession.clearCache();
+    TESTER.get(QProfileService.class).activate(QProfileTesting.XOO_P1_KEY, activation);
 
-    // restart, x2 still exists -> deactivate x1
-    rulesDefinition.includeX1 = false;
-    rulesDefinition.includeX2 = true;
-    tester.get(Platform.class).executeStartupTasks();
-    dbSession.clearCache();
+    // Restart, repo xoo still exists -> deactivate x1
+    register(new Rules() {
+      @Override
+      public void init(RulesDefinition.NewRepository repository) {
+        repository.createRule("x2").setName("x2 name").setHtmlDescription("x2 desc");
+      }
+    });
     assertThat(db.ruleDao().getByKey(dbSession, RuleKey.of("xoo", "x1")).getStatus()).isEqualTo(RuleStatus.REMOVED);
     assertThat(db.ruleDao().getByKey(dbSession, RuleKey.of("xoo", "x2")).getStatus()).isEqualTo(RuleStatus.READY);
     assertThat(db.activeRuleDao().findByProfileKey(dbSession, QProfileTesting.XOO_P1_KEY)).hasSize(0);
@@ -249,282 +323,265 @@ public class RegisterRulesMediumTest {
 
   @Test
   public void do_not_deactivate_removed_rules_if_repository_accidentaly_uninstalled() throws Exception {
-    MockUserSession.set().setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN).setLogin("me");
+    Rules rules = new Rules() {
+      @Override
+      public void init(RulesDefinition.NewRepository repository) {
+        repository.createRule("x1").setName("x1 name").setHtmlDescription("x1 desc");
+      }
+    };
+    register(rules);
 
     // create a profile and activate rule
+    MockUserSession.set().setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN).setLogin("me");
     db.qualityProfileDao().insert(dbSession, QProfileTesting.newXooP1());
     dbSession.commit();
     dbSession.clearCache();
     RuleActivation activation = new RuleActivation(RuleTesting.XOO_X1);
-    tester.get(QProfileService.class).activate(QProfileTesting.XOO_P1_KEY, activation);
-    dbSession.clearCache();
+    TESTER.get(QProfileService.class).activate(QProfileTesting.XOO_P1_KEY, activation);
 
-    // restart without x1, x2, template1 -> keep active rule of x1
-    rulesDefinition.includeX1 = false;
-    rulesDefinition.includeX2 = false;
-    rulesDefinition.includeTemplate1 = false;
-    tester.get(Platform.class).executeStartupTasks();
-    dbSession.clearCache();
+    // Restart without xoo
+    register(null);
     assertThat(db.ruleDao().getByKey(dbSession, RuleTesting.XOO_X1).getStatus()).isEqualTo(RuleStatus.REMOVED);
-    assertThat(db.ruleDao().getByKey(dbSession, RuleTesting.XOO_X2).getStatus()).isEqualTo(RuleStatus.REMOVED);
+    assertThat(db.activeRuleDao().findByProfileKey(dbSession, QProfileTesting.XOO_P1_KEY)).hasSize(1);
+
+    // Re-install
+    register(rules);
+    assertThat(db.ruleDao().getByKey(dbSession, RuleTesting.XOO_X1).getStatus()).isEqualTo(RuleStatus.READY);
     assertThat(db.activeRuleDao().findByProfileKey(dbSession, QProfileTesting.XOO_P1_KEY)).hasSize(1);
   }
 
   @Test
-  public void remove_end_user_tags_that_are_declared_as_system() {
-    verifyRulesInDb();
-
+  public void remove_user_tags_that_are_newly_declared_as_system() {
+    register(new Rules() {
+      @Override
+      public void init(RulesDefinition.NewRepository repository) {
+        repository.createRule("x1").setName("x1 name").setHtmlDescription("x1 desc").setTags("tag1");
+      }
+    });
     Rule rule = index.getByKey(RuleTesting.XOO_X1);
-    assertThat(rule.systemTags()).contains("tag1");
+    assertThat(rule.systemTags()).containsOnly("tag1");
     assertThat(rule.tags()).isEmpty();
 
-    // Add a user tag
-    tester.get(RuleUpdater.class).update(RuleUpdate.createForPluginRule(rule.key())
-      .setTags(newHashSet("user-tag")),
-      UserSession.get());
-    dbSession.clearCache();
-
-    // Verify tags
-    Rule ruleUpdated = index.getByKey(RuleTesting.XOO_X1);
-    assertThat(ruleUpdated.systemTags()).contains("tag1");
-    assertThat(ruleUpdated.tags()).contains("user-tag");
-
-    // The plugin X1 will be updated
-    rulesDefinition.includeX1 = false;
-    rulesDefinition.includeX1bis = true;
-    tester.get(Platform.class).executeStartupTasks();
-    dbSession.clearCache();
-
-    // User tag should become a system tag
-    RuleDto ruleDtoReloaded = db.ruleDao().getByKey(dbSession, RuleTesting.XOO_X1);
-    assertThat(ruleDtoReloaded.getSystemTags()).contains("tag1", "tag2", "user-tag");
-    assertThat(ruleDtoReloaded.getTags()).isEmpty();
-
-    // User tag should become a system tag
-    Rule ruleReloaded = index.getByKey(RuleTesting.XOO_X1);
-    assertThat(ruleReloaded.systemTags()).contains("tag1", "tag2", "user-tag");
-    assertThat(ruleReloaded.tags()).isEmpty();
-  }
-
-  @Test
-  public void update_debt_rule() throws Exception {
-    verifyRulesInDb();
-
-    // Update x1 rule
-    RuleDto ruleDto = db.ruleDao().getByKey(dbSession, RuleTesting.XOO_X1);
-    db.ruleDao().update(dbSession, ruleDto
-      .setDefaultSubCharacteristicId(123456)
-      .setDefaultRemediationFunction("LINEAR_OFFSET")
-      .setDefaultRemediationCoefficient("2h")
-      .setDefaultRemediationOffset("35min")
-      );
-    dbSession.commit();
-    dbSession.clearCache();
-
-    // Re-execute startup tasks
-    tester.get(Platform.class).executeStartupTasks();
-
-    // Verify default debt has been reset to plugin definition
-    Rule ruleReloaded = index.getByKey(RuleTesting.XOO_X1);
-    assertThat(ruleReloaded.debtSubCharacteristicKey()).isEqualTo(RulesDefinition.SubCharacteristics.INTEGRATION_TESTABILITY);
-    assertThat(ruleReloaded.debtRemediationFunction().type()).isEqualTo(DebtRemediationFunction.Type.LINEAR_OFFSET);
-    assertThat(ruleReloaded.debtRemediationFunction().coefficient()).isEqualTo("1h");
-    assertThat(ruleReloaded.debtRemediationFunction().offset()).isEqualTo("30min");
-  }
-
-  @Test
-  public void remove_debt_rule() throws Exception {
-    verifyRulesInDb();
-
-    // Set some default debt on x2 rule, which has no debt provided by th plugin
-    RuleDto ruleDto = db.ruleDao().getByKey(dbSession, RuleTesting.XOO_X2);
-    db.ruleDao().update(dbSession, ruleDto
-      .setDefaultSubCharacteristicId(db.debtCharacteristicDao().selectByKey(RulesDefinition.SubCharacteristics.INTEGRATION_TESTABILITY, dbSession).getId())
-      .setDefaultRemediationFunction("LINEAR_OFFSET")
-      .setDefaultRemediationCoefficient("2h")
-      .setDefaultRemediationOffset("35min")
-      );
-    dbSession.commit();
+    // User adds tag
+    TESTER.get(RuleUpdater.class).update(RuleUpdate.createForPluginRule(RuleTesting.XOO_X1).setTags(newHashSet("tag2")), UserSession.get());
     dbSession.clearCache();
-
-    // Re-execute startup tasks
-    tester.get(Platform.class).executeStartupTasks();
-
-    // Verify default debt has been removed
-    Rule ruleReloaded = index.getByKey(RuleTesting.XOO_X2);
-    assertThat(ruleReloaded.debtSubCharacteristicKey()).isNull();
-    assertThat(ruleReloaded.debtRemediationFunction()).isNull();
+    rule = index.getByKey(RuleTesting.XOO_X1);
+    assertThat(rule.systemTags()).containsOnly("tag1");
+    assertThat(rule.tags()).containsOnly("tag2");
+
+    // Definition updated -> user tag "tag2" becomes a system tag
+    register(new Rules() {
+      @Override
+      public void init(RulesDefinition.NewRepository repository) {
+        repository.createRule("x1").setName("x1 name").setHtmlDescription("x1 desc").setTags("tag1", "tag2");
+      }
+    });
+    rule = index.getByKey(RuleTesting.XOO_X1);
+    assertThat(rule.systemTags()).containsOnly("tag1", "tag2");
+    assertThat(rule.tags()).isEmpty();
   }
 
   @Test
-  public void fail_when_rule_is_linked_on_root_characteristic() throws Exception {
-    verifyRulesInDb();
-
-    rulesDefinition.includeRuleLinkedToRootCharacteristic = true;
+  public void fail_if_debt_characteristic_is_root() throws Exception {
     try {
-      // Re-execute startup tasks
-      tester.get(Platform.class).executeStartupTasks();
+      register(new Rules() {
+        @Override
+        public void init(RulesDefinition.NewRepository repository) {
+          RulesDefinition.NewRule rule = repository.createRule("x1").setName("x1 name").setHtmlDescription("x1 desc");
+          rule
+            .setDebtSubCharacteristic("REUSABILITY")
+            .setDebtRemediationFunction(rule.debtRemediationFunctions().linearWithOffset("1h", "30min"));
+        }
+      });
       fail();
-    } catch (Exception e) {
-      assertThat(e).isInstanceOf(MessageException.class).hasMessage("Rule 'xoo:RuleLinkedToRootCharacteristic' cannot be linked on the root characteristic 'REUSABILITY'");
+    } catch (MessageException e) {
+      assertThat(e).hasMessage("Rule 'xoo:x1' cannot be linked on the root characteristic 'REUSABILITY'");
     }
   }
 
   @Test
-  public void update_custom_rule_from_template() throws Exception {
-    Rule templateRule = index.getByKey(RuleKey.of("xoo", "template1"));
+  public void update_custom_rule_on_template_change() throws Exception {
+    register(new Rules() {
+      @Override
+      public void init(RulesDefinition.NewRepository repository) {
+        repository.createRule("T1")
+          .setName("template1 name")
+          .setHtmlDescription("template1 desc")
+          .setSeverity(Severity.MAJOR)
+          .setTemplate(true)
+          .createParam("format")
+          .setDefaultValue("csv")
+          .setType(RuleParamType.STRING)
+          .setDescription("format parameter");
+      }
+    });
+    Rule template = index.getByKey(RuleKey.of("xoo", "T1"));
 
     // Create custom rule
-    RuleKey customRuleKey = tester.get(RuleCreator.class).create(NewRule.createForCustomRule("CUSTOM_RULE", templateRule.key())
+    RuleKey customRuleKey = TESTER.get(RuleCreator.class).create(NewRule.createForCustomRule("CUSTOM_RULE", template.key())
       .setName("My custom")
       .setHtmlDescription("Some description")
       .setSeverity(Severity.MAJOR)
       .setStatus(RuleStatus.READY)
       .setParameters(ImmutableMap.of("format", "txt")));
 
-    // Update custom rule
-    RuleDto customRuleDto = db.ruleDao().getByKey(dbSession, customRuleKey);
-    db.ruleDao().update(dbSession, customRuleDto
-      .setLanguage("other language")
-      .setConfigKey("other config key")
-      .setDefaultSubCharacteristicId(45)
-      .setDefaultRemediationFunction("LINEAR_OFFSET")
-      .setDefaultRemediationCoefficient("1h")
-      .setDefaultRemediationOffset("5min")
-      .setEffortToFixDescription("effort to fix desc")
-      );
-    dbSession.commit();
-    dbSession.clearCache();
-
-    // Re-execute startup tasks
-    tester.get(Platform.class).executeStartupTasks();
+    // Update template and restart
+    register(new Rules() {
+      @Override
+      public void init(RulesDefinition.NewRepository repository) {
+        RulesDefinition.NewRule rule = repository.createRule("T1")
+          .setName("template1 name")
+          .setHtmlDescription("template1 desc")
+          .setSeverity(Severity.BLOCKER)
+          .setStatus(RuleStatus.BETA)
+          .setTemplate(true)
+          .setInternalKey("new_internal");
+        rule
+          .setDebtSubCharacteristic(RulesDefinition.SubCharacteristics.INTEGRATION_TESTABILITY)
+          .setDebtRemediationFunction(rule.debtRemediationFunctions().linearWithOffset("1h", "30min"))
+          .setEffortToFixDescription("Effort");
+      }
+    });
 
     // Verify custom rule has been restore from the template
     Rule customRule = index.getByKey(customRuleKey);
     assertThat(customRule.language()).isEqualTo("xoo");
-    assertThat(customRule.internalKey()).isNull();
-    assertThat(customRule.debtSubCharacteristicKey()).isNull();
-    assertThat(customRule.debtRemediationFunction()).isNull();
+    assertThat(customRule.internalKey()).isEqualTo("new_internal");
+    assertThat(customRule.severity()).isEqualTo(Severity.BLOCKER);
+    assertThat(customRule.status()).isEqualTo(RuleStatus.BETA);
+    assertThat(customRule.debtSubCharacteristicKey()).isEqualTo(RulesDefinition.SubCharacteristics.INTEGRATION_TESTABILITY);
+    assertThat(customRule.debtRemediationFunction().type()).isEqualTo(DebtRemediationFunction.Type.LINEAR_OFFSET);
+    assertThat(customRule.effortToFixDescription()).isEqualTo("Effort");
   }
 
   @Test
-  public void not_update_custom_rule_from_template_if_no_change() throws Exception {
-    Rule templateRule = index.getByKey(RuleKey.of("xoo", "template1"));
+  public void do_not_update_custom_rule_if_no_template_change() throws Exception {
+    Rules rules = new Rules() {
+      @Override
+      public void init(RulesDefinition.NewRepository repository) {
+        repository.createRule("T1")
+          .setName("template1 name")
+          .setHtmlDescription("template1 desc")
+          .setSeverity(Severity.MAJOR)
+          .setTemplate(true)
+          .createParam("format")
+          .setDefaultValue("csv")
+          .setType(RuleParamType.STRING)
+          .setDescription("format parameter");
+      }
+    };
+    register(rules);
+    Rule template = index.getByKey(RuleKey.of("xoo", "T1"));
 
     // Create custom rule
-    RuleKey customRuleKey = tester.get(RuleCreator.class).create(NewRule.createForCustomRule("CUSTOM_RULE", templateRule.key())
+    RuleKey customRuleKey = TESTER.get(RuleCreator.class).create(NewRule.createForCustomRule("CUSTOM_RULE", template.key())
       .setName("My custom")
       .setHtmlDescription("Some description")
       .setSeverity(Severity.MAJOR)
       .setStatus(RuleStatus.READY)
       .setParameters(ImmutableMap.of("format", "txt")));
-    dbSession.commit();
-    dbSession.clearCache();
 
-    // Store updated at date
     Date updatedAt = index.getByKey(customRuleKey).updatedAt();
 
-    // Re-execute startup tasks
-    tester.get(Platform.class).executeStartupTasks();
+    register(rules);
 
-    // Verify custom rule has not been updated
+    // Verify custom rule has been restore from the template
     Rule customRuleReloaded = index.getByKey(customRuleKey);
     assertThat(customRuleReloaded.updatedAt()).isEqualTo(updatedAt);
   }
 
   @Test
-  public void not_update_custom_rule_params_from_template() throws Exception {
-    Rule templateRule = index.getByKey(RuleKey.of("xoo", "template1"));
+  public void do_not_update_custom_rule_params_from_template() throws Exception {
+    register(new Rules() {
+      @Override
+      public void init(RulesDefinition.NewRepository repository) {
+        repository.createRule("T1")
+          .setName("template1 name")
+          .setHtmlDescription("template1 desc")
+          .setSeverity(Severity.MAJOR)
+          .setTemplate(true)
+          .createParam("format")
+          .setDefaultValue("csv")
+          .setType(RuleParamType.STRING)
+          .setDescription("format parameter");
+      }
+    });
+    Rule templateRule = index.getByKey(RuleKey.of("xoo", "T1"));
 
     // Create custom rule
-    RuleKey customRuleKey = tester.get(RuleCreator.class).create(NewRule.createForCustomRule("CUSTOM_RULE", templateRule.key())
+    RuleKey customRuleKey = TESTER.get(RuleCreator.class).create(NewRule.createForCustomRule("CUSTOM_RULE", templateRule.key())
       .setName("My custom")
       .setHtmlDescription("Some description")
       .setSeverity(Severity.MAJOR)
       .setStatus(RuleStatus.READY)
       .setParameters(ImmutableMap.of("format", "txt")));
-    dbSession.commit();
-    dbSession.clearCache();
 
-    // Update custom rule param name
-    RuleDto customRuleDto = db.ruleDao().getByKey(dbSession, customRuleKey);
-    RuleParamDto customRuleParamDto = db.ruleDao().findRuleParamsByRuleKey(dbSession, customRuleKey).get(0);
-    db.ruleDao().removeRuleParam(dbSession, customRuleDto, customRuleParamDto);
-    db.ruleDao().addRuleParam(dbSession, customRuleDto, customRuleParamDto.setName("format2"));
-    dbSession.commit();
-    dbSession.clearCache();
-
-    // Verify param has been updated
-    Rule customRule = index.getByKey(customRuleKey);
-    assertThat(customRule.params()).hasSize(1);
-    assertThat(customRule.params().get(0).key()).isEqualTo("format2");
-
-    // Re-execute startup tasks
-    tester.get(Platform.class).executeStartupTasks();
+    register(new Rules() {
+      @Override
+      public void init(RulesDefinition.NewRepository repository) {
+        repository.createRule("T1")
+          .setName("template1 name")
+          .setHtmlDescription("template1 desc")
+          .setSeverity(Severity.MAJOR)
+          .setTemplate(true)
+            // "format" removed, "format2" added
+          .createParam("format2")
+          .setDefaultValue("csv")
+          .setType(RuleParamType.STRING)
+          .setDescription("format parameter");
+      }
+    });
 
     // Verify custom rule param has not been changed!
     Rule customRuleReloaded = index.getByKey(customRuleKey);
-    assertThat(customRuleReloaded.params().get(0).key()).isEqualTo("format2");
+    assertThat(customRuleReloaded.params().get(0).key()).isEqualTo("format");
   }
 
   @Test
-  public void disable_custom_rules_if_template_is_disabled() {
-    Rule templateRule = index.getByKey(RuleKey.of("xoo", "template1"));
-
-    // Create custom rule
-    RuleKey customRuleKey = tester.get(RuleCreator.class).create(NewRule.createForCustomRule("CUSTOM_RULE", templateRule.key())
-      .setName("My custom")
-      .setHtmlDescription("Some description")
-      .setSeverity(Severity.MAJOR)
-      .setStatus(RuleStatus.READY));
-    dbSession.commit();
-    dbSession.clearCache();
-    assertThat(index.getByKey(customRuleKey).status()).isEqualTo(RuleStatus.READY);
-
-    // Restart without template rule
-    rulesDefinition.includeTemplate1 = false;
-    tester.get(Platform.class).executeStartupTasks();
-
-    // Verify custom rule is removed
-    assertThat(index.getByKey(customRuleKey).status()).isEqualTo(RuleStatus.REMOVED);
-  }
-
-  @Test
-  public void reactivate_disabled_custom_rules() {
-    Rule templateRule = index.getByKey(RuleKey.of("xoo", "template1"));
+  public void disable_custom_rules_if_template_disabled() {
+    Rules rules = new Rules() {
+      @Override
+      public void init(RulesDefinition.NewRepository repository) {
+        repository.createRule("T1")
+          .setName("template1 name")
+          .setHtmlDescription("template1 desc")
+          .setSeverity(Severity.MAJOR)
+          .setTemplate(true)
+          .createParam("format")
+          .setDefaultValue("csv")
+          .setType(RuleParamType.STRING)
+          .setDescription("format parameter");
+      }
+    };
+    register(rules);
+    Rule templateRule = index.getByKey(RuleKey.of("xoo", "T1"));
 
     // Create custom rule
-    RuleKey customRuleKey = tester.get(RuleCreator.class).create(NewRule.createForCustomRule("CUSTOM_RULE", templateRule.key())
+    RuleKey customRuleKey = TESTER.get(RuleCreator.class).create(NewRule.createForCustomRule("CUSTOM_RULE", templateRule.key())
       .setName("My custom")
       .setHtmlDescription("Some description")
       .setSeverity(Severity.MAJOR)
-      .setStatus(RuleStatus.READY));
-    dbSession.commit();
-    dbSession.clearCache();
+      .setStatus(RuleStatus.READY)
+      .setParameters(ImmutableMap.of("format", "txt")));
     assertThat(index.getByKey(customRuleKey).status()).isEqualTo(RuleStatus.READY);
 
-    // Restart without template rule
-    rulesDefinition.includeTemplate1 = false;
-    tester.get(Platform.class).executeStartupTasks();
-    dbSession.clearCache();
-
+    // Restart without template
+    register(null);
 
     // Verify custom rule is removed
+    assertThat(index.getByKey(templateRule.key()).status()).isEqualTo(RuleStatus.REMOVED);
     assertThat(index.getByKey(customRuleKey).status()).isEqualTo(RuleStatus.REMOVED);
 
-    // Restart with template rule
-    rulesDefinition.includeTemplate1 = true;
-    tester.get(Platform.class).executeStartupTasks();
-    dbSession.clearCache();
-
-    // Verify custom rule is reactivate
+    // Re-install template
+    register(rules);
+    assertThat(index.getByKey(templateRule.key()).status()).isEqualTo(RuleStatus.READY);
     assertThat(index.getByKey(customRuleKey).status()).isEqualTo(RuleStatus.READY);
   }
 
   @Test
-  public void not_disable_manual_rules() {
+  public void do_not_disable_manual_rules() {
     // Create manual rule
-    RuleKey manualRuleKey = tester.get(RuleCreator.class).create(NewRule.createForManualRule("MANUAL_RULE")
+    RuleKey manualRuleKey = TESTER.get(RuleCreator.class).create(NewRule.createForManualRule("MANUAL_RULE")
       .setName("My manual")
       .setHtmlDescription("Some description"));
     dbSession.commit();
@@ -532,97 +589,31 @@ public class RegisterRulesMediumTest {
     assertThat(index.getByKey(manualRuleKey).status()).isEqualTo(RuleStatus.READY);
 
     // Restart
-    tester.get(Platform.class).executeStartupTasks();
+    register(null);
 
     // Verify manual rule is still ready
     assertThat(index.getByKey(manualRuleKey).status()).isEqualTo(RuleStatus.READY);
   }
 
-  private void verifyRulesInDb() {
-    List<RuleDto> rules = db.ruleDao().findAll(dbSession);
-    assertThat(rules).hasSize(3);
-    List<RuleParamDto> ruleParams = db.ruleDao().findAllRuleParams(dbSession);
-    assertThat(ruleParams).hasSize(2);
+  interface Rules {
+    void init(RulesDefinition.NewRepository repository);
   }
 
   public static class XooRulesDefinition implements RulesDefinition {
+    private Rules rules = null;
 
-    boolean includeX1 = true, includeX1bis = false, includeX2 = true, includeTemplate1 = true, includeRuleLinkedToRootCharacteristic = false;
+    void set(@Nullable Rules rules) {
+      this.rules = rules;
+    }
 
     @Override
     public void define(Context context) {
-      if (includeX1 || includeX1bis || includeX2 || includeTemplate1 || includeRuleLinkedToRootCharacteristic) {
+      if (rules != null) {
         NewRepository repository = context.createRepository("xoo", "xoo").setName("Xoo Repo");
-        if (includeX1) {
-          NewRule x1Rule = repository.createRule(RuleTesting.XOO_X1.rule())
-            .setName("x1 name")
-            .setHtmlDescription("x1 desc")
-            .setSeverity(Severity.MINOR)
-            .setEffortToFixDescription("x1 effort to fix")
-            .setTags("tag1");
-          x1Rule.createParam("acceptWhitespace")
-            .setType(RuleParamType.BOOLEAN)
-            .setDefaultValue("false")
-            .setDescription("Accept whitespaces on the line");
-          x1Rule
-            .setDebtSubCharacteristic(SubCharacteristics.INTEGRATION_TESTABILITY)
-            .setDebtRemediationFunction(x1Rule.debtRemediationFunctions().linearWithOffset("1h", "30min"));
-        }
-
-        // X1 having fields updated to simulate an update from the plugin
-        if (includeX1bis) {
-          NewRule x1Rule = repository.createRule(RuleTesting.XOO_X1.rule())
-            .setName("x1 name updated")
-            .setHtmlDescription("x1 desc updated")
-            .setSeverity(Severity.INFO)
-            .setEffortToFixDescription("x1 effort to fix updated")
-            .setTags("tag1", "tag2", "user-tag");
-          x1Rule.createParam("acceptWhitespace")
-            .setType(RuleParamType.BOOLEAN)
-            .setDefaultValue("true")
-            .setDescription("Accept whitespaces on the line updated");
-          // New param
-          x1Rule.createParam("format")
-            .setType(RuleParamType.TEXT)
-            .setDefaultValue("txt")
-            .setDescription("Format");
-          x1Rule
-            .setDebtSubCharacteristic(SubCharacteristics.INSTRUCTION_RELIABILITY)
-            .setDebtRemediationFunction(x1Rule.debtRemediationFunctions().linear("2h"));
-        }
-
-        if (includeX2) {
-          repository.createRule(RuleTesting.XOO_X2.rule())
-            .setName("x2 name")
-            .setHtmlDescription("x2 desc")
-            .setSeverity(Severity.MAJOR);
-        }
-
-        if (includeRuleLinkedToRootCharacteristic) {
-          NewRule x1Rule = repository.createRule("RuleLinkedToRootCharacteristic")
-            .setName("RuleLinkedToRootCharacteristic name")
-            .setHtmlDescription("RuleLinkedToRootCharacteristic desc")
-            .setSeverity(Severity.MINOR);
-          x1Rule
-            // Link to a root characteristic -> fail
-            .setDebtSubCharacteristic("REUSABILITY")
-            .setDebtRemediationFunction(x1Rule.debtRemediationFunctions().linearWithOffset("1h", "30min"));
-        }
-
-        if (includeTemplate1) {
-          repository.createRule("template1")
-            .setName("template1 name")
-            .setHtmlDescription("template1 desc")
-            .setSeverity(Severity.MAJOR)
-            .setTemplate(true)
-            .createParam("format")
-            .setDefaultValue("csv")
-            .setType(RuleParamType.STRING)
-            .setDescription("format parameter");
-        }
-
+        rules.init(repository);
         repository.done();
       }
     }
+
   }
 }
-- 
cgit v1.2.3


From bfc542961446b8de587de32fd88de902123614d1 Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Mon, 7 Jul 2014 21:58:14 +0200
Subject: SONAR-5007 fix bug related to synchronization of rule parameters

* removal of rule parameter must be propagated to active rules
* addition of rule parameter with default value must be propagated to active rules
---
 .../core/qualityprofile/db/ActiveRuleMapper.xml    |   4 +-
 .../server/qualityprofile/db/ActiveRuleDao.java    |  11 ++
 .../java/org/sonar/server/rule/RegisterRules.java  |  25 ++--
 .../sonar/server/rule/RegisterRulesMediumTest.java | 131 ++++++++++++++-------
 4 files changed, 121 insertions(+), 50 deletions(-)

(limited to 'sonar-server/src/main')

diff --git a/sonar-core/src/main/resources/org/sonar/core/qualityprofile/db/ActiveRuleMapper.xml b/sonar-core/src/main/resources/org/sonar/core/qualityprofile/db/ActiveRuleMapper.xml
index fd3c1a00fe2..2f31335b5fd 100644
--- a/sonar-core/src/main/resources/org/sonar/core/qualityprofile/db/ActiveRuleMapper.xml
+++ b/sonar-core/src/main/resources/org/sonar/core/qualityprofile/db/ActiveRuleMapper.xml
@@ -149,11 +149,11 @@
     WHERE id=#{id}
   </update>
 
-  <update id="deleteParameters" parameterType="Integer">
+  <update id="deleteParameters" parameterType="int">
     DELETE FROM active_rule_parameters WHERE active_rule_id=#{id}
   </update>
 
-  <update id="deleteParameter" parameterType="Integer">
+  <update id="deleteParameter" parameterType="int">
     DELETE FROM active_rule_parameters WHERE id=#{id}
   </update>
 
diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/db/ActiveRuleDao.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/db/ActiveRuleDao.java
index a79a79a863b..9538f515703 100644
--- a/sonar-server/src/main/java/org/sonar/server/qualityprofile/db/ActiveRuleDao.java
+++ b/sonar-server/src/main/java/org/sonar/server/qualityprofile/db/ActiveRuleDao.java
@@ -227,4 +227,15 @@ public class ActiveRuleDao extends BaseDao<ActiveRuleMapper, ActiveRuleDto, Acti
     }
     return null;
   }
+
+  public void deleteParamsByRuleParam(DbSession dbSession, RuleDto rule, String paramKey) {
+    List<ActiveRuleDto> activeRules = findByRule(dbSession, rule);
+    for (ActiveRuleDto activeRule : activeRules) {
+      for (ActiveRuleParamDto activeParam : findParamsByActiveRuleKey(dbSession, activeRule.getKey())) {
+        if (activeParam.getKey().equals(paramKey)) {
+          deleteParam(dbSession, activeRule, activeParam);
+        }
+      }
+    }
+  }
 }
diff --git a/sonar-server/src/main/java/org/sonar/server/rule/RegisterRules.java b/sonar-server/src/main/java/org/sonar/server/rule/RegisterRules.java
index 6da4f4f4dd7..2fac09447af 100644
--- a/sonar-server/src/main/java/org/sonar/server/rule/RegisterRules.java
+++ b/sonar-server/src/main/java/org/sonar/server/rule/RegisterRules.java
@@ -23,6 +23,7 @@ import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Function;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
+import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
@@ -37,6 +38,8 @@ import org.sonar.api.utils.MessageException;
 import org.sonar.api.utils.System2;
 import org.sonar.api.utils.TimeProfiler;
 import org.sonar.core.persistence.DbSession;
+import org.sonar.core.qualityprofile.db.ActiveRuleDto;
+import org.sonar.core.qualityprofile.db.ActiveRuleParamDto;
 import org.sonar.core.rule.RuleDto;
 import org.sonar.core.rule.RuleParamDto;
 import org.sonar.core.technicaldebt.db.CharacteristicDao;
@@ -290,30 +293,38 @@ public class RegisterRules implements Startable {
 
   private void mergeParams(RulesDefinition.Rule ruleDef, RuleDto rule, DbSession session) {
     List<RuleParamDto> paramDtos = dbClient.ruleDao().findRuleParamsByRuleKey(session, rule.getKey());
-    List<String> existingParamDtoNames = new ArrayList<String>();
+    Map<String, RuleParamDto> existingParamsByName = Maps.newHashMap();
 
     for (RuleParamDto paramDto : paramDtos) {
       RulesDefinition.Param paramDef = ruleDef.param(paramDto.getName());
       if (paramDef == null) {
-        // TODO cascade on the activeRule upon RuleDeletion
+        dbClient.activeRuleDao().deleteParamsByRuleParam(session, rule, paramDto.getName());
         dbClient.ruleDao().removeRuleParam(session, rule, paramDto);
       } else {
-        // TODO validate that existing active rules still match constraints
-        // TODO store param name
         if (mergeParam(paramDto, paramDef)) {
           dbClient.ruleDao().updateRuleParam(session, rule, paramDto);
         }
-        existingParamDtoNames.add(paramDto.getName());
+        existingParamsByName.put(paramDto.getName(), paramDto);
       }
     }
+
+    // Create newly parameters
     for (RulesDefinition.Param param : ruleDef.params()) {
-      if (!existingParamDtoNames.contains(param.key())) {
-        RuleParamDto paramDto = RuleParamDto.createFor(rule)
+      RuleParamDto paramDto = existingParamsByName.get(param.key());
+      if (paramDto == null) {
+        paramDto = RuleParamDto.createFor(rule)
           .setName(param.key())
           .setDescription(param.description())
           .setDefaultValue(param.defaultValue())
           .setType(param.type().toString());
         dbClient.ruleDao().addRuleParam(session, rule, paramDto);
+        if (!StringUtils.isEmpty(param.defaultValue())) {
+          // Propagate the default value to existing active rules
+          for (ActiveRuleDto activeRule : dbClient.activeRuleDao().findByRule(session, rule)) {
+            ActiveRuleParamDto activeParam = ActiveRuleParamDto.createFor(paramDto).setValue(param.defaultValue());
+            dbClient.activeRuleDao().addParam(session, activeRule, activeParam);
+          }
+        }
       }
     }
   }
diff --git a/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesMediumTest.java b/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesMediumTest.java
index ad9ac91c5f1..349eb0689f7 100644
--- a/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesMediumTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesMediumTest.java
@@ -35,13 +35,16 @@ import org.sonar.api.server.rule.RulesDefinition;
 import org.sonar.api.utils.MessageException;
 import org.sonar.core.permission.GlobalPermissions;
 import org.sonar.core.persistence.DbSession;
+import org.sonar.core.qualityprofile.db.ActiveRuleKey;
 import org.sonar.core.rule.RuleDto;
 import org.sonar.core.rule.RuleParamDto;
 import org.sonar.server.db.DbClient;
 import org.sonar.server.platform.Platform;
+import org.sonar.server.qualityprofile.ActiveRule;
 import org.sonar.server.qualityprofile.QProfileService;
 import org.sonar.server.qualityprofile.QProfileTesting;
 import org.sonar.server.qualityprofile.RuleActivation;
+import org.sonar.server.qualityprofile.index.ActiveRuleIndex;
 import org.sonar.server.rule.index.RuleIndex;
 import org.sonar.server.rule.index.RuleQuery;
 import org.sonar.server.search.QueryOptions;
@@ -54,6 +57,7 @@ import javax.annotation.Nullable;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 import static com.google.common.collect.Sets.newHashSet;
 import static org.fest.assertions.Assertions.assertThat;
@@ -66,7 +70,8 @@ public class RegisterRulesMediumTest {
   @ClassRule
   public static final ServerTester TESTER = new ServerTester().addComponents(RULE_DEFS);
 
-  RuleIndex index;
+  RuleIndex ruleIndex;
+  ActiveRuleIndex activeRuleIndex;
   DbClient db;
   DbSession dbSession;
 
@@ -76,7 +81,8 @@ public class RegisterRulesMediumTest {
     db = TESTER.get(DbClient.class);
     dbSession = TESTER.get(DbClient.class).openSession(false);
     dbSession.clearCache();
-    index = TESTER.get(RuleIndex.class);
+    ruleIndex = TESTER.get(RuleIndex.class);
+    activeRuleIndex = TESTER.get(ActiveRuleIndex.class);
   }
 
   @After
@@ -95,7 +101,7 @@ public class RegisterRulesMediumTest {
     db = TESTER.get(DbClient.class);
     dbSession = TESTER.get(DbClient.class).openSession(false);
     dbSession.clearCache();
-    index = TESTER.get(RuleIndex.class);
+    ruleIndex = TESTER.get(RuleIndex.class);
   }
 
   @Test
@@ -129,10 +135,10 @@ public class RegisterRulesMediumTest {
     assertThat(ruleParams).hasSize(2);
 
     // verify es
-    Result<Rule> searchResult = index.search(new RuleQuery(), new QueryOptions());
+    Result<Rule> searchResult = ruleIndex.search(new RuleQuery(), new QueryOptions());
     assertThat(searchResult.getTotal()).isEqualTo(1);
     assertThat(searchResult.getHits()).hasSize(1);
-    Rule rule = index.getByKey(RuleKey.of("xoo", "x1"));
+    Rule rule = ruleIndex.getByKey(RuleKey.of("xoo", "x1"));
     assertThat(rule.severity()).isEqualTo(Severity.MINOR);
     assertThat(rule.name()).isEqualTo("x1 name");
     assertThat(rule.htmlDescription()).isEqualTo("x1 desc");
@@ -175,8 +181,8 @@ public class RegisterRulesMediumTest {
     register(rules);
 
     // verify that rules are indexed
-    Result<Rule> searchResult = index.search(new RuleQuery(), new QueryOptions());
-    searchResult = index.search(new RuleQuery().setKey("xoo:x1"), new QueryOptions());
+    Result<Rule> searchResult = ruleIndex.search(new RuleQuery(), new QueryOptions());
+    searchResult = ruleIndex.search(new RuleQuery().setKey("xoo:x1"), new QueryOptions());
     assertThat(searchResult.getTotal()).isEqualTo(1);
     assertThat(searchResult.getHits()).hasSize(1);
     assertThat(searchResult.getHits().get(0).key()).isEqualTo(RuleKey.of("xoo", "x1"));
@@ -226,7 +232,7 @@ public class RegisterRulesMediumTest {
       }
     });
 
-    Rule rule = index.getByKey(RuleTesting.XOO_X1);
+    Rule rule = ruleIndex.getByKey(RuleTesting.XOO_X1);
     assertThat(rule.severity()).isEqualTo(Severity.INFO);
     assertThat(rule.name()).isEqualTo("Name2");
     assertThat(rule.htmlDescription()).isEqualTo("Desc2");
@@ -256,18 +262,18 @@ public class RegisterRulesMediumTest {
     register(rules);
 
     // Store updated at date
-    Date updatedAt = index.getByKey(RuleTesting.XOO_X1).updatedAt();
+    Date updatedAt = ruleIndex.getByKey(RuleTesting.XOO_X1).updatedAt();
 
     // Re-execute startup tasks
     register(rules);
 
     // Verify rule has not been updated
-    Rule customRuleReloaded = index.getByKey(RuleTesting.XOO_X1);
+    Rule customRuleReloaded = ruleIndex.getByKey(RuleTesting.XOO_X1);
     assertThat(DateUtils.isSameInstant(customRuleReloaded.updatedAt(), updatedAt));
   }
 
   @Test
-  public void uninstall_and_reinstall_rules() {
+  public void disable_then_enable_rules() {
     Rules rules = new Rules() {
       @Override
       public void init(RulesDefinition.NewRepository repository) {
@@ -280,14 +286,14 @@ public class RegisterRulesMediumTest {
     register(null);
     RuleDto rule = db.ruleDao().getByKey(dbSession, RuleTesting.XOO_X1);
     assertThat(rule.getStatus()).isEqualTo(RuleStatus.REMOVED);
-    Rule indexedRule = index.getByKey(RuleTesting.XOO_X1);
+    Rule indexedRule = ruleIndex.getByKey(RuleTesting.XOO_X1);
     assertThat(indexedRule.status()).isEqualTo(RuleStatus.REMOVED);
 
     // Re-install plugin
     register(rules);
     rule = db.ruleDao().getByKey(dbSession, RuleTesting.XOO_X1);
     assertThat(rule.getStatus()).isEqualTo(RuleStatus.READY);
-    indexedRule = index.getByKey(RuleTesting.XOO_X1);
+    indexedRule = ruleIndex.getByKey(RuleTesting.XOO_X1);
     assertThat(indexedRule.status()).isEqualTo(RuleStatus.READY);
   }
 
@@ -302,7 +308,6 @@ public class RegisterRulesMediumTest {
 
     // Create a profile and activate rule
     MockUserSession.set().setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN).setLogin("me");
-
     db.qualityProfileDao().insert(dbSession, QProfileTesting.newXooP1());
     dbSession.commit();
     dbSession.clearCache();
@@ -316,13 +321,13 @@ public class RegisterRulesMediumTest {
         repository.createRule("x2").setName("x2 name").setHtmlDescription("x2 desc");
       }
     });
-    assertThat(db.ruleDao().getByKey(dbSession, RuleKey.of("xoo", "x1")).getStatus()).isEqualTo(RuleStatus.REMOVED);
-    assertThat(db.ruleDao().getByKey(dbSession, RuleKey.of("xoo", "x2")).getStatus()).isEqualTo(RuleStatus.READY);
-    assertThat(db.activeRuleDao().findByProfileKey(dbSession, QProfileTesting.XOO_P1_KEY)).hasSize(0);
+    assertThat(ruleIndex.getByKey(RuleKey.of("xoo", "x1")).status()).isEqualTo(RuleStatus.REMOVED);
+    assertThat(ruleIndex.getByKey(RuleKey.of("xoo", "x2")).status()).isEqualTo(RuleStatus.READY);
+    assertThat(activeRuleIndex.findByProfile(QProfileTesting.XOO_P1_KEY)).hasSize(0);
   }
 
   @Test
-  public void do_not_deactivate_removed_rules_if_repository_accidentaly_uninstalled() throws Exception {
+  public void do_not_deactivate_removed_rules_if_repository_accidentally_uninstalled() throws Exception {
     Rules rules = new Rules() {
       @Override
       public void init(RulesDefinition.NewRepository repository) {
@@ -341,13 +346,57 @@ public class RegisterRulesMediumTest {
 
     // Restart without xoo
     register(null);
-    assertThat(db.ruleDao().getByKey(dbSession, RuleTesting.XOO_X1).getStatus()).isEqualTo(RuleStatus.REMOVED);
-    assertThat(db.activeRuleDao().findByProfileKey(dbSession, QProfileTesting.XOO_P1_KEY)).hasSize(1);
+    assertThat(ruleIndex.getByKey(RuleTesting.XOO_X1).status()).isEqualTo(RuleStatus.REMOVED);
+    assertThat(activeRuleIndex.findByProfile(QProfileTesting.XOO_P1_KEY)).hasSize(1);
 
     // Re-install
     register(rules);
-    assertThat(db.ruleDao().getByKey(dbSession, RuleTesting.XOO_X1).getStatus()).isEqualTo(RuleStatus.READY);
-    assertThat(db.activeRuleDao().findByProfileKey(dbSession, QProfileTesting.XOO_P1_KEY)).hasSize(1);
+    assertThat(ruleIndex.getByKey(RuleTesting.XOO_X1).status()).isEqualTo(RuleStatus.READY);
+    assertThat(activeRuleIndex.findByProfile(QProfileTesting.XOO_P1_KEY)).hasSize(1);
+  }
+
+  @Test
+  public void update_active_rules_on_param_changes() throws Exception {
+    register(new Rules() {
+      @Override
+      public void init(RulesDefinition.NewRepository repository) {
+        RulesDefinition.NewRule x1Rule = repository.createRule("x1").setName("x1 name").setHtmlDescription("x1 desc");
+        // has default value
+        x1Rule.createParam("min").setType(RuleParamType.INTEGER).setDefaultValue("5");
+        // no default value
+        x1Rule.createParam("format").setType(RuleParamType.STRING);
+      }
+    });
+
+    // Create profile and activate rule
+    MockUserSession.set().setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN).setLogin("me");
+    db.qualityProfileDao().insert(dbSession, QProfileTesting.newXooP1());
+    dbSession.commit();
+    dbSession.clearCache();
+    RuleActivation activation = new RuleActivation(RuleTesting.XOO_X1);
+    activation.setParameter("format", "txt");
+    TESTER.get(QProfileService.class).activate(QProfileTesting.XOO_P1_KEY, activation);
+
+    // Default value of "min" is changed, "format" is removed, "format2" is added, "max" is added with a default value
+    register(new Rules() {
+      @Override
+      public void init(RulesDefinition.NewRepository repository) {
+        RulesDefinition.NewRule x1Rule = repository.createRule("x1").setName("x1 name").setHtmlDescription("x1 desc");
+        x1Rule.createParam("min").setType(RuleParamType.INTEGER).setDefaultValue("6");
+        x1Rule.createParam("format2").setType(RuleParamType.STRING);
+        x1Rule.createParam("max").setType(RuleParamType.INTEGER).setDefaultValue("10");
+      }
+    });
+
+    ActiveRule activeRule = activeRuleIndex.getByKey(ActiveRuleKey.of(QProfileTesting.XOO_P1_KEY, RuleTesting.XOO_X1));
+    Map<String, String> params = activeRule.params();
+    assertThat(params).hasSize(2);
+
+    // do not change default value on existing active rules -> keep min=5
+    assertThat(params.get("min")).isEqualTo("5");
+
+    // new param with default value
+    assertThat(params.get("max")).isEqualTo("10");
   }
 
   @Test
@@ -358,14 +407,14 @@ public class RegisterRulesMediumTest {
         repository.createRule("x1").setName("x1 name").setHtmlDescription("x1 desc").setTags("tag1");
       }
     });
-    Rule rule = index.getByKey(RuleTesting.XOO_X1);
+    Rule rule = ruleIndex.getByKey(RuleTesting.XOO_X1);
     assertThat(rule.systemTags()).containsOnly("tag1");
     assertThat(rule.tags()).isEmpty();
 
     // User adds tag
     TESTER.get(RuleUpdater.class).update(RuleUpdate.createForPluginRule(RuleTesting.XOO_X1).setTags(newHashSet("tag2")), UserSession.get());
     dbSession.clearCache();
-    rule = index.getByKey(RuleTesting.XOO_X1);
+    rule = ruleIndex.getByKey(RuleTesting.XOO_X1);
     assertThat(rule.systemTags()).containsOnly("tag1");
     assertThat(rule.tags()).containsOnly("tag2");
 
@@ -376,7 +425,7 @@ public class RegisterRulesMediumTest {
         repository.createRule("x1").setName("x1 name").setHtmlDescription("x1 desc").setTags("tag1", "tag2");
       }
     });
-    rule = index.getByKey(RuleTesting.XOO_X1);
+    rule = ruleIndex.getByKey(RuleTesting.XOO_X1);
     assertThat(rule.systemTags()).containsOnly("tag1", "tag2");
     assertThat(rule.tags()).isEmpty();
   }
@@ -415,7 +464,7 @@ public class RegisterRulesMediumTest {
           .setDescription("format parameter");
       }
     });
-    Rule template = index.getByKey(RuleKey.of("xoo", "T1"));
+    Rule template = ruleIndex.getByKey(RuleKey.of("xoo", "T1"));
 
     // Create custom rule
     RuleKey customRuleKey = TESTER.get(RuleCreator.class).create(NewRule.createForCustomRule("CUSTOM_RULE", template.key())
@@ -444,7 +493,7 @@ public class RegisterRulesMediumTest {
     });
 
     // Verify custom rule has been restore from the template
-    Rule customRule = index.getByKey(customRuleKey);
+    Rule customRule = ruleIndex.getByKey(customRuleKey);
     assertThat(customRule.language()).isEqualTo("xoo");
     assertThat(customRule.internalKey()).isEqualTo("new_internal");
     assertThat(customRule.severity()).isEqualTo(Severity.BLOCKER);
@@ -471,7 +520,7 @@ public class RegisterRulesMediumTest {
       }
     };
     register(rules);
-    Rule template = index.getByKey(RuleKey.of("xoo", "T1"));
+    Rule template = ruleIndex.getByKey(RuleKey.of("xoo", "T1"));
 
     // Create custom rule
     RuleKey customRuleKey = TESTER.get(RuleCreator.class).create(NewRule.createForCustomRule("CUSTOM_RULE", template.key())
@@ -481,12 +530,12 @@ public class RegisterRulesMediumTest {
       .setStatus(RuleStatus.READY)
       .setParameters(ImmutableMap.of("format", "txt")));
 
-    Date updatedAt = index.getByKey(customRuleKey).updatedAt();
+    Date updatedAt = ruleIndex.getByKey(customRuleKey).updatedAt();
 
     register(rules);
 
     // Verify custom rule has been restore from the template
-    Rule customRuleReloaded = index.getByKey(customRuleKey);
+    Rule customRuleReloaded = ruleIndex.getByKey(customRuleKey);
     assertThat(customRuleReloaded.updatedAt()).isEqualTo(updatedAt);
   }
 
@@ -506,7 +555,7 @@ public class RegisterRulesMediumTest {
           .setDescription("format parameter");
       }
     });
-    Rule templateRule = index.getByKey(RuleKey.of("xoo", "T1"));
+    Rule templateRule = ruleIndex.getByKey(RuleKey.of("xoo", "T1"));
 
     // Create custom rule
     RuleKey customRuleKey = TESTER.get(RuleCreator.class).create(NewRule.createForCustomRule("CUSTOM_RULE", templateRule.key())
@@ -524,7 +573,7 @@ public class RegisterRulesMediumTest {
           .setHtmlDescription("template1 desc")
           .setSeverity(Severity.MAJOR)
           .setTemplate(true)
-            // "format" removed, "format2" added
+          // "format" removed, "format2" added
           .createParam("format2")
           .setDefaultValue("csv")
           .setType(RuleParamType.STRING)
@@ -533,7 +582,7 @@ public class RegisterRulesMediumTest {
     });
 
     // Verify custom rule param has not been changed!
-    Rule customRuleReloaded = index.getByKey(customRuleKey);
+    Rule customRuleReloaded = ruleIndex.getByKey(customRuleKey);
     assertThat(customRuleReloaded.params().get(0).key()).isEqualTo("format");
   }
 
@@ -554,7 +603,7 @@ public class RegisterRulesMediumTest {
       }
     };
     register(rules);
-    Rule templateRule = index.getByKey(RuleKey.of("xoo", "T1"));
+    Rule templateRule = ruleIndex.getByKey(RuleKey.of("xoo", "T1"));
 
     // Create custom rule
     RuleKey customRuleKey = TESTER.get(RuleCreator.class).create(NewRule.createForCustomRule("CUSTOM_RULE", templateRule.key())
@@ -563,19 +612,19 @@ public class RegisterRulesMediumTest {
       .setSeverity(Severity.MAJOR)
       .setStatus(RuleStatus.READY)
       .setParameters(ImmutableMap.of("format", "txt")));
-    assertThat(index.getByKey(customRuleKey).status()).isEqualTo(RuleStatus.READY);
+    assertThat(ruleIndex.getByKey(customRuleKey).status()).isEqualTo(RuleStatus.READY);
 
     // Restart without template
     register(null);
 
     // Verify custom rule is removed
-    assertThat(index.getByKey(templateRule.key()).status()).isEqualTo(RuleStatus.REMOVED);
-    assertThat(index.getByKey(customRuleKey).status()).isEqualTo(RuleStatus.REMOVED);
+    assertThat(ruleIndex.getByKey(templateRule.key()).status()).isEqualTo(RuleStatus.REMOVED);
+    assertThat(ruleIndex.getByKey(customRuleKey).status()).isEqualTo(RuleStatus.REMOVED);
 
     // Re-install template
     register(rules);
-    assertThat(index.getByKey(templateRule.key()).status()).isEqualTo(RuleStatus.READY);
-    assertThat(index.getByKey(customRuleKey).status()).isEqualTo(RuleStatus.READY);
+    assertThat(ruleIndex.getByKey(templateRule.key()).status()).isEqualTo(RuleStatus.READY);
+    assertThat(ruleIndex.getByKey(customRuleKey).status()).isEqualTo(RuleStatus.READY);
   }
 
   @Test
@@ -586,13 +635,13 @@ public class RegisterRulesMediumTest {
       .setHtmlDescription("Some description"));
     dbSession.commit();
     dbSession.clearCache();
-    assertThat(index.getByKey(manualRuleKey).status()).isEqualTo(RuleStatus.READY);
+    assertThat(ruleIndex.getByKey(manualRuleKey).status()).isEqualTo(RuleStatus.READY);
 
     // Restart
     register(null);
 
     // Verify manual rule is still ready
-    assertThat(index.getByKey(manualRuleKey).status()).isEqualTo(RuleStatus.READY);
+    assertThat(ruleIndex.getByKey(manualRuleKey).status()).isEqualTo(RuleStatus.READY);
   }
 
   interface Rules {
-- 
cgit v1.2.3


From 761002a42c71b6d132e86dbe7e12ecfaca5fd071 Mon Sep 17 00:00:00 2001
From: Stas Vilchik <vilchiks@gmail.com>
Date: Wed, 9 Jul 2014 13:17:09 +0600
Subject: SONAR-5333 Update links style inside markdown text

---
 sonar-server/src/main/hbs/coding-rules/coding-rules-detail.hbs | 4 ++--
 sonar-server/src/main/hbs/issues/issue.hbs                     | 2 +-
 sonar-server/src/main/less/ui.less                             | 5 +++++
 3 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'sonar-server/src/main')

diff --git a/sonar-server/src/main/hbs/coding-rules/coding-rules-detail.hbs b/sonar-server/src/main/hbs/coding-rules/coding-rules-detail.hbs
index f10a2691851..d2ae4a8a2b6 100644
--- a/sonar-server/src/main/hbs/coding-rules/coding-rules-detail.hbs
+++ b/sonar-server/src/main/hbs/coding-rules/coding-rules-detail.hbs
@@ -48,7 +48,7 @@
   {{/if}}
 </ul>
 
-<div class="coding-rules-detail-description rule-desc">{{{htmlDesc}}}</div>
+<div class="coding-rules-detail-description rule-desc markdown">{{{htmlDesc}}}</div>
 
 {{#if templateKey}}
   {{#if canWrite}}
@@ -64,7 +64,7 @@
   <div class="coding-rules-detail-description coding-rules-detail-description-extra">
     <div id="coding-rules-detail-description-extra">
       {{#if htmlNote}}
-        <div class="rule-desc marginbottom10">{{{htmlNote}}}</div>{{/if}}
+        <div class="rule-desc marginbottom10 markdown">{{{htmlNote}}}</div>{{/if}}
       {{#if canWrite}}<div class="button-group">
         <button id="coding-rules-detail-extend-description">{{t 'coding_rules.extend_description'}}</button>
       </div>{{/if}}
diff --git a/sonar-server/src/main/hbs/issues/issue.hbs b/sonar-server/src/main/hbs/issues/issue.hbs
index cbdb2c11765..ac3a80fd69e 100644
--- a/sonar-server/src/main/hbs/issues/issue.hbs
+++ b/sonar-server/src/main/hbs/issues/issue.hbs
@@ -135,7 +135,7 @@
                data-confirm-msg="{{t 'issue.comment.delete_confirm_message'}}">{{t 'delete'}}</a>
           {{/if}}
         </h4>
-        {{{show html htmlText}}}
+        <div class="markdown">{{{show html htmlText}}}</div>
       </div>
     {{/each}}
   </div>
diff --git a/sonar-server/src/main/less/ui.less b/sonar-server/src/main/less/ui.less
index b4e98b5bd54..1b87bae4f2a 100644
--- a/sonar-server/src/main/less/ui.less
+++ b/sonar-server/src/main/less/ui.less
@@ -292,3 +292,8 @@ input[type=button] {
   background-color: @red;
   color: #fff;
 }
+
+
+.markdown {
+  a { .underlined-link; }
+}
-- 
cgit v1.2.3