From 661cb58054b03a3372da6d428b2027c0309062d5 Mon Sep 17 00:00:00 2001
From: Stephane Gamard <stephane.gamard@searchbox.com>
Date: Wed, 4 Jun 2014 13:41:25 +0200
Subject: [PATCH] SONAR-5007 - Switched to native scripts for ListUpdate (fixed
 routing)

---
 .../sonar/core/qualityprofile/db/ActiveRuleParamDto.java   | 7 +++++++
 .../server/qualityprofile/index/ActiveRuleNormalizer.java  | 3 ++-
 .../server/qualityprofile/ActiveRuleBackendMediumTest.java | 3 ++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/ActiveRuleParamDto.java b/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/ActiveRuleParamDto.java
index 401f1600b50..70bc208b4f4 100644
--- a/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/ActiveRuleParamDto.java
+++ b/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/ActiveRuleParamDto.java
@@ -21,6 +21,8 @@
 package org.sonar.core.qualityprofile.db;
 
 import com.google.common.base.Preconditions;
+import org.apache.commons.lang.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
 import org.sonar.core.rule.RuleParamDto;
 
 import java.util.Collection;
@@ -81,6 +83,11 @@ public class ActiveRuleParamDto {
     return this;
   }
 
+  @Override
+  public String toString() {
+    return new ReflectionToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE).toString();
+  }
+
   public static ActiveRuleParamDto createFor(RuleParamDto param) {
     Preconditions.checkArgument(param.getId() != null, "Parameter is not persisted");
     return new ActiveRuleParamDto()
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 21e38b22500..b333278d14f 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
@@ -129,7 +129,7 @@ public class ActiveRuleNormalizer extends BaseNormalizer<ActiveRuleDto, ActiveRu
 
     DbSession session = db.openSession(false);
     try {
-      //TODO because DTO uses legacy ID pattern
+      //TODO because DTO uses legacy ID patter
       QualityProfileDto profile = db.qualityProfileDao()
         .selectById(activeRuleDto.getProfileId());
       newRule.put(ActiveRuleField.PROFILE_KEY.field(), profile.getKey().toString());
@@ -167,6 +167,7 @@ public class ActiveRuleNormalizer extends BaseNormalizer<ActiveRuleDto, ActiveRu
     newParam.put(ActiveRuleParamField.VALUE.field(), param.getValue());
 
     return ImmutableList.of(new UpdateRequest()
+        .routing(key.ruleKey().toString())
         .id(key.toString())
         .script(ListUpdate.NAME)
         .addScriptParam(ListUpdate.FIELD, ActiveRuleField.PARAMS.field())
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 85a235038ba..b9c2803a53b 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
@@ -115,7 +115,7 @@ public class ActiveRuleBackendMediumTest {
   }
 
   @Test
-  public void insert_and_index_active_rule_param() {
+  public void insert_and_index_active_rule_param() throws InterruptedException {
     // insert and index
     QualityProfileDto profileDto = QualityProfileDto.createFor("myprofile", "java");
     db.qualityProfileDao().insert(dbSession, profileDto);
@@ -155,6 +155,7 @@ public class ActiveRuleBackendMediumTest {
 
     // verify es
     ActiveRule rule = index.getByKey(activeRule.getKey());
+    assertThat(rule).isNotNull();
     assertThat(rule.params()).hasSize(2);
     assertThat(rule.params().keySet()).containsOnly("min", "max");
     assertThat(rule.params().values()).containsOnly("minimum", "maximum");
-- 
2.39.5