SONAR-6315 remote RuleActivator#activate override used only in tests

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 d4751fb20f38b93cdb37281f4f7c1a00647a96fc..ea8795c052fab6f0f8a6c8bf67bfea9ac1154f4d 100644 (file)
--- 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<ActiveRuleChange> activate(DbSession dbSession, RuleActivation activation, QProfileName profileName) {
-    RuleActivatorContext context = contextFactory.create(profileName, activation.getRuleKey(), dbSession);
-    return doActivate(dbSession, activation, context);
-  }
-
-  List<ActiveRuleChange> activate(DbSession dbSession, RuleActivation activation, QualityProfileDto profileDto) {
+  public List<ActiveRuleChange> 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 282dde9bef40dee756e73efb5d3f9eb9d5b5765f..26eb457277bccbe6b69ad82712c88d7e4a99c2a7 100644 (file)
--- 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 27e75f132ff64e1071a3f123efa36a0bc33d981f..095c32d537cac5e9d59e1065118bc49fc7bde88b 100644 (file)
--- 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 9163089e19a53b43c46ceac9767216ce4923fabe..80fd201ff9f3c1b25af548de1d3a19789784699f 100644 (file)
--- 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<String, RuleParamDto> paramsByKey(List<RuleParamDto> params) {
     return FluentIterable.from(params).uniqueIndex(RuleParamToKey.INSTANCE);
   }