aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-db/src
diff options
context:
space:
mode:
authorJulien Lancelot <julien.lancelot@sonarsource.com>2016-03-02 14:57:03 +0100
committerJulien Lancelot <julien.lancelot@sonarsource.com>2016-03-02 15:07:51 +0100
commit523a2a4eb9fcfaae27f1cfe4730b2d2845cbf416 (patch)
treed424a9476f19092cc839bd94d6cfa33ce8c34568 /sonar-db/src
parent1c6ef37d8afadfda313288976ae77de4110a02cb (diff)
downloadsonarqube-523a2a4eb9fcfaae27f1cfe4730b2d2845cbf416.tar.gz
sonarqube-523a2a4eb9fcfaae27f1cfe4730b2d2845cbf416.zip
Fix quality flaws
Diffstat (limited to 'sonar-db/src')
-rw-r--r--sonar-db/src/main/java/org/sonar/db/component/ComponentDao.java2
-rw-r--r--sonar-db/src/main/java/org/sonar/db/qualityprofile/ActiveRuleDao.java2
-rw-r--r--sonar-db/src/main/java/org/sonar/db/rule/RuleDao.java2
-rw-r--r--sonar-db/src/main/java/org/sonar/db/version/v451/AddMissingCustomRuleParametersMigrationStep.java2
-rw-r--r--sonar-db/src/main/java/org/sonar/db/version/v51/AddNewCharacteristics.java2
-rw-r--r--sonar-db/src/main/java/org/sonar/db/version/v51/CopyScmAccountsFromAuthorsToUsers.java2
-rw-r--r--sonar-db/src/main/java/org/sonar/db/version/v51/RemovePermissionsOnModulesMigrationStep.java2
-rw-r--r--sonar-db/src/main/java/org/sonar/db/version/v54/RemovePreviewPermission.java2
8 files changed, 8 insertions, 8 deletions
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=?");