fix quality flaws

diff --git a/server/sonar-process/src/test/java/org/sonar/process/DefaultProcessCommandsTest.java b/server/sonar-process/src/test/java/org/sonar/process/DefaultProcessCommandsTest.java
index 80d510be988c8760f8cbc067a5b2bfebc42af10d..42679895aad1001eba2ca893e6b412e4e9a5cf6f 100644 (file)
--- a/server/sonar-process/src/test/java/org/sonar/process/DefaultProcessCommandsTest.java
+++ b/server/sonar-process/src/test/java/org/sonar/process/DefaultProcessCommandsTest.java
@@ -20,6 +20,7 @@
 package org.sonar.process;
 
 import java.io.File;
+import java.io.IOException;
 import org.apache.commons.io.FileUtils;
 import org.junit.Rule;
 import org.junit.Test;
@@ -63,6 +64,25 @@ public class DefaultProcessCommandsTest {
     assertThat(commands.isUp()).isTrue();
   }
 
+  @Test
+  public void reset_clears_only_the_memory_space_of_specified_process_number() throws IOException {
+    File dir = temp.newFolder();
+
+    AllProcessesCommands commands = new AllProcessesCommands(dir);
+    for (int i = 0; i < MAX_PROCESSES; i++) {
+      commands.setOperational(i);
+      commands.setUp(i);
+    }
+
+    int resetProcess = 3;
+    DefaultProcessCommands.reset(dir, resetProcess);
+    for (int i = 0; i < MAX_PROCESSES; i++) {
+      assertThat(commands.isOperational(i)).isEqualTo(i != resetProcess);
+      assertThat(commands.isUp(i)).isEqualTo(i != resetProcess);
+    }
+    commands.close();
+  }
+
   @Test
   public void ask_for_stop() throws Exception {
     File dir = temp.newFolder();

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/FormulaExecutorComponentVisitor.java b/server/sonar-server/src/main/java/org/sonar/server/computation/formula/FormulaExecutorComponentVisitor.java
index 64cba218e264013c7241c2b8c1822b3c814c0119..75273d9636c676b941b0da0d32a4ec8e8649199f 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/FormulaExecutorComponentVisitor.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/formula/FormulaExecutorComponentVisitor.java
@@ -182,7 +182,7 @@ public class FormulaExecutorComponentVisitor extends PathAwareVisitorAdapter<For
     }
   }
 
-  private void aggregateToParent(Path<FormulaExecutorComponentVisitor.Counters> path, Formula formula, Counter currentCounter) {
+  private static void aggregateToParent(Path<FormulaExecutorComponentVisitor.Counters> path, Formula formula, Counter currentCounter) {
     if (!path.isRoot()) {
       path.parent().aggregate(formula, currentCounter);
     }

diff --git a/sonar-db/src/main/java/org/sonar/db/user/AuthorDao.java b/sonar-db/src/main/java/org/sonar/db/user/AuthorDao.java
index 47cd93d5134495c7de5a239947ad658ecde1ce87..20b1e383267e246a52391f236ef2e7b9b5670383 100644 (file)
--- a/sonar-db/src/main/java/org/sonar/db/user/AuthorDao.java
+++ b/sonar-db/src/main/java/org/sonar/db/user/AuthorDao.java
@@ -61,7 +61,7 @@ public class AuthorDao implements Dao {
     });
   }
 
-  private AuthorMapper getMapper(SqlSession session) {
+  private static AuthorMapper getMapper(SqlSession session) {
     return session.getMapper(AuthorMapper.class);
   }
 }

diff --git a/sonar-db/src/main/java/org/sonar/db/version/v54/InsertGateAdminPermissionForEachProfileAdmin.java b/sonar-db/src/main/java/org/sonar/db/version/v54/InsertGateAdminPermissionForEachProfileAdmin.java
index e905fc58aa49b54940dff5c4676e96f68d22e6f2..533d041a8342ff1998e9b121c11241d312ac71a6 100644 (file)
--- a/sonar-db/src/main/java/org/sonar/db/version/v54/InsertGateAdminPermissionForEachProfileAdmin.java
+++ b/sonar-db/src/main/java/org/sonar/db/version/v54/InsertGateAdminPermissionForEachProfileAdmin.java
@@ -44,7 +44,7 @@ public class InsertGateAdminPermissionForEachProfileAdmin extends BaseDataChange
     updateUsers(context);
   }
 
-  private void updateGroupAnyOne(Context context) throws SQLException {
+  private static void updateGroupAnyOne(Context context) throws SQLException {
     MassUpdate update = context.prepareMassUpdate().rowPluralName("Group AnyOne");
     update.select("select gr1.id from group_roles gr1 " +
       "where gr1.role = 'profileadmin' " +
@@ -63,7 +63,7 @@ public class InsertGateAdminPermissionForEachProfileAdmin extends BaseDataChange
     update.execute(GroupAnyOneHandler.INSTANCE);
   }
 
-  private void updateOtherGroups(Context context) throws SQLException {
+  private static void updateOtherGroups(Context context) throws SQLException {
     MassUpdate update = context.prepareMassUpdate().rowPluralName("Other groups");
     update.select("select gr1.group_id from group_roles gr1 " +
       "where gr1.role = 'profileadmin' " +
@@ -82,7 +82,7 @@ public class InsertGateAdminPermissionForEachProfileAdmin extends BaseDataChange
     update.execute(OtherGroupsHandler.INSTANCE);
   }
 
-  private void updateUsers(Context context) throws SQLException {
+  private static void updateUsers(Context context) throws SQLException {
     MassUpdate update = context.prepareMassUpdate().rowPluralName("Users");
     update.select("select ur1.user_id from user_roles ur1 " +
       "where ur1.role = 'profileadmin' " +