diff options
18 files changed, 23 insertions, 31 deletions
diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ComponentsFinderSort.java b/server/sonar-server/src/main/java/org/sonar/server/component/ComponentsFinderSort.java index 54a96b3dcf0..66bcd75c00e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/component/ComponentsFinderSort.java +++ b/server/sonar-server/src/main/java/org/sonar/server/component/ComponentsFinderSort.java @@ -21,10 +21,9 @@ package org.sonar.server.component; import com.google.common.base.Function; import com.google.common.collect.Ordering; -import org.sonar.api.component.Component; - import java.util.Collection; import java.util.List; +import org.sonar.api.component.Component; /** * @since 3.7 @@ -48,7 +47,7 @@ class ComponentsFinderSort { return components; } - private ComponentProcessor getComponentProcessor(String sort) { + private static ComponentProcessor getComponentProcessor(String sort) { if (ComponentQuery.SORT_BY_NAME.equals(sort)) { return new NameSort(); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/DefaultComponentFinder.java b/server/sonar-server/src/main/java/org/sonar/server/component/DefaultComponentFinder.java index 00336c24530..1d719d5661a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/component/DefaultComponentFinder.java +++ b/server/sonar-server/src/main/java/org/sonar/server/component/DefaultComponentFinder.java @@ -58,7 +58,7 @@ public class DefaultComponentFinder { } } - private Collection<Component> search(ComponentQuery query, List<? extends Component> allComponents) { + private static Collection<Component> search(ComponentQuery query, List<? extends Component> allComponents) { return newArrayList(Iterables.filter(allComponents, new MatchQuery(query))); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/debt/DebtRulesXMLImporter.java b/server/sonar-server/src/main/java/org/sonar/server/debt/DebtRulesXMLImporter.java index 8525f0c192f..06f34ae159d 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/debt/DebtRulesXMLImporter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/debt/DebtRulesXMLImporter.java @@ -120,7 +120,7 @@ public class DebtRulesXMLImporter { } @CheckForNull - private RuleDebt processRule(ValidationMessages validationMessages, SMInputCursor cursor) throws XMLStreamException { + private static RuleDebt processRule(ValidationMessages validationMessages, SMInputCursor cursor) throws XMLStreamException { String ruleRepositoryKey = cursor.collectDescendantText().trim(); String ruleKey = null; Properties properties = new Properties(); diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java index b341fb60774..69605455bf9 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java @@ -36,7 +36,6 @@ import org.sonar.api.issue.Issue; import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.RuleStatus; import org.sonar.api.rule.Severity; -import org.sonar.api.rules.RuleFinder; import org.sonar.api.rules.RuleType; import org.sonar.api.server.ServerSide; import org.sonar.api.user.User; @@ -77,7 +76,6 @@ public class IssueService { private final IssueStorage issueStorage; private final NotificationManager notificationService; private final ActionPlanService actionPlanService; - private final RuleFinder ruleFinder; private final UserFinder userFinder; private final UserIndex userIndex; private final SourceService sourceService; @@ -89,7 +87,6 @@ public class IssueService { IssueUpdater issueUpdater, NotificationManager notificationService, ActionPlanService actionPlanService, - RuleFinder ruleFinder, UserFinder userFinder, UserIndex userIndex, SourceService sourceService, UserSession userSession) { this.dbClient = dbClient; @@ -98,7 +95,6 @@ public class IssueService { this.issueStorage = issueStorage; this.issueUpdater = issueUpdater; this.actionPlanService = actionPlanService; - this.ruleFinder = ruleFinder; this.notificationService = notificationService; this.userFinder = userFinder; this.userIndex = userIndex; diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterService.java b/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterService.java index 74cff9ae97c..95e6a32e411 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterService.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterService.java @@ -283,7 +283,7 @@ public class IssueFilterService { } @CheckForNull - private IssueFilterDto findFilterWithSameName(List<IssueFilterDto> dtos, String name) { + private static IssueFilterDto findFilterWithSameName(List<IssueFilterDto> dtos, String name) { return Iterables.find(dtos, new IssueFilterDtoMatchName(name), null); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseFormat.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseFormat.java index b2fd487880c..acba54dac13 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseFormat.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseFormat.java @@ -24,7 +24,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.Date; -import java.util.EnumSet; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -65,8 +64,8 @@ public class SearchResponseFormat { this.languages = languages; } - public Issues.SearchWsResponse formatSearch(EnumSet<SearchAdditionalField> fields, SearchResponseData data, - Paging paging, @Nullable Facets facets) { + public Issues.SearchWsResponse formatSearch(Set<SearchAdditionalField> fields, SearchResponseData data, + Paging paging, @Nullable Facets facets) { Issues.SearchWsResponse.Builder response = Issues.SearchWsResponse.newBuilder(); formatPaging(paging, response); @@ -124,7 +123,7 @@ public class SearchResponseFormat { response.setPaging(commonFormat.formatPaging(paging)); } - private List<Issues.Issue> formatIssues(EnumSet<SearchAdditionalField> fields, SearchResponseData data) { + private List<Issues.Issue> formatIssues(Set<SearchAdditionalField> fields, SearchResponseData data) { List<Issues.Issue> result = new ArrayList<>(); Issues.Issue.Builder issueBuilder = Issues.Issue.newBuilder(); for (IssueDto dto : data.getIssues()) { diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionFinder.java b/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionFinder.java index bbe04729bec..00189234ee1 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionFinder.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionFinder.java @@ -99,7 +99,7 @@ public class PermissionFinder { return (pageIndex - 1) * pageSize; } - private List<GroupWithPermissionDto> filterMembership(List<GroupWithPermissionDto> dtos, PermissionQuery query) { + private static List<GroupWithPermissionDto> filterMembership(List<GroupWithPermissionDto> dtos, PermissionQuery query) { return newArrayList(Iterables.filter(dtos, new GroupWithPermissionMatchQuery(query))); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/DeprecatedRulesDefinitionLoader.java b/server/sonar-server/src/main/java/org/sonar/server/rule/DeprecatedRulesDefinitionLoader.java index 3a70ef06371..e1f4369bd96 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/rule/DeprecatedRulesDefinitionLoader.java +++ b/server/sonar-server/src/main/java/org/sonar/server/rule/DeprecatedRulesDefinitionLoader.java @@ -190,7 +190,7 @@ public class DeprecatedRulesDefinitionLoader { } @CheckForNull - private RuleDebt findRequirement(List<RuleDebt> requirements, final String repoKey, final String ruleKey) { + private static RuleDebt findRequirement(List<RuleDebt> requirements, final String repoKey, final String ruleKey) { return Iterables.find(requirements, new RuleDebtMatchRepoKeyAndRuleKey(repoKey, ruleKey), null); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/RuleService.java b/server/sonar-server/src/main/java/org/sonar/server/rule/RuleService.java index 21a5fba93da..9d0c3f43be5 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/rule/RuleService.java +++ b/server/sonar-server/src/main/java/org/sonar/server/rule/RuleService.java @@ -72,7 +72,7 @@ public class RuleService { } public SearchIdResult<RuleKey> search(RuleQuery query, SearchOptions options) { - return index.search(query, options); + return index.search(query, options); } public RuleKey create(NewRule newRule) { diff --git a/sonar-db/src/main/java/org/sonar/db/component/ComponentDao.java b/sonar-db/src/main/java/org/sonar/db/component/ComponentDao.java index 6792b7b474b..77345bdfafa 100644 --- a/sonar-db/src/main/java/org/sonar/db/component/ComponentDao.java +++ b/sonar-db/src/main/java/org/sonar/db/component/ComponentDao.java @@ -318,7 +318,7 @@ public class ComponentDao implements Dao { mapper(session).delete(componentId); } - private ComponentMapper mapper(DbSession session) { + private static ComponentMapper mapper(DbSession session) { return session.getMapper(ComponentMapper.class); } diff --git a/sonar-db/src/main/java/org/sonar/db/qualityprofile/ActiveRuleDao.java b/sonar-db/src/main/java/org/sonar/db/qualityprofile/ActiveRuleDao.java index dd668ed118b..843ff2faee3 100644 --- a/sonar-db/src/main/java/org/sonar/db/qualityprofile/ActiveRuleDao.java +++ b/sonar-db/src/main/java/org/sonar/db/qualityprofile/ActiveRuleDao.java @@ -181,7 +181,7 @@ public class ActiveRuleDao implements Dao { } } - private ActiveRuleMapper mapper(DbSession session) { + private static ActiveRuleMapper mapper(DbSession session) { return session.getMapper(ActiveRuleMapper.class); } diff --git a/sonar-db/src/main/java/org/sonar/db/rule/RuleDao.java b/sonar-db/src/main/java/org/sonar/db/rule/RuleDao.java index 9eb3e3893dd..91b289f64a7 100644 --- a/sonar-db/src/main/java/org/sonar/db/rule/RuleDao.java +++ b/sonar-db/src/main/java/org/sonar/db/rule/RuleDao.java @@ -97,7 +97,7 @@ public class RuleDao implements Dao { mapper(session).update(dto); } - private RuleMapper mapper(DbSession session) { + private static RuleMapper mapper(DbSession session) { return session.getMapper(RuleMapper.class); } diff --git a/sonar-db/src/main/java/org/sonar/db/version/v451/AddMissingCustomRuleParametersMigrationStep.java b/sonar-db/src/main/java/org/sonar/db/version/v451/AddMissingCustomRuleParametersMigrationStep.java index 6f89e924d96..2bcc748f605 100644 --- a/sonar-db/src/main/java/org/sonar/db/version/v451/AddMissingCustomRuleParametersMigrationStep.java +++ b/sonar-db/src/main/java/org/sonar/db/version/v451/AddMissingCustomRuleParametersMigrationStep.java @@ -124,7 +124,7 @@ public class AddMissingCustomRuleParametersMigrationStep implements MigrationSte } } - private boolean hasParameter(String parameter, Collection<RuleParameter> customRuleParams) { + private static boolean hasParameter(String parameter, Collection<RuleParameter> customRuleParams) { return Iterables.any(customRuleParams, new MatchParameter(parameter)); } diff --git a/sonar-db/src/main/java/org/sonar/db/version/v51/AddNewCharacteristics.java b/sonar-db/src/main/java/org/sonar/db/version/v51/AddNewCharacteristics.java index c806bdc50c2..934bcf146c4 100644 --- a/sonar-db/src/main/java/org/sonar/db/version/v51/AddNewCharacteristics.java +++ b/sonar-db/src/main/java/org/sonar/db/version/v51/AddNewCharacteristics.java @@ -136,7 +136,7 @@ public class AddNewCharacteristics extends BaseDataChange { createSubCharacteristic(characteristicsContext, USABILITY_KEY + COMPLIANCE_KEY_SUFFIX, "Usability " + COMPLIANCE_NAME, usabilityKey); } - private void createSubCharacteristic(CharacteristicsContext characteristicsContext, + private static void createSubCharacteristic(CharacteristicsContext characteristicsContext, String subCharacteristicKey, String subCharacteristicName, String parentKey) throws SQLException { Characteristic parent = characteristicsContext.findCharacteristicByKey(parentKey); if (parent != null) { diff --git a/sonar-db/src/main/java/org/sonar/db/version/v51/CopyScmAccountsFromAuthorsToUsers.java b/sonar-db/src/main/java/org/sonar/db/version/v51/CopyScmAccountsFromAuthorsToUsers.java index c133b2d426c..ddbed3a3f58 100644 --- a/sonar-db/src/main/java/org/sonar/db/version/v51/CopyScmAccountsFromAuthorsToUsers.java +++ b/sonar-db/src/main/java/org/sonar/db/version/v51/CopyScmAccountsFromAuthorsToUsers.java @@ -95,7 +95,7 @@ public class CopyScmAccountsFromAuthorsToUsers extends BaseDataChange { } } - private List<User> selectUsersFromLoginOrEmail(Context context, Collection<String> authors) throws SQLException { + private static List<User> selectUsersFromLoginOrEmail(Context context, Collection<String> authors) throws SQLException { final List<User> users = newArrayList(); StringBuilder sql = new StringBuilder("SELECT u.id, u.login, u.email, u.scm_accounts FROM users u WHERE u.active=? AND ("); for (int i = 0; i < authors.size(); i++) { diff --git a/sonar-db/src/main/java/org/sonar/db/version/v51/RemovePermissionsOnModulesMigrationStep.java b/sonar-db/src/main/java/org/sonar/db/version/v51/RemovePermissionsOnModulesMigrationStep.java index f680cb9003e..522b9fac1c4 100644 --- a/sonar-db/src/main/java/org/sonar/db/version/v51/RemovePermissionsOnModulesMigrationStep.java +++ b/sonar-db/src/main/java/org/sonar/db/version/v51/RemovePermissionsOnModulesMigrationStep.java @@ -46,7 +46,7 @@ public class RemovePermissionsOnModulesMigrationStep extends BaseDataChange { removeUserRolePermissions(context, "group_roles", "group roles"); } - private void removeUserRolePermissions(Context context, String tableName, String pluralName) throws SQLException { + private static void removeUserRolePermissions(Context context, String tableName, String pluralName) throws SQLException { MassUpdate massUpdate = context.prepareMassUpdate(); massUpdate.select("SELECT r.id " + "FROM " + tableName + " r " + diff --git a/sonar-db/src/main/java/org/sonar/db/version/v54/RemovePreviewPermission.java b/sonar-db/src/main/java/org/sonar/db/version/v54/RemovePreviewPermission.java index 3b0c600867a..e702f9c3dd6 100644 --- a/sonar-db/src/main/java/org/sonar/db/version/v54/RemovePreviewPermission.java +++ b/sonar-db/src/main/java/org/sonar/db/version/v54/RemovePreviewPermission.java @@ -41,7 +41,7 @@ public class RemovePreviewPermission extends BaseDataChange { execute(context, "user_roles", "users"); } - private void execute(Context context, String tableName, String displayName) throws SQLException { + private static void execute(Context context, String tableName, String displayName) throws SQLException { MassUpdate update = context.prepareMassUpdate().rowPluralName(displayName); update.select("SELECT r.id FROM " + tableName + " r WHERE r.role=?").setString(1, "dryRunScan"); update.update("DELETE FROM " + tableName + " WHERE id=?"); diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/RulesDefinitionAnnotationLoader.java b/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/RulesDefinitionAnnotationLoader.java index 39998a1e81b..13058659411 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/RulesDefinitionAnnotationLoader.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/RulesDefinitionAnnotationLoader.java @@ -23,6 +23,9 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Function; import com.google.common.base.Functions; import com.google.common.collect.ImmutableMap; +import java.lang.reflect.Field; +import java.util.List; +import javax.annotation.CheckForNull; import org.apache.commons.lang.StringUtils; import org.sonar.api.rule.RuleStatus; import org.sonar.api.utils.AnnotationUtils; @@ -31,11 +34,6 @@ import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; import org.sonar.check.Cardinality; -import javax.annotation.CheckForNull; - -import java.lang.reflect.Field; -import java.util.List; - /** * Read definitions of rules based on the annotations provided by sonar-check-api. It is used * to feed {@link RulesDefinition}. @@ -96,7 +94,7 @@ public class RulesDefinitionAnnotationLoader { return rule; } - private void loadParameters(RulesDefinition.NewRule rule, Field field) { + private static void loadParameters(RulesDefinition.NewRule rule, Field field) { org.sonar.check.RuleProperty propertyAnnotation = field.getAnnotation(org.sonar.check.RuleProperty.class); if (propertyAnnotation != null) { String fieldKey = StringUtils.defaultIfEmpty(propertyAnnotation.key(), field.getName()); |