summaryrefslogtreecommitdiffstats
path: root/sonar-db
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@sonarsource.com>2017-02-10 01:03:24 +0100
committerSimon Brandhof <simon.brandhof@sonarsource.com>2017-02-10 23:32:48 +0100
commit4872092c687a2f5e9d91db44c2fc8ca6dcdc2081 (patch)
tree350da42caa9a40536fa97bbf5576684fe24929bb /sonar-db
parent20d28db2bd1b67d9d7f09ce19766318ef44d7fb5 (diff)
downloadsonarqube-4872092c687a2f5e9d91db44c2fc8ca6dcdc2081.tar.gz
sonarqube-4872092c687a2f5e9d91db44c2fc8ca6dcdc2081.zip
SONAR-8761 clean-up UserPermissionDao
Diffstat (limited to 'sonar-db')
-rw-r--r--sonar-db/src/main/java/org/sonar/db/permission/UserPermissionDao.java7
-rw-r--r--sonar-db/src/main/java/org/sonar/db/permission/UserPermissionMapper.java2
-rw-r--r--sonar-db/src/main/resources/org/sonar/db/permission/UserPermissionMapper.xml6
-rw-r--r--sonar-db/src/test/java/org/sonar/db/permission/UserPermissionDaoTest.java13
4 files changed, 2 insertions, 26 deletions
diff --git a/sonar-db/src/main/java/org/sonar/db/permission/UserPermissionDao.java b/sonar-db/src/main/java/org/sonar/db/permission/UserPermissionDao.java
index 65ca4a89b5d..765a7ee03f2 100644
--- a/sonar-db/src/main/java/org/sonar/db/permission/UserPermissionDao.java
+++ b/sonar-db/src/main/java/org/sonar/db/permission/UserPermissionDao.java
@@ -83,13 +83,6 @@ public class UserPermissionDao implements Dao {
}
/**
- * @return {@code true} if the project has at least one user permission defined, else returns {@code false}
- */
- public boolean hasRootComponentPermissions(DbSession dbSession, long rootComponentId) {
- return mapper(dbSession).countRowsByRootComponentId(rootComponentId) > 0;
- }
-
- /**
* Gets all the global permissions granted to user for the specified organization.
*
* @return the global permissions. An empty list is returned if user or organization do not exist.
diff --git a/sonar-db/src/main/java/org/sonar/db/permission/UserPermissionMapper.java b/sonar-db/src/main/java/org/sonar/db/permission/UserPermissionMapper.java
index 7a693b5899c..2a6c7b32e07 100644
--- a/sonar-db/src/main/java/org/sonar/db/permission/UserPermissionMapper.java
+++ b/sonar-db/src/main/java/org/sonar/db/permission/UserPermissionMapper.java
@@ -48,8 +48,6 @@ public interface UserPermissionMapper {
void insert(UserPermissionDto dto);
- int countRowsByRootComponentId(@Param("rootComponentId") long projectId);
-
void deleteGlobalPermission(@Param("userId") long userId, @Param("permission") String permission,
@Param("organizationUuid") String organizationUuid);
diff --git a/sonar-db/src/main/resources/org/sonar/db/permission/UserPermissionMapper.xml b/sonar-db/src/main/resources/org/sonar/db/permission/UserPermissionMapper.xml
index cfb0ea572b1..699ed00d86e 100644
--- a/sonar-db/src/main/resources/org/sonar/db/permission/UserPermissionMapper.xml
+++ b/sonar-db/src/main/resources/org/sonar/db/permission/UserPermissionMapper.xml
@@ -80,12 +80,6 @@
group by ur.resource_id, ur.role
</select>
- <select id="countRowsByRootComponentId" parameterType="long" resultType="int">
- select count(1)
- from user_roles
- where resource_id=#{rootComponentId,jdbcType=BIGINT}
- </select>
-
<insert id="insert" parameterType="org.sonar.db.permission.UserPermissionDto" useGeneratedKeys="false">
insert into user_roles (
organization_uuid,
diff --git a/sonar-db/src/test/java/org/sonar/db/permission/UserPermissionDaoTest.java b/sonar-db/src/test/java/org/sonar/db/permission/UserPermissionDaoTest.java
index 837500eb7d7..528cd03b971 100644
--- a/sonar-db/src/test/java/org/sonar/db/permission/UserPermissionDaoTest.java
+++ b/sonar-db/src/test/java/org/sonar/db/permission/UserPermissionDaoTest.java
@@ -320,15 +320,6 @@ public class UserPermissionDaoTest {
}
@Test
- public void projectHasPermissions() {
- addGlobalPermission(organizationDto, SYSTEM_ADMIN, user1);
- addProjectPermission(organizationDto, USER, user1, project1);
-
- assertThat(underTest.hasRootComponentPermissions(dbSession, project1.getId())).isTrue();
- assertThat(underTest.hasRootComponentPermissions(dbSession, project2.getId())).isFalse();
- }
-
- @Test
public void selectGlobalPermissionsOfUser() {
OrganizationDto org = dbTester.organizations().insert();
addGlobalPermission(dbTester.getDefaultOrganization(), "perm1", user1);
@@ -405,8 +396,8 @@ public class UserPermissionDaoTest {
private void verifyOrganizationUuidsInTable(String... organizationUuids) {
assertThat(dbTester.select("select organization_uuid as \"organizationUuid\" from user_roles"))
- .extracting((row) -> (String) row.get("organizationUuid"))
- .containsOnly(organizationUuids);
+ .extracting((row) -> (String) row.get("organizationUuid"))
+ .containsOnly(organizationUuids);
}
private void expectCount(List<Long> projectIds, CountPerProjectPermission... expected) {