From 702cb2dc5f5f8939089ca432231667e90a5620a4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Mon, 13 Mar 2017 15:54:30 +0100 Subject: [PATCH] SONAR-6315 remote RuleActivator#activate override used only in tests --- .../server/qualityprofile/RuleActivator.java | 7 +------ .../RuleActivatorContextFactory.java | 8 -------- .../QProfileBackuperMediumTest.java | 16 +++++++++++----- .../sonar/server/rule/RuleUpdaterMediumTest.java | 7 ++++++- 4 files changed, 18 insertions(+), 20 deletions(-) diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivator.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivator.java index d4751fb20f3..ea8795c052f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivator.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivator.java @@ -82,12 +82,7 @@ public class RuleActivator { return doActivate(dbSession, activation, context); } - public List activate(DbSession dbSession, RuleActivation activation, QProfileName profileName) { - RuleActivatorContext context = contextFactory.create(profileName, activation.getRuleKey(), dbSession); - return doActivate(dbSession, activation, context); - } - - List activate(DbSession dbSession, RuleActivation activation, QualityProfileDto profileDto) { + public List activate(DbSession dbSession, RuleActivation activation, QualityProfileDto profileDto) { RuleActivatorContext context = contextFactory.create(profileDto, activation.getRuleKey(), dbSession); return doActivate(dbSession, activation, context); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivatorContextFactory.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivatorContextFactory.java index 282dde9bef4..26eb457277b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivatorContextFactory.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivatorContextFactory.java @@ -50,14 +50,6 @@ public class RuleActivatorContextFactory { return create(ruleKey, session, context); } - RuleActivatorContext create(QProfileName profileName, RuleKey ruleKey, DbSession session) { - RuleActivatorContext context = new RuleActivatorContext(); - QualityProfileDto profile = db.qualityProfileDao().selectByNameAndLanguage(profileName.getName(), profileName.getLanguage(), session); - checkRequest(profile != null, "Quality profile not found: %s", profileName); - context.setProfile(profile); - return create(ruleKey, session, context); - } - RuleActivatorContext create(QualityProfileDto profile, RuleKey ruleKey, DbSession session) { return create(ruleKey, session, new RuleActivatorContext().setProfile(profile)); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileBackuperMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileBackuperMediumTest.java index 27e75f132ff..095c32d537c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileBackuperMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileBackuperMediumTest.java @@ -127,9 +127,10 @@ public class QProfileBackuperMediumTest { RuleActivation activation3 = new RuleActivation(blahRuleKey); activation2.setSeverity(Severity.BLOCKER); activation2.setParameter("max", "7"); - tester.get(RuleActivator.class).activate(dbSession, activation1, XOO_P1_NAME); - tester.get(RuleActivator.class).activate(dbSession, activation2, XOO_P1_NAME); - tester.get(RuleActivator.class).activate(dbSession, activation3, XOO_P1_NAME); + QualityProfileDto profileDto = get(XOO_P1_NAME); + tester.get(RuleActivator.class).activate(dbSession, activation1, profileDto); + tester.get(RuleActivator.class).activate(dbSession, activation2, profileDto); + tester.get(RuleActivator.class).activate(dbSession, activation3, profileDto); dbSession.commit(); dbSession.clearCache(); activeRuleIndexer.index(); @@ -175,11 +176,12 @@ public class QProfileBackuperMediumTest { RuleActivation activation = new RuleActivation(XOO_X1); activation.setSeverity(Severity.INFO); activation.setParameter("max", "10"); - tester.get(RuleActivator.class).activate(dbSession, activation, XOO_P1_NAME); + QualityProfileDto profileDto = get(XOO_P1_NAME); + tester.get(RuleActivator.class).activate(dbSession, activation, profileDto); activation = new RuleActivation(XOO_X2); activation.setSeverity(Severity.INFO); - tester.get(RuleActivator.class).activate(dbSession, activation, XOO_P1_NAME); + tester.get(RuleActivator.class).activate(dbSession, activation, profileDto); dbSession.commit(); dbSession.clearCache(); activeRuleIndexer.index(); @@ -388,4 +390,8 @@ public class QProfileBackuperMediumTest { assertThat(profiles).hasSize(1); assertThat(profiles.get(0).getName()).isEqualTo("P1"); } + + private QualityProfileDto get(QProfileName profileName) { + return db.qualityProfileDao().selectByNameAndLanguage(profileName.getName(), profileName.getLanguage(), dbSession); + } } diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/RuleUpdaterMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/RuleUpdaterMediumTest.java index 9163089e19a..80fd201ff9f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/RuleUpdaterMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/RuleUpdaterMediumTest.java @@ -48,6 +48,7 @@ import org.sonar.db.rule.RuleDto; import org.sonar.db.rule.RuleParamDto; import org.sonar.db.rule.RuleTesting; import org.sonar.server.es.SearchOptions; +import org.sonar.server.qualityprofile.QProfileName; import org.sonar.server.qualityprofile.QProfileTesting; import org.sonar.server.qualityprofile.RuleActivation; import org.sonar.server.qualityprofile.RuleActivator; @@ -441,7 +442,7 @@ public class RuleUpdaterMediumTest { // Activate the custom rule RuleActivation activation = new RuleActivation(customRule.getKey()).setSeverity(Severity.BLOCKER); - tester.get(RuleActivator.class).activate(dbSession, activation, QProfileTesting.XOO_P1_NAME); + tester.get(RuleActivator.class).activate(dbSession, activation, get(QProfileTesting.XOO_P1_NAME)); dbSession.commit(); dbSession.clearCache(); @@ -580,6 +581,10 @@ public class RuleUpdaterMediumTest { } } + private QualityProfileDto get(QProfileName profileName) { + return db.qualityProfileDao().selectByNameAndLanguage(profileName.getName(), profileName.getLanguage(), dbSession); + } + private static Map paramsByKey(List params) { return FluentIterable.from(params).uniqueIndex(RuleParamToKey.INSTANCE); } -- 2.39.5