Fix Quality flaws

diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionUpdater.java b/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionUpdater.java
index a6d92e1cd7c151f228dbcca8e923629e21804e8b..5c10a26fead4f26ecebe756f92c795b147c78c30 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionUpdater.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionUpdater.java
@@ -191,10 +191,8 @@ public class PermissionUpdater {
   private ComponentDto getComponent(DbSession session, @Nullable String componentKey) {
     if (componentKey == null) {
       return null;
-    } else {
-      ComponentDto component = componentFinder.getByKey(session, componentKey);
-      return component;
     }
+    return componentFinder.getByKey(session, componentKey);
   }
 
   private static Object badRequestIfNullResult(@Nullable Object component, String objectType, String objectKey) {

diff --git a/sonar-db/src/main/java/org/sonar/db/permission/CountByProjectAndPermissionDto.java b/sonar-db/src/main/java/org/sonar/db/permission/CountByProjectAndPermissionDto.java
index b366d9dfb851690ac333a0d84698541f19fe1ed0..8f98728ac328bb4a2cc082225a903ee99ae2f3d5 100644 (file)
--- a/sonar-db/src/main/java/org/sonar/db/permission/CountByProjectAndPermissionDto.java
+++ b/sonar-db/src/main/java/org/sonar/db/permission/CountByProjectAndPermissionDto.java
@@ -19,8 +19,6 @@
  */
 package org.sonar.db.permission;
 
-import com.google.common.annotations.VisibleForTesting;
-
 public class CountByProjectAndPermissionDto {
   private long componentId;
   private String permission;
@@ -30,13 +28,6 @@ public class CountByProjectAndPermissionDto {
     // used by MyBatis
   }
 
-  @VisibleForTesting
-  public CountByProjectAndPermissionDto(long componentId, String permission, int count) {
-    this.componentId = componentId;
-    this.permission = permission;
-    this.count = count;
-  }
-
   public long getComponentId() {
     return componentId;
   }

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 9a873d899593e70a3b369d21462068d03ab765e8..ac0978cc74538d6a3f688d92a9406fec7660e84c 100644 (file)
--- a/sonar-db/src/main/java/org/sonar/db/permission/UserPermissionDao.java
+++ b/sonar-db/src/main/java/org/sonar/db/permission/UserPermissionDao.java
@@ -57,7 +57,7 @@ public class UserPermissionDao implements Dao {
    */
   public List<String> selectLogins(DbSession dbSession, PermissionQuery query) {
     return select(dbSession, query, null).stream()
-      .map(p -> p.getUserLogin())
+      .map(ExtendedUserPermissionDto::getUserLogin)
       .distinct()
       .collect(Collectors.toList());
   }
@@ -73,7 +73,7 @@ public class UserPermissionDao implements Dao {
       .setComponentUuid(projectUuid)
       .build();
     return select(dbSession, query, asList(userLogin)).stream()
-      .map(p -> p.getPermission())
+      .map(ExtendedUserPermissionDto::getPermission)
       .collect(Collectors.toSet());
   }
 

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 e43b6c64fdbb81087fd0dbad4537b6945b0d3a30..c7773bd4684c3c4e403c41bf25be077dffeed15b 100644 (file)
--- a/sonar-db/src/main/java/org/sonar/db/permission/UserPermissionMapper.java
+++ b/sonar-db/src/main/java/org/sonar/db/permission/UserPermissionMapper.java
@@ -32,7 +32,7 @@ public interface UserPermissionMapper {
    *
    * @param query non-null query including optional filters.
    * @param userLogins if null, then filter on all active users. If not null, then filter on logins, including disabled users.
-   *                   Must not be empty. If not null then maximum size is 1'000.
+   *                   Must not be empty. If not null then maximum size is {@link org.sonar.db.DatabaseUtils#PARTITION_SIZE_FOR_ORACLE}.
    */
   List<ExtendedUserPermissionDto> selectByQuery(@Param("query") PermissionQuery query, @Nullable @Param("userLogins") Collection<String> userLogins, RowBounds rowBounds);
 

diff --git a/sonar-db/src/main/java/org/sonar/db/user/RoleDao.java b/sonar-db/src/main/java/org/sonar/db/user/RoleDao.java
index aede227c655f5429fd8365325e5b4ca2e3c366d5..ff41c4d6867e5fe12cee45c6f6145bf8cd0178d8 100644 (file)
--- a/sonar-db/src/main/java/org/sonar/db/user/RoleDao.java
+++ b/sonar-db/src/main/java/org/sonar/db/user/RoleDao.java
@@ -48,11 +48,11 @@ public class RoleDao implements Dao {
     mapper(session).deleteGroupRolesByResourceId(projectId);
   }
 
-  private int countResourceGroupRoles(DbSession session, Long resourceId) {
+  private static int countResourceGroupRoles(DbSession session, Long resourceId) {
     return mapper(session).countResourceGroupRoles(resourceId);
   }
 
-  private int countResourceUserRoles(DbSession session, Long resourceId) {
+  private static int countResourceUserRoles(DbSession session, Long resourceId) {
     return mapper(session).countResourceUserRoles(resourceId);
   }
 

diff --git a/sonar-db/src/test/java/org/sonar/db/permission/template/PermissionTemplateDaoTest.java b/sonar-db/src/test/java/org/sonar/db/permission/template/PermissionTemplateDaoTest.java
index d834fa4e6d1ed0eb3cc2ca23b041e9e61eeb5b4f..b65ad38ef85a2ae43bbe6cad0befd1200b82d75a 100644 (file)
--- a/sonar-db/src/test/java/org/sonar/db/permission/template/PermissionTemplateDaoTest.java
+++ b/sonar-db/src/test/java/org/sonar/db/permission/template/PermissionTemplateDaoTest.java
@@ -141,11 +141,11 @@ public class PermissionTemplateDaoTest {
   public void should_update_permission_template() {
     db.prepareDbUnit(getClass(), "updatePermissionTemplate.xml");
 
-    PermissionTemplateDto dto = new PermissionTemplateDto();
-    dto.setId(1L);
-    dto.setName("new_name");
-    dto.setDescription("new_description");
-    dto.setKeyPattern("new_regexp");
+    PermissionTemplateDto dto = new PermissionTemplateDto()
+      .setId(1L)
+      .setName("new_name")
+      .setDescription("new_description")
+      .setKeyPattern("new_regexp");
     underTest.update(dbSession, dto);
 
     db.assertDbUnitTable(getClass(), "updatePermissionTemplate-result.xml", "permission_templates", "id", "name", "kee", "description");