SONAR-8092 use the same kind of log message for all startup-indexers

diff --git a/server/sonar-server/src/main/java/org/sonar/server/es/IndexerStartupTask.java b/server/sonar-server/src/main/java/org/sonar/server/es/IndexerStartupTask.java
index 328df9d0ce6561dd9726cf7986d2b85f7e9146d4..1dd9ef3d467b72c53d9f82e1ecc8dd98b053eaa4 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/es/IndexerStartupTask.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/es/IndexerStartupTask.java
@@ -20,11 +20,15 @@
 package org.sonar.server.es;
 
 import org.sonar.api.config.Settings;
+import org.sonar.api.utils.log.Logger;
+import org.sonar.api.utils.log.Loggers;
 
 import static java.util.Arrays.stream;
 
 public class IndexerStartupTask {
 
+  private static final Logger LOG = Loggers.get(IndexerStartupTask.class);
+
   private final EsClient esClient;
   private final Settings settings;
   private final StartupIndexer[] indexers;
@@ -39,6 +43,7 @@ public class IndexerStartupTask {
     if (indexesAreEnabled()) {
       stream(indexers)
         .filter(this::doesIndexContainAtLeastOneEmptyType)
+        .peek(indexer -> LOG.info("Full reindexing using " + indexer.getClass().getSimpleName()))
         .forEach(StartupIndexer::indexOnStartup);
     }
   }

diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndexer.java b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndexer.java
index 578e3ae95d77737ad993babc24cb5856f663b92d..fb45fef02a55376d7c60822e3dcba26d95169b53 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndexer.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndexer.java
@@ -29,8 +29,6 @@ import org.elasticsearch.action.index.IndexRequest;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.sonar.api.resources.Qualifiers;
 import org.sonar.api.utils.System2;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.server.es.BaseIndexer;
@@ -51,7 +49,6 @@ import static org.sonar.server.issue.index.IssueIndexDefinition.INDEX_TYPE_ISSUE
 
 public class IssueIndexer extends BaseIndexer implements ProjectIndexer, NeedAuthorizationIndexer, StartupIndexer {
 
-  private static final Logger LOG = Loggers.get(IssueIndexer.class);
   private static final String DELETE_ERROR_MESSAGE = "Fail to delete some issues of project [%s]";
   private static final int MAX_BATCH_SIZE = 1000;
   private static final AuthorizationScope AUTHORIZATION_SCOPE = new AuthorizationScope(INDEX_TYPE_ISSUE, project -> Qualifiers.PROJECT.equals(project.getQualifier()));
@@ -80,7 +77,6 @@ public class IssueIndexer extends BaseIndexer implements ProjectIndexer, NeedAut
 
   @Override
   public void indexOnStartup() {
-    LOG.info("Index issues");
     index();
   }
 

diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/index/ProjectMeasuresIndexer.java b/server/sonar-server/src/main/java/org/sonar/server/measure/index/ProjectMeasuresIndexer.java
index cc2458b187e2751253e19bd937c4cca2b9635afd..c3e065072d7bc04750f2fd562fca5beb7ab05b69 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/index/ProjectMeasuresIndexer.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/measure/index/ProjectMeasuresIndexer.java
@@ -27,8 +27,6 @@ import javax.annotation.Nullable;
 import org.elasticsearch.action.index.IndexRequest;
 import org.sonar.api.resources.Qualifiers;
 import org.sonar.api.utils.System2;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.db.measure.ProjectMeasuresIndexerIterator;
@@ -47,7 +45,6 @@ import static org.sonar.server.measure.index.ProjectMeasuresIndexDefinition.INDE
 
 public class ProjectMeasuresIndexer extends BaseIndexer implements ProjectIndexer, NeedAuthorizationIndexer, StartupIndexer {
 
-  private static final Logger LOG = Loggers.get(ProjectMeasuresIndexer.class);
   private static final AuthorizationScope AUTHORIZATION_SCOPE = new AuthorizationScope(INDEX_TYPE_PROJECT_MEASURES, project -> Qualifiers.PROJECT.equals(project.getQualifier()));
 
   private final DbClient dbClient;
@@ -64,7 +61,6 @@ public class ProjectMeasuresIndexer extends BaseIndexer implements ProjectIndexe
 
   @Override
   public void indexOnStartup() {
-    LOG.info("Index project measures");
     index();
   }
 

diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/index/PermissionIndexer.java b/server/sonar-server/src/main/java/org/sonar/server/permission/index/PermissionIndexer.java
index f8e77e0b85e71c6f9f4c48a75c2d563842813203..a5496da3ab6f3decb2dd0a767c4f5adbde008703 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/index/PermissionIndexer.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/permission/index/PermissionIndexer.java
@@ -37,8 +37,6 @@ import org.elasticsearch.action.index.IndexRequest;
 import org.elasticsearch.action.search.SearchResponse;
 import org.picocontainer.Startable;
 import org.sonar.api.utils.DateUtils;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
 import org.sonar.core.util.stream.Collectors;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
@@ -63,7 +61,6 @@ public class PermissionIndexer implements ProjectIndexer, Startable {
   @VisibleForTesting
   static final int MAX_BATCH_SIZE = 1000;
 
-  private static final Logger LOG = Loggers.get(PermissionIndexer.class);
   private static final String BULK_ERROR_MESSAGE = "Fail to index authorization";
 
   private final ThreadPoolExecutor executor;

diff --git a/server/sonar-server/src/main/java/org/sonar/server/test/index/TestIndexer.java b/server/sonar-server/src/main/java/org/sonar/server/test/index/TestIndexer.java
index 85fcdb883c48e2bf7704f86af2459df65e4b9f21..5dbf2207eee26bae391eb54d0f460f23b7458bec 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/test/index/TestIndexer.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/test/index/TestIndexer.java
@@ -26,8 +26,6 @@ import javax.annotation.Nullable;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.sonar.api.utils.System2;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.server.es.BaseIndexer;
@@ -48,7 +46,6 @@ import static org.sonar.server.test.index.TestIndexDefinition.INDEX_TYPE_TEST;
  */
 public class TestIndexer extends BaseIndexer implements ProjectIndexer, StartupIndexer {
 
-  private static final Logger LOG = Loggers.get(TestIndexer.class);
   private final DbClient dbClient;
 
   public TestIndexer(System2 system2, DbClient dbClient, EsClient esClient) {
@@ -81,7 +78,6 @@ public class TestIndexer extends BaseIndexer implements ProjectIndexer, StartupI
 
   @Override
   public void indexOnStartup() {
-    LOG.info("Index tests");
     index();
   }
 

diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/index/UserIndexer.java b/server/sonar-server/src/main/java/org/sonar/server/user/index/UserIndexer.java
index 1a7e3ffbe1daa16094f66c1f6bdd41048b108f49..d915e83570982f51bb06c00e0a5fc54763fd1c8a 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/user/index/UserIndexer.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/user/index/UserIndexer.java
@@ -24,8 +24,6 @@ import java.util.Iterator;
 import java.util.Set;
 import org.elasticsearch.action.index.IndexRequest;
 import org.sonar.api.utils.System2;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.server.es.BaseIndexer;
@@ -38,8 +36,6 @@ import static org.sonar.server.user.index.UserIndexDefinition.INDEX_TYPE_USER;
 
 public class UserIndexer extends BaseIndexer implements StartupIndexer {
 
-  private static final Logger LOG = Loggers.get(UserIndexer.class);
-
   private final DbClient dbClient;
 
   public UserIndexer(System2 system2, DbClient dbClient, EsClient esClient) {
@@ -54,7 +50,6 @@ public class UserIndexer extends BaseIndexer implements StartupIndexer {
 
   @Override
   public void indexOnStartup() {
-    LOG.info("Index users");
     index();
   }
 

diff --git a/server/sonar-server/src/main/java/org/sonar/server/view/index/ViewIndexer.java b/server/sonar-server/src/main/java/org/sonar/server/view/index/ViewIndexer.java
index f6d0863024975344214783cbc6d887c87f496fae..bb62e3a00e8ce37326a5e48e8468b12e4e9d3b6f 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/view/index/ViewIndexer.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/view/index/ViewIndexer.java
@@ -25,8 +25,6 @@ import java.util.Map;
 import java.util.Set;
 import org.elasticsearch.action.index.IndexRequest;
 import org.sonar.api.utils.System2;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.db.component.ComponentDto;
@@ -42,8 +40,6 @@ import static org.sonar.server.view.index.ViewIndexDefinition.INDEX_TYPE_VIEW;
 
 public class ViewIndexer extends BaseIndexer implements StartupIndexer {
 
-  private static final Logger LOG = Loggers.get(ViewIndexer.class);
-
   private final DbClient dbClient;
 
   public ViewIndexer(System2 system2, DbClient dbClient, EsClient esClient) {
@@ -58,7 +54,6 @@ public class ViewIndexer extends BaseIndexer implements StartupIndexer {
 
   @Override
   public void indexOnStartup() {
-    LOG.info("Index views");
     index();
   }
 

diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/index/PermissionIndexerTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/index/PermissionIndexerTest.java
index 98002b098d5dc0e7c22149248e1b204cfd402ce3..0860d20ed4c87df4b4dfbc68866803c4c9a81c15 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/index/PermissionIndexerTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/permission/index/PermissionIndexerTest.java
@@ -33,6 +33,7 @@ import org.sonar.db.user.GroupDto;
 import org.sonar.db.user.UserDbTester;
 import org.sonar.db.user.UserDto;
 import org.sonar.server.es.EsTester;
+import org.sonar.server.es.IndexTypeId;
 import org.sonar.server.es.ProjectIndexer;
 import org.sonar.server.tester.UserSessionRule;
 
@@ -43,6 +44,8 @@ import static org.sonar.server.permission.index.FooIndexDefinition.FOO_INDEX;
 
 public class PermissionIndexerTest {
 
+  private static final IndexTypeId INDEX_TYPE_FOO_AUTH = AuthorizationTypeSupport.getAuthorizationIndexType(FooIndexDefinition.INDEX_TYPE_FOO);
+
   @Rule
   public ExpectedException expectedException = ExpectedException.none();
 
@@ -202,10 +205,10 @@ public class PermissionIndexerTest {
     userDbTester.insertProjectPermissionOnAnyone(USER, project1);
     userDbTester.insertProjectPermissionOnAnyone(USER, project2);
     underTest.indexAllIfEmpty();
-    assertThat(esTester.countDocuments(FooIndexDefinition.FOO_INDEX, AuthorizationTypeSupport.TYPE_AUTHORIZATION)).isEqualTo(2);
+    assertThat(esTester.countDocuments(INDEX_TYPE_FOO_AUTH)).isEqualTo(2);
 
     underTest.deleteProject(project1.uuid());
-    assertThat(esTester.countDocuments(FooIndexDefinition.FOO_INDEX, AuthorizationTypeSupport.TYPE_AUTHORIZATION)).isEqualTo(1);
+    assertThat(esTester.countDocuments(INDEX_TYPE_FOO_AUTH)).isEqualTo(1);
   }
 
   @Test
@@ -217,7 +220,7 @@ public class PermissionIndexerTest {
     underTest.indexProject(project.uuid(), ProjectIndexer.Cause.PROJECT_CREATION);
     underTest.indexProject(project.uuid(), ProjectIndexer.Cause.PROJECT_KEY_UPDATE);
 
-    assertThat(esTester.countDocuments(FooIndexDefinition.FOO_INDEX, AuthorizationTypeSupport.TYPE_AUTHORIZATION)).isEqualTo(0);
+    assertThat(esTester.countDocuments(INDEX_TYPE_FOO_AUTH)).isEqualTo(0);
   }
 
   @Test