From aa685bd63b7364ce350168ef7e7b027afc0928bd Mon Sep 17 00:00:00 2001 From: David Cho-Lerat Date: Tue, 30 Jan 2024 10:40:43 +0100 Subject: [PATCH] SONAR-20479 Replace "[re-]indexation" with "[re-]indexing" in user-facing messages and code comments --- .../step/LoadChangedIssuesStep.java | 2 +- .../taskprocessor/IgnoreOrphanBranchStep.java | 2 +- .../step/LoadChangedIssuesStepTest.java | 2 +- .../java/org/sonar/ce/queue/InternalCeQueue.java | 2 +- .../sonar/ce/queue/NextPendingTaskPicker.java | 4 ++-- .../sonar/server/issue/index/IssueIndexerIT.java | 4 ++-- .../main/java/org/sonar/server/es/Indexers.java | 16 ++++++++-------- .../java/org/sonar/server/es/IndexersImpl.java | 12 ++++++------ .../org/sonar/server/es/IndexingListener.java | 2 +- .../org/sonar/server/es/ResilientIndexer.java | 4 ++-- .../es/FailOnErrorIndexingListenerTest.java | 2 +- .../permission/index/PermissionIndexerTest.java | 2 +- .../issues/__tests__/IssuesApp-Filtering-it.tsx | 2 +- .../issue/index/AsyncIssueIndexingImpl.java | 14 +++++++++----- .../issue/index/AsyncIssueIndexingImplTest.java | 14 +++++++------- .../server/ce/ws/IndexationStatusAction.java | 2 +- .../server/developers/ws/SearchEventsAction.java | 2 +- .../org/sonar/server/hotspot/ws/ListAction.java | 2 +- .../sonar/server/hotspot/ws/SearchAction.java | 2 +- .../org/sonar/server/issue/ws/AuthorsAction.java | 2 +- .../server/issue/ws/ComponentTagsAction.java | 2 +- .../org/sonar/server/issue/ws/ListAction.java | 2 +- .../org/sonar/server/issue/ws/SearchAction.java | 2 +- .../resources/org/sonar/l10n/core.properties | 4 ++-- .../scan/filesystem/ProjectFileIndexer.java | 2 +- 25 files changed, 55 insertions(+), 51 deletions(-) diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/LoadChangedIssuesStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/LoadChangedIssuesStep.java index 483688ab950..6f29551fa4f 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/LoadChangedIssuesStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/LoadChangedIssuesStep.java @@ -64,7 +64,7 @@ public class LoadChangedIssuesStep implements ComputationStep { @Override public String getDescription() { - return "Load changed issues for indexation"; + return "Load changed issues for indexing"; } } diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/taskprocessor/IgnoreOrphanBranchStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/taskprocessor/IgnoreOrphanBranchStep.java index 1d0bd823866..e26714685f7 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/taskprocessor/IgnoreOrphanBranchStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/taskprocessor/IgnoreOrphanBranchStep.java @@ -48,7 +48,7 @@ public final class IgnoreOrphanBranchStep implements ComputationStep { Optional componentDto = dbClient.componentDao().selectByUuid(dbSession, componentUuid); Optional entityDto = dbClient.entityDao().selectByUuid(dbSession, entityUuid); if (componentDto.isEmpty() || entityDto.isEmpty()) { - LOG.info("reindexation task has been trigger on an orphan branch. removing any exclude_from_purge flag, and skip the indexation"); + LOG.info("reindexing task has been trigger on an orphan branch. removing any exclude_from_purge flag, and skip the indexing"); dbClient.branchDao().updateExcludeFromPurge(dbSession, componentUuid, false); dbClient.branchDao().updateNeedIssueSync(dbSession, componentUuid, false); dbSession.commit(); diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/LoadChangedIssuesStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/LoadChangedIssuesStepTest.java index ae7d40a51ac..543daadfa2e 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/LoadChangedIssuesStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/LoadChangedIssuesStepTest.java @@ -64,7 +64,7 @@ public class LoadChangedIssuesStepTest { @Test public void getDescription_shouldReturnDescription() { - assertThat(underTest.getDescription()).isEqualTo("Load changed issues for indexation"); + assertThat(underTest.getDescription()).isEqualTo("Load changed issues for indexing"); } @Test diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/queue/InternalCeQueue.java b/server/sonar-ce/src/main/java/org/sonar/ce/queue/InternalCeQueue.java index 7339226b741..38d0b528d35 100644 --- a/server/sonar-ce/src/main/java/org/sonar/ce/queue/InternalCeQueue.java +++ b/server/sonar-ce/src/main/java/org/sonar/ce/queue/InternalCeQueue.java @@ -40,7 +40,7 @@ public interface InternalCeQueue extends CeQueue { * The task status is changed to {@link org.sonar.db.ce.CeQueueDto.Status#IN_PROGRESS}. * Does not return anything if workers are paused or being paused (see {@link #getWorkersPauseStatus()}. * - * @param excludeIndexationJob change the underlying request to exclude indexation tasks. + * @param excludeIndexationJob change the underlying request to exclude indexing tasks. * *

Only a single task can be peeked by project.

* diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/queue/NextPendingTaskPicker.java b/server/sonar-ce/src/main/java/org/sonar/ce/queue/NextPendingTaskPicker.java index c358013d451..0ac8ba87107 100644 --- a/server/sonar-ce/src/main/java/org/sonar/ce/queue/NextPendingTaskPicker.java +++ b/server/sonar-ce/src/main/java/org/sonar/ce/queue/NextPendingTaskPicker.java @@ -54,8 +54,8 @@ public class NextPendingTaskPicker { } Optional findPendingTask(String workerUuid, DbSession dbSession, boolean prioritizeAnalysisAndRefresh) { - // try to find tasks including indexation job & excluding app/portfolio and if no match, try the opposite - // when prioritizeAnalysisAndRefresh is false, search first excluding indexation jobs and including app/portfolio, then the opposite + // try to find tasks including indexing job & excluding app/portfolio and if no match, try the opposite + // when prioritizeAnalysisAndRefresh is false, search first excluding indexing jobs and including app/portfolio, then the opposite Optional eligibleForPeek = ceQueueDao.selectEligibleForPeek(dbSession, prioritizeAnalysisAndRefresh, !prioritizeAnalysisAndRefresh); Optional eligibleForPeekInParallel = eligibleForPeekInParallel(dbSession); diff --git a/server/sonar-server-common/src/it/java/org/sonar/server/issue/index/IssueIndexerIT.java b/server/sonar-server-common/src/it/java/org/sonar/server/issue/index/IssueIndexerIT.java index 55fbab36527..da7fa07acc7 100644 --- a/server/sonar-server-common/src/it/java/org/sonar/server/issue/index/IssueIndexerIT.java +++ b/server/sonar-server-common/src/it/java/org/sonar/server/issue/index/IssueIndexerIT.java @@ -230,7 +230,7 @@ public class IssueIndexerIT { String projectUuid = issue.getProjectUuid(); assertThatThrownBy(() -> underTest.indexOnAnalysis(projectUuid)) .isInstanceOf(IllegalStateException.class) - .hasMessage("Unrecoverable indexation failures: 1 errors among 1 requests. Check Elasticsearch logs for further details."); + .hasMessage("Unrecoverable indexing failures: 1 errors among 1 requests. Check Elasticsearch logs for further details."); assertThatIndexHasSize(0); assertThatEsQueueTableHasSize(0); es.unlockWrites(TYPE_ISSUE); @@ -478,7 +478,7 @@ public class IssueIndexerIT { List issues = List.of("Issue1"); assertThatThrownBy(() -> underTest.deleteByKeys("P1", issues)) .isInstanceOf(IllegalStateException.class) - .hasMessage("Unrecoverable indexation failures: 1 errors among 1 requests. Check Elasticsearch logs for further details."); + .hasMessage("Unrecoverable indexing failures: 1 errors among 1 requests. Check Elasticsearch logs for further details."); assertThatIndexHasOnly("Issue1"); assertThatEsQueueTableHasSize(0); es.unlockWrites(TYPE_ISSUE); diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/es/Indexers.java b/server/sonar-server-common/src/main/java/org/sonar/server/es/Indexers.java index 917c6bdd519..01f3c260c54 100644 --- a/server/sonar-server-common/src/main/java/org/sonar/server/es/Indexers.java +++ b/server/sonar-server-common/src/main/java/org/sonar/server/es/Indexers.java @@ -42,22 +42,22 @@ public interface Indexers { } /** - * Re-index data based on the event. It commits the DB session once any indexation request was written in the same session, - * ensuring consistency between the DB and the indexes. Therefore, DB data changes that cause the indexation event should + * Re-index data based on the event. It commits the DB session once any indexing request was written in the same session, + * ensuring consistency between the DB and the indexes. Therefore, DB data changes that cause the indexing event should * be done using the same DB session and the session should be uncommitted. */ void commitAndIndexOnEntityEvent(DbSession dbSession, Collection entityUuids, EntityEvent cause); /** - * Re-index data based on the event. It commits the DB session once any indexation request was written in the same session, - * ensuring consistency between the DB and the indexes. Therefore, DB data changes that cause the indexation event should + * Re-index data based on the event. It commits the DB session once any indexing request was written in the same session, + * ensuring consistency between the DB and the indexes. Therefore, DB data changes that cause the indexing event should * be done using the same DB session and the session should be uncommitted. */ void commitAndIndexOnBranchEvent(DbSession dbSession, Collection branchUuids, BranchEvent cause); /** - * Re-index data based on the event. It commits the DB session once any indexation request was written in the same session, - * ensuring consistency between the DB and the indexes. Therefore, DB data changes that cause the indexation event should + * Re-index data based on the event. It commits the DB session once any indexing request was written in the same session, + * ensuring consistency between the DB and the indexes. Therefore, DB data changes that cause the indexing event should * be done using the same DB session and the session should be uncommitted. */ default void commitAndIndexEntities(DbSession dbSession, Collection entities, EntityEvent cause) { @@ -68,8 +68,8 @@ public interface Indexers { } /** - * Re-index data based on the event. It commits the DB session once any indexation request was written in the same session, - * ensuring consistency between the DB and the indexes. Therefore, DB data changes that cause the indexation event should + * Re-index data based on the event. It commits the DB session once any indexing request was written in the same session, + * ensuring consistency between the DB and the indexes. Therefore, DB data changes that cause the indexing event should * be done using the same DB session and the session should be uncommitted. */ default void commitAndIndexBranches(DbSession dbSession, Collection branches, BranchEvent cause) { diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/es/IndexersImpl.java b/server/sonar-server-common/src/main/java/org/sonar/server/es/IndexersImpl.java index 9e10ea9235a..b158701018a 100644 --- a/server/sonar-server-common/src/main/java/org/sonar/server/es/IndexersImpl.java +++ b/server/sonar-server-common/src/main/java/org/sonar/server/es/IndexersImpl.java @@ -41,11 +41,11 @@ public class IndexersImpl implements Indexers { } /** - * Asks all indexers to queue an indexation request in the DB to index the specified entities, if needed (according to + * Asks all indexers to queue an indexing request in the DB to index the specified entities, if needed (according to * "cause" parameter), then call all indexers to index the requests. - * The idea is that the indexation requests are committed into the DB at the same time as the data that caused those requests + * The idea is that the indexing requests are committed into the DB at the same time as the data that caused those requests * to be created, for consistency. - * If the indexation fails, the indexation requests will still be in the DB and can be processed again later. + * If the indexing fails, the indexing requests will still be in the DB and can be processed again later. */ @Override public void commitAndIndexOnEntityEvent(DbSession dbSession, Collection entityUuids, EntityEvent cause) { @@ -53,11 +53,11 @@ public class IndexersImpl implements Indexers { } /** - * Asks all indexers to queue an indexation request in the DB to index the specified branches, if needed (according to + * Asks all indexers to queue an indexing request in the DB to index the specified branches, if needed (according to * "cause" parameter), then call all indexers to index the requests. - * The idea is that the indexation requests are committed into the DB at the same time as the data that caused those requests + * The idea is that the indexing requests are committed into the DB at the same time as the data that caused those requests * to be created, for consistency. - * If the indexation fails, the indexation requests will still be in the DB and can be processed again later. + * If the indexing fails, the indexing requests will still be in the DB and can be processed again later. */ @Override public void commitAndIndexOnBranchEvent(DbSession dbSession, Collection branchUuids, BranchEvent cause) { diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/es/IndexingListener.java b/server/sonar-server-common/src/main/java/org/sonar/server/es/IndexingListener.java index af82c8d6190..2d3d4c559ca 100644 --- a/server/sonar-server-common/src/main/java/org/sonar/server/es/IndexingListener.java +++ b/server/sonar-server-common/src/main/java/org/sonar/server/es/IndexingListener.java @@ -39,7 +39,7 @@ public interface IndexingListener { public void onFinish(IndexingResult result) { if (result.getFailures() > 0) { throw new IllegalStateException( - format("Unrecoverable indexation failures: %d errors among %d requests. Check Elasticsearch logs for further details.", + format("Unrecoverable indexing failures: %d errors among %d requests. Check Elasticsearch logs for further details.", result.getFailures(), result.getTotal())); } diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/es/ResilientIndexer.java b/server/sonar-server-common/src/main/java/org/sonar/server/es/ResilientIndexer.java index c1dac6c742a..55842bd509c 100644 --- a/server/sonar-server-common/src/main/java/org/sonar/server/es/ResilientIndexer.java +++ b/server/sonar-server-common/src/main/java/org/sonar/server/es/ResilientIndexer.java @@ -24,12 +24,12 @@ import org.sonar.db.DbSession; import org.sonar.db.es.EsQueueDto; /** - * Indexers that are resilient. These indexers handle indexation items that are queued in the DB. + * Indexers that are resilient. These indexers handle indexing items that are queued in the DB. */ public interface ResilientIndexer extends StartupIndexer { /** - * Index the items and delete them from es_queue DB table when the indexation + * Index the items and delete them from es_queue DB table when the indexing * is done. If there is a failure, the items are kept in DB to be re-processed later. * * @param dbSession the db session diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/es/FailOnErrorIndexingListenerTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/es/FailOnErrorIndexingListenerTest.java index 385f61ac4e4..83c99cb1ad9 100644 --- a/server/sonar-server-common/src/test/java/org/sonar/server/es/FailOnErrorIndexingListenerTest.java +++ b/server/sonar-server-common/src/test/java/org/sonar/server/es/FailOnErrorIndexingListenerTest.java @@ -35,7 +35,7 @@ public class FailOnErrorIndexingListenerTest { assertThatThrownBy(() -> FAIL_ON_ERROR.onFinish(indexingResult)) .isInstanceOf(IllegalStateException.class) - .hasMessage("Unrecoverable indexation failures: 1 errors among 1 requests. " + .hasMessage("Unrecoverable indexing failures: 1 errors among 1 requests. " + "Check Elasticsearch logs for further details."); } diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/permission/index/PermissionIndexerTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/permission/index/PermissionIndexerTest.java index e288d5d35f6..f8e061739c2 100644 --- a/server/sonar-server-common/src/test/java/org/sonar/server/permission/index/PermissionIndexerTest.java +++ b/server/sonar-server-common/src/test/java/org/sonar/server/permission/index/PermissionIndexerTest.java @@ -97,7 +97,7 @@ public class PermissionIndexerTest { indexOnStartup(); assertThat(es.countDocuments(INDEX_TYPE_FOO_AUTH)).isEqualTo(2); - // Simulate a indexation issue + // Simulate an indexing issue db.getDbClient().purgeDao().deleteProject(db.getSession(), project1.getUuid(), PROJECT, project1.getName(), project1.getKey()); underTest.prepareForRecoveryOnEntityEvent(db.getSession(), asList(project1.getUuid()), EntityEvent.DELETION); assertThat(db.countRowsOfTable(db.getSession(), "es_queue")).isOne(); diff --git a/server/sonar-web/src/main/js/apps/issues/__tests__/IssuesApp-Filtering-it.tsx b/server/sonar-web/src/main/js/apps/issues/__tests__/IssuesApp-Filtering-it.tsx index 66670341b52..ca713dc904d 100644 --- a/server/sonar-web/src/main/js/apps/issues/__tests__/IssuesApp-Filtering-it.tsx +++ b/server/sonar-web/src/main/js/apps/issues/__tests__/IssuesApp-Filtering-it.tsx @@ -355,7 +355,7 @@ describe('issues app when reindexing', () => { expect(ui.issueStatusFacet.query()).not.toBeInTheDocument(); expect(ui.tagFacet.query()).not.toBeInTheDocument(); - // Indexation message + // Indexing message expect(screen.getByText(/indexation\.filters_unavailable/)).toBeInTheDocument(); }); }); diff --git a/server/sonar-webserver-core/src/main/java/org/sonar/server/issue/index/AsyncIssueIndexingImpl.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/issue/index/AsyncIssueIndexingImpl.java index 900324d2fd7..a4421c3b2e1 100644 --- a/server/sonar-webserver-core/src/main/java/org/sonar/server/issue/index/AsyncIssueIndexingImpl.java +++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/issue/index/AsyncIssueIndexingImpl.java @@ -63,7 +63,7 @@ public class AsyncIssueIndexingImpl implements AsyncIssueIndexing { try (DbSession dbSession = dbClient.openSession(false)) { - // remove already existing indexation task, if any + // remove already existing indexing task, if any removeExistingIndexationTasks(dbSession); dbClient.branchDao().updateAllNeedIssueSync(dbSession); @@ -99,7 +99,7 @@ public class AsyncIssueIndexingImpl implements AsyncIssueIndexing { public void triggerForProject(String projectUuid) { try (DbSession dbSession = dbClient.openSession(false)) { - // remove already existing indexation task, if any + // remove already existing indexing task, if any removeExistingIndexationTasksForProject(dbSession, projectUuid); dbClient.branchDao().updateAllNeedIssueSyncForProject(dbSession, projectUuid); @@ -162,14 +162,18 @@ public class AsyncIssueIndexingImpl implements AsyncIssueIndexing { } private void removeIndexationTasks(DbSession dbSession, Set ceQueueUuids, Set ceActivityUuids) { - LOG.info(String.format("%s pending indexation task found to be deleted...", ceQueueUuids.size())); + LOG.atInfo().setMessage("{} pending indexing task found to be deleted...") + .addArgument(ceQueueUuids.size()) + .log(); for (String uuid : ceQueueUuids) { dbClient.ceQueueDao().deleteByUuid(dbSession, uuid); } - LOG.info(String.format("%s completed indexation task found to be deleted...", ceQueueUuids.size())); + LOG.atInfo().setMessage("{} completed indexing task found to be deleted...") + .addArgument(ceQueueUuids.size()) + .log(); dbClient.ceActivityDao().deleteByUuids(dbSession, ceActivityUuids); - LOG.info("Indexation task deletion complete."); + LOG.info("Indexing task deletion complete."); LOG.info("Deleting tasks characteristics..."); Set tasksUuid = Stream.concat(ceQueueUuids.stream(), ceActivityUuids.stream()).collect(Collectors.toSet()); diff --git a/server/sonar-webserver-core/src/test/java/org/sonar/server/issue/index/AsyncIssueIndexingImplTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/issue/index/AsyncIssueIndexingImplTest.java index 962f33e7cc7..2cb19cf6ffc 100644 --- a/server/sonar-webserver-core/src/test/java/org/sonar/server/issue/index/AsyncIssueIndexingImplTest.java +++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/issue/index/AsyncIssueIndexingImplTest.java @@ -159,9 +159,9 @@ public class AsyncIssueIndexingImplTest { assertThat(logTester.logs(Level.INFO)) .contains( - "1 pending indexation task found to be deleted...", - "1 completed indexation task found to be deleted...", - "Indexation task deletion complete.", + "1 pending indexing task found to be deleted...", + "1 completed indexing task found to be deleted...", + "Indexing task deletion complete.", "Deleting tasks characteristics...", "Tasks characteristics deletion complete."); } @@ -197,7 +197,7 @@ public class AsyncIssueIndexingImplTest { assertThat(dbClient.ceActivityDao().selectByTaskType(dbTester.getSession(), REPORT)).hasSize(1); assertThat(dbClient.ceTaskCharacteristicsDao().selectByTaskUuids(dbTester.getSession(), new HashSet<>(List.of("uuid_2")))).isEmpty(); - // verify that the canceled tasks on anotherProject is still here, and was not removed by the project reindexation + // verify that the canceled tasks on anotherProject is still here, and was not removed by the project reindexing assertThat(dbClient.ceActivityDao().selectByTaskType(dbTester.getSession(), BRANCH_ISSUE_SYNC)) .hasSize(1) .extracting(CeActivityDto::getEntityUuid) @@ -205,9 +205,9 @@ public class AsyncIssueIndexingImplTest { assertThat(logTester.logs(Level.INFO)) .contains( - "2 pending indexation task found to be deleted...", - "2 completed indexation task found to be deleted...", - "Indexation task deletion complete.", + "2 pending indexing task found to be deleted...", + "2 completed indexing task found to be deleted...", + "Indexing task deletion complete.", "Deleting tasks characteristics...", "Tasks characteristics deletion complete.", "Tasks characteristics deletion complete.", diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/IndexationStatusAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/IndexationStatusAction.java index 5072f697a40..58068843203 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/IndexationStatusAction.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/IndexationStatusAction.java @@ -43,7 +43,7 @@ public class IndexationStatusAction implements CeWsAction { @Override public void define(WebService.NewController controller) { controller.createAction("indexation_status") - .setDescription("Returns the count of projects with completed issue indexation.") + .setDescription("Returns the count of projects with completed issue indexing.") .setResponseExample(getClass().getResource("indexation_status-example.json")) .setChangelog(new Change("10.2", "Project count is returned instead of branch percentage.")) .setHandler(this) diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/developers/ws/SearchEventsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/developers/ws/SearchEventsAction.java index 22a01b5ce8b..e515aaede5d 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/developers/ws/SearchEventsAction.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/developers/ws/SearchEventsAction.java @@ -90,7 +90,7 @@ public class SearchEventsAction implements DevelopersWsAction { WebService.NewAction action = controller.createAction("search_events") .setDescription("Search for events.
" + "Requires authentication." - + "
When issue indexation is in progress returns 503 service unavailable HTTP code.") + + "
When issue indexing is in progress returns 503 service unavailable HTTP code.") .setSince("1.0") .setInternal(true) .setHandler(this) diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/hotspot/ws/ListAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/hotspot/ws/ListAction.java index 4a2ab6a7507..dbacf608285 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/hotspot/ws/ListAction.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/hotspot/ws/ListAction.java @@ -97,7 +97,7 @@ public class ListAction implements HotspotsWsAction { .createAction("list") .setHandler(this) .setInternal(true) - .setDescription("List Security Hotpots. This endpoint is used in degraded mode, when issue indexation is running." + + .setDescription("List Security Hotpots. This endpoint is used in degraded mode, when issue indexing is running." + "
Total number of Security Hotspots will be always equal to a page size, as counting all issues is not supported. " + "
Requires the 'Browse' permission on the specified project. ") .setSince("10.2"); diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/hotspot/ws/SearchAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/hotspot/ws/SearchAction.java index a1aa8da0a62..fc079cfd91e 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/hotspot/ws/SearchAction.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/hotspot/ws/SearchAction.java @@ -222,7 +222,7 @@ public class SearchAction implements HotspotsWsAction { .setDescription("Search for Security Hotpots.
" + "Requires the 'Browse' permission on the specified project(s).
" + "For applications, it also requires 'Browse' permission on its child projects.
" - + "When issue indexation is in progress returns 503 service unavailable HTTP code.") + + "When issue indexing is in progress returns 503 service unavailable HTTP code.") .setSince("8.1") .setChangelog( new Change("10.2", format("Parameter '%s' renamed to '%s'", PARAM_PROJECT_KEY, PARAM_PROJECT)), diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/AuthorsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/AuthorsAction.java index 95f2f114f86..3866a43dbdd 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/AuthorsAction.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/AuthorsAction.java @@ -72,7 +72,7 @@ public class AuthorsAction implements IssuesWsAction { .setSince("5.1") .setDescription("Search SCM accounts which match a given query.
" + "Requires authentication." - + "
When issue indexation is in progress returns 503 service unavailable HTTP code.") + + "
When issue indexing is in progress returns 503 service unavailable HTTP code.") .setResponseExample(Resources.getResource(this.getClass(), "authors-example.json")) .setChangelog(new Change("7.4", "The maximum size of 'ps' is set to 100")) .setHandler(this); diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/ComponentTagsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/ComponentTagsAction.java index 54c18ebc186..3d056984fe2 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/ComponentTagsAction.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/ComponentTagsAction.java @@ -69,7 +69,7 @@ public class ComponentTagsAction implements IssuesWsAction { .setSince("5.1") .setInternal(true) .setDescription("List tags for the issues under a given component (including issues on the descendants of the component)" - + "
When issue indexation is in progress returns 503 service unavailable HTTP code.") + + "
When issue indexing is in progress returns 503 service unavailable HTTP code.") .setResponseExample(Resources.getResource(getClass(), "component-tags-example.json")); action.createParam(PARAM_COMPONENT_UUID) diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/ListAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/ListAction.java index ced4cd9ab8c..4b4421c8578 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/ListAction.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/ListAction.java @@ -91,7 +91,7 @@ public class ListAction implements IssuesWsAction { .createAction(ACTION_LIST) .setHandler(this) .setInternal(true) - .setDescription("List issues. This endpoint is used in degraded mode, when issue indexation is running." + + .setDescription("List issues. This endpoint is used in degraded mode, when issue indexing is running." + "
Either 'project' or 'component' parameter is required." + "
Total number of issues will be always equal to a page size, as this counting all issues is not supported. " + "
Requires the 'Browse' permission on the specified project. ") diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/SearchAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/SearchAction.java index 01db728b05c..8e6f747604c 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/SearchAction.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/SearchAction.java @@ -209,7 +209,7 @@ public class SearchAction implements IssuesWsAction { .setHandler(this) .setDescription("Search for issues.
Requires the 'Browse' permission on the specified project(s).
" + "For applications, it also requires 'Browse' permission on its child projects." - + "
When issue indexation is in progress returns 503 service unavailable HTTP code.") + + "
When issue indexing is in progress returns 503 service unavailable HTTP code.") .setSince("3.6") .setChangelog( new Change("10.4", "Added new param '%s'".formatted(PARAM_FIXED_IN_PULL_REQUEST)), diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties index 86cd9fa116b..2f8e794111c 100644 --- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties +++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties @@ -650,7 +650,7 @@ project_branch_pull_request.branch.delete=Delete branch project_branch_pull_request.branch.actions_label=Update {0} project_branch_pull_request.branch.delete.are_you_sure=Are you sure you want to delete branch "{name}"? project_branch_pull_request.branch.main_branch.are_you_sure=Are you sure you want to set branch "{branch}" as the main branch of this project? -project_branch_pull_request.branch.main_branch.requires_reindex=Changing the main branch of your project will trigger a project re-indexation and may impact the level of information that is available until re-indexing is complete. +project_branch_pull_request.branch.main_branch.requires_reindex=Changing the main branch of your project will trigger a project re-indexing and may impact the level of information that is available until re-indexing is complete. project_branch_pull_request.branch.main_branch.learn_more=Please refer to the {documentation} to understand the impacts of changing the main branch. project_branch_pull_request.branch.auto_deletion.keep_when_inactive=Keep when inactive project_branch_pull_request.branch.auto_deletion.keep_when_inactive.tooltip=When turned on, the branch will not be automatically deleted when inactive. @@ -5126,7 +5126,7 @@ maintenance.sonarqube_is_offline.text=The connection to SonarQube is lost. Pleas #------------------------------------------------------------------------------ # -# INDEXATION +# INDEXING # #------------------------------------------------------------------------------ indexation.in_progress=Reindexing in progress. diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/ProjectFileIndexer.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/ProjectFileIndexer.java index e8c7086168a..3aa51baeca4 100644 --- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/ProjectFileIndexer.java +++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/ProjectFileIndexer.java @@ -84,7 +84,7 @@ public class ProjectFileIndexer { } public void index() { - progressReport = new ProgressReport("Report about progress of file indexation", TimeUnit.SECONDS.toMillis(10)); + progressReport = new ProgressReport("Report about progress of file indexing", TimeUnit.SECONDS.toMillis(10)); progressReport.start("Indexing files..."); LOG.info("Project configuration:"); projectExclusionFilters.log(" "); -- 2.39.5