From b49e3ab7fda9d8a18f984a30b19b5382042f6436 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Wed, 22 Mar 2017 08:58:43 +0100 Subject: [PATCH] SONAR-8867 add organizationUuid parameter to RuleDao#selectByQuery --- .../src/main/java/org/sonar/db/rule/RuleDao.java | 2 +- .../src/test/java/org/sonar/db/rule/RuleDaoTest.java | 11 ++++++----- .../java/org/sonar/server/rule/DefaultRuleFinder.java | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleDao.java b/server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleDao.java index 6a829d8af42..3aa63aff07d 100644 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleDao.java +++ b/server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleDao.java @@ -94,7 +94,7 @@ public class RuleDao implements Dao { return mapper(session).selectAllDefinitions(); } - public List selectByQuery(DbSession session, RuleQuery ruleQuery) { + public List selectByQuery(DbSession session, String organizationUuid, RuleQuery ruleQuery) { return mapper(session).selectByQuery(ruleQuery); } diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleDaoTest.java index e39cf8bdd4b..38a85c7bddd 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleDaoTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleDaoTest.java @@ -220,11 +220,12 @@ public class RuleDaoTest { public void select_by_query() { dbTester.prepareDbUnit(getClass(), "shared.xml"); - assertThat(underTest.selectByQuery(dbTester.getSession(), RuleQuery.create())).hasSize(2); - assertThat(underTest.selectByQuery(dbTester.getSession(), RuleQuery.create().withKey("S001"))).hasSize(1); - assertThat(underTest.selectByQuery(dbTester.getSession(), RuleQuery.create().withConfigKey("S1"))).hasSize(1); - assertThat(underTest.selectByQuery(dbTester.getSession(), RuleQuery.create().withRepositoryKey("java"))).hasSize(2); - assertThat(underTest.selectByQuery(dbTester.getSession(), + String organizationUuid = "org-1"; + assertThat(underTest.selectByQuery(dbTester.getSession(), organizationUuid, RuleQuery.create())).hasSize(2); + assertThat(underTest.selectByQuery(dbTester.getSession(), organizationUuid, RuleQuery.create().withKey("S001"))).hasSize(1); + assertThat(underTest.selectByQuery(dbTester.getSession(), organizationUuid, RuleQuery.create().withConfigKey("S1"))).hasSize(1); + assertThat(underTest.selectByQuery(dbTester.getSession(), organizationUuid, RuleQuery.create().withRepositoryKey("java"))).hasSize(2); + assertThat(underTest.selectByQuery(dbTester.getSession(), organizationUuid, RuleQuery.create().withKey("S001").withConfigKey("S1").withRepositoryKey("java"))).hasSize(1); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/DefaultRuleFinder.java b/server/sonar-server/src/main/java/org/sonar/server/rule/DefaultRuleFinder.java index e8ae6c6c71e..b3263640f13 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/rule/DefaultRuleFinder.java +++ b/server/sonar-server/src/main/java/org/sonar/server/rule/DefaultRuleFinder.java @@ -117,7 +117,7 @@ public class DefaultRuleFinder implements RuleFinder { @Override public final org.sonar.api.rules.Rule find(org.sonar.api.rules.RuleQuery query) { try (DbSession dbSession = dbClient.openSession(false)) { - List rules = ruleDao.selectByQuery(dbSession, query); + List rules = ruleDao.selectByQuery(dbSession, defaultOrganizationProvider.get().getUuid(), query); if (!rules.isEmpty()) { RuleDto rule = rules.get(0); return toRule(rule, ruleDao.selectRuleParamsByRuleKey(dbSession, rule.getKey())); @@ -129,7 +129,7 @@ public class DefaultRuleFinder implements RuleFinder { @Override public final Collection findAll(org.sonar.api.rules.RuleQuery query) { try (DbSession dbSession = dbClient.openSession(false)) { - List rules = ruleDao.selectByQuery(dbSession, query); + List rules = ruleDao.selectByQuery(dbSession, defaultOrganizationProvider.get().getUuid(), query); if (rules.isEmpty()) { return Collections.emptyList(); } -- 2.39.5