SONAR-5056 Set Rule remediation factor and offset as String

1 files changed, 13 insertions, 8 deletions

diff --git a/sonar-server/src/main/java/org/sonar/server/rule/RuleRegistration.java b/sonar-server/src/main/java/org/sonar/server/rule/RuleRegistration.java
index 3356625a869..2ab48037f8e 100644
--- a/sonar-server/src/main/java/org/sonar/server/rule/RuleRegistration.java
+++ b/sonar-server/src/main/java/org/sonar/server/rule/RuleRegistration.java
@@ -225,6 +225,19 @@ public class RuleRegistration implements Startable {
       dto.setStatus(status);
       changed = true;
     }
+    if (!StringUtils.equals(dto.getLanguage(), def.repository().language())) {
+      dto.setLanguage(def.repository().language());
+      changed = true;
+    }
+    changed = mergeDebtRule(def, dto) || changed;
+    if (changed) {
+      dto.setUpdatedAt(buffer.now());
+    }
+    return changed;
+  }
+
+  private boolean mergeDebtRule(RuleDefinitions.Rule def, RuleDto dto){
+    boolean changed = false;
 
     // TODO add characteristic id change verification
 
@@ -246,14 +259,6 @@ public class RuleRegistration implements Startable {
       dto.setEffortToFixL10nKey(def.effortToFixL10nKey());
       changed = true;
     }
-
-    if (!StringUtils.equals(dto.getLanguage(), def.repository().language())) {
-      dto.setLanguage(def.repository().language());
-      changed = true;
-    }
-    if (changed) {
-      dto.setUpdatedAt(buffer.now());
-    }
     return changed;
   }