From 4fbb837ee88f00b6a736926879219e8b6511c795 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Wed, 5 Nov 2014 16:22:48 +0100 Subject: [PATCH] Fix merge with branch 4.5 --- ...dMissingCustomRuleParametersMigration.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v451/AddMissingCustomRuleParametersMigration.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v451/AddMissingCustomRuleParametersMigration.java index 7c0e5da8d47..c58f3f6ae47 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v451/AddMissingCustomRuleParametersMigration.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v451/AddMissingCustomRuleParametersMigration.java @@ -56,7 +56,6 @@ public class AddMissingCustomRuleParametersMigration implements DatabaseMigratio private final AtomicLong counter = new AtomicLong(0L); private final MassUpdate.ProgressTask progressTask = new MassUpdate.ProgressTask(counter); - public AddMissingCustomRuleParametersMigration(DbClient db, System2 system) { this.db = db; this.system = system; @@ -110,19 +109,19 @@ public class AddMissingCustomRuleParametersMigration implements DatabaseMigratio } private void insertCustomRuleParameterIfNotAlreadyExisting(RuleParameter templateRuleParam, Integer templateRuleId, - Multimap customRuleIdsByTemplateRuleId, - Multimap customRuleParamsByRuleId, - DbSession session) { + Multimap customRuleIdsByTemplateRuleId, + Multimap customRuleParamsByRuleId, + DbSession session) { for (Integer customRuleId : customRuleIdsByTemplateRuleId.get(templateRuleId)) { if (!hasParameter(templateRuleParam.getName(), customRuleParamsByRuleId.get(customRuleId))) { // Insert new custom rule parameter session.getMapper(Migration45Mapper.class).insertRuleParameter(new RuleParameter() - .setRuleId(customRuleId) - .setRuleTemplateId(templateRuleId) - .setName(templateRuleParam.getName()) - .setDescription(templateRuleParam.getDescription()) - .setType(templateRuleParam.getType()) - ); + .setRuleId(customRuleId) + .setRuleTemplateId(templateRuleId) + .setName(templateRuleParam.getName()) + .setDescription(templateRuleParam.getDescription()) + .setType(templateRuleParam.getType()) + ); // Update updated at date of custom rule in order to allow E/S indexation session.getMapper(Migration45Mapper.class).updateRuleUpdateAt(customRuleId, new Date(system.now())); -- 2.39.5