Fix quality flaws

diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterJsonWriter.java b/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterJsonWriter.java
index b4f3bac141e4571459b94446cd30ae59d342f2f2..18a95ace3c2f09c32c313539a2a3c41f13b792e0 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterJsonWriter.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterJsonWriter.java
@@ -48,7 +48,7 @@ public class IssueFilterJsonWriter {
       .endObject();
   }
 
-  private boolean canModifyFilter(UserSession userSession, IssueFilterDto filter) {
+  private static boolean canModifyFilter(UserSession userSession, IssueFilterDto filter) {
     return userSession.isLoggedIn() &&
       (StringUtils.equals(filter.getUserLogin(), userSession.getLogin()) || userSession.hasGlobalPermission(GlobalPermissions.SYSTEM_ADMIN));
   }

diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionService.java b/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionService.java
index 12d74097cd81a040cefaa06648082d8af3a7a856..46f9326d24cf413e4155755efb25edf4ce8119f6 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionService.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionService.java
@@ -234,7 +234,7 @@ public class PermissionService {
     return true;
   }
 
-  private void checkNotAnyoneAndAdmin(String permission, String group) {
+  private static void checkNotAnyoneAndAdmin(String permission, String group) {
     if (GlobalPermissions.SYSTEM_ADMIN.equals(permission)
       && DefaultGroups.isAnyone(group)) {
       throw new BadRequestException(String.format("It is not possible to add the '%s' permission to the '%s' group.", permission, group));

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 f74c2280268b6176e03bd89c5d0c215c00915120..345cf2d138f1c16ab9135cb28f17f9f47ab5ae0e 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
@@ -123,7 +123,7 @@ public class PermissionUpdater {
     return true;
   }
 
-  private void checkNotAnyoneAndAdmin(String permission, String group) {
+  private static void checkNotAnyoneAndAdmin(String permission, String group) {
     if (GlobalPermissions.SYSTEM_ADMIN.equals(permission)
       && DefaultGroups.isAnyone(group)) {
       throw new BadRequestException(String.format("It is not possible to add the '%s' permission to the '%s' group.", permission, group));

diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionRequest.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionRequest.java
index 96f3661ea20bf480bf1ecfe2ff319b281bde47fe..f1361902303a99447c8e3aa992cf1bddd8012cb2 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionRequest.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionRequest.java
@@ -54,17 +54,17 @@ public class PermissionRequest {
   private final String query;
 
   private PermissionRequest(Builder builder) {
-    permission = builder._permission;
-    userLogin = builder._userLogin;
-    groupId = builder._groupId;
-    groupName = builder._groupName;
-    projectUuid = builder._projectUuid;
-    projectKey = builder._projectKey;
-    hasProject = builder._hasProject;
-    page = builder._page;
-    pageSize = builder._pageSize;
-    selected = builder._selected;
-    query = builder._query;
+    permission = builder.permission;
+    userLogin = builder.userLogin;
+    groupId = builder.groupId;
+    groupName = builder.groupName;
+    projectUuid = builder.projectUuid;
+    projectKey = builder.projectKey;
+    hasProject = builder.hasProject;
+    page = builder.page;
+    pageSize = builder.pageSize;
+    selected = builder.selected;
+    query = builder.query;
   }
 
   public static class Builder {
@@ -75,25 +75,25 @@ public class PermissionRequest {
     private boolean withGroup;
     private boolean withPagination;
 
-    private String _permission;
-    private String _userLogin;
+    private String permission;
+    private String userLogin;
 
-    private Long _groupId;
-    private String _groupName;
-    private String _projectUuid;
-    private String _projectKey;
-    private boolean _hasProject;
-    private Integer _page;
-    private Integer _pageSize;
-    private String _selected;
-    private String _query;
+    private Long groupId;
+    private String groupName;
+    private String projectUuid;
+    private String projectKey;
+    private boolean hasProject;
+    private Integer page;
+    private Integer pageSize;
+    private String selected;
+    private String query;
 
     public Builder(Request request) {
       this.request = request;
     }
 
     public PermissionRequest build() {
-      _permission = request.mandatoryParam(PARAM_PERMISSION);
+      permission = request.mandatoryParam(PARAM_PERMISSION);
       setUserLogin(request);
       setGroup(request);
       setProject(request);
@@ -122,65 +122,65 @@ public class PermissionRequest {
 
     private void setQuery(Request request) {
       if (request.hasParam(TEXT_QUERY)) {
-        _query = request.param(TEXT_QUERY);
-        if (_query != null) {
-          _selected = SelectionMode.ALL.value();
+        query = request.param(TEXT_QUERY);
+        if (query != null) {
+          selected = SelectionMode.ALL.value();
         }
       }
     }
 
     private void setSelected(Request request) {
       if (request.hasParam(SELECTED)) {
-        _selected = request.mandatoryParam(SELECTED);
+        selected = request.mandatoryParam(SELECTED);
       }
     }
 
     private void setPaging(Request request) {
       if (withPagination) {
-        _page = request.mandatoryParamAsInt(PAGE);
-        _pageSize = request.mandatoryParamAsInt(PAGE_SIZE);
+        page = request.mandatoryParamAsInt(PAGE);
+        pageSize = request.mandatoryParamAsInt(PAGE_SIZE);
       }
     }
 
     private void setUserLogin(Request request) {
       if (withUser) {
-        _userLogin = request.mandatoryParam(PARAM_USER_LOGIN);
+        userLogin = request.mandatoryParam(PARAM_USER_LOGIN);
       }
     }
 
     private void setGroup(Request request) {
       if (withGroup) {
-        Long groupId = request.paramAsLong(PARAM_GROUP_ID);
-        String groupName = request.param(PARAM_GROUP_NAME);
-        checkRequest(groupId != null ^ groupName != null, "Group name or group id must be provided, not both.");
-        _groupId = groupId;
-        _groupName = groupName;
+        Long groupIdParam = request.paramAsLong(PARAM_GROUP_ID);
+        String groupNameParam = request.param(PARAM_GROUP_NAME);
+        checkRequest(groupIdParam != null ^ groupNameParam != null, "Group name or group id must be provided, not both.");
+        this.groupId = groupIdParam;
+        this.groupName = groupNameParam;
       }
     }
 
     private void setProject(Request request) {
       if (request.hasParam(PARAM_PROJECT_UUID) || request.hasParam(PARAM_PROJECT_KEY)) {
-        String projectUuid = request.param(PARAM_PROJECT_UUID);
-        String projectKey = request.param(PARAM_PROJECT_KEY);
-
-        if (projectUuid != null || projectKey != null) {
-          checkRequest(projectUuid != null ^ projectKey != null, "Project id or project key can be provided, not both.");
-          _projectUuid = projectUuid;
-          _projectKey = projectKey;
-          _hasProject = true;
+        String projectUuidParam = request.param(PARAM_PROJECT_UUID);
+        String projectKeyParam = request.param(PARAM_PROJECT_KEY);
+
+        if (projectUuidParam != null || projectKeyParam != null) {
+          checkRequest(projectUuidParam != null ^ projectKeyParam != null, "Project id or project key can be provided, not both.");
+          this.projectUuid = projectUuidParam;
+          this.projectKey = projectKeyParam;
+          hasProject = true;
         }
       }
     }
 
     private void checkPermissionParameter() {
-      if (_hasProject) {
-        if (!ComponentPermissions.ALL.contains(_permission)) {
+      if (hasProject) {
+        if (!ComponentPermissions.ALL.contains(permission)) {
           throw new BadRequestException(String.format("The '%s' parameter for project permissions must be one of %s. '%s' was passed.", PARAM_PERMISSION,
-            PROJECT_PERMISSIONS_ONE_LINE, _permission));
+            PROJECT_PERMISSIONS_ONE_LINE, permission));
         }
-      } else if (!GlobalPermissions.ALL.contains(_permission)) {
+      } else if (!GlobalPermissions.ALL.contains(permission)) {
         throw new BadRequestException(String.format("The '%s' parameter for global permissions must be one of %s. '%s' was passed.", PARAM_PERMISSION, GLOBAL_PERMISSIONS_ONE_LINE,
-          _permission
+          permission
           ));
       }
     }

diff --git a/sonar-db/src/main/java/org/sonar/db/permission/PermissionTemplateDao.java b/sonar-db/src/main/java/org/sonar/db/permission/PermissionTemplateDao.java
index e94b748435331a677d91638df70c0d485401f709..8a23ed1562fca0475b1d80c555d2588a5a6b9ff5 100644 (file)
--- a/sonar-db/src/main/java/org/sonar/db/permission/PermissionTemplateDao.java
+++ b/sonar-db/src/main/java/org/sonar/db/permission/PermissionTemplateDao.java
@@ -108,7 +108,7 @@ public class PermissionTemplateDao implements Dao {
     return mapper(session).countGroups(parameters);
   }
 
-  private Map<String, Object> groupsParamaters(PermissionQuery query, Long templateId) {
+  private static Map<String, Object> groupsParamaters(PermissionQuery query, Long templateId) {
     Map<String, Object> params = newHashMap();
     params.put(QUERY_PARAMETER, query);
     params.put(TEMPLATE_ID_PARAMETER, templateId);