diff --git a/.github/ci-files/run-sanity-check.sh b/.github/ci-files/run-sanity-check.sh new file mode 100644 index 000000000000..32356f804fb4 --- /dev/null +++ b/.github/ci-files/run-sanity-check.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +set +e + +./gradlew rewriteDryRun -Dorg.gradle.jvmargs=-Xmx8G \ + --configure-on-demand \ + --console plain \ + --max-workers=1 \ + -Pqa --profile + +gradle_return_code=$? + +set -e + +exit $gradle_return_code diff --git a/build.gradle b/build.gradle index c6b738eb4c09..79bc4cf4e597 100644 --- a/build.gradle +++ b/build.gradle @@ -3,16 +3,16 @@ import org.sonar.build.BlackBoxTest import static org.gradle.api.JavaVersion.VERSION_17 -plugins { - // Ordered alphabetically +plugins { // natural order id 'com.github.hierynomus.license' version '0.16.1' - id "com.github.hierynomus.license-report" version "0.16.1" apply false - id 'com.gradleup.shadow' version '8.3.6' apply false + id 'com.github.hierynomus.license-report' version '0.16.1' apply false id 'com.google.protobuf' version '0.8.19' apply false + id 'com.gradleup.shadow' version '8.3.6' apply false id 'com.jfrog.artifactory' version '6.0.2' - id "de.undercouch.download" version "5.6.0" apply false + id 'de.undercouch.download' version '5.6.0' apply false id 'io.spring.dependency-management' version '1.1.7' - id "org.cyclonedx.bom" version "2.3.1" apply false + id 'org.cyclonedx.bom' version '2.3.1' apply false + id 'org.openrewrite.rewrite' version '7.19.0' apply false id 'org.sonarqube' version '7.0.0.6105' } @@ -200,7 +200,10 @@ allprojects { } } +apply from: 'gradle/rewrite.gradle' + apply plugin: 'org.sonarqube' + sonar { properties { property 'sonar.projectName', projectTitle diff --git a/gradle/rewrite.gradle b/gradle/rewrite.gradle new file mode 100644 index 000000000000..51d9f12b255d --- /dev/null +++ b/gradle/rewrite.gradle @@ -0,0 +1,25 @@ +/* + * SPDX-License-Identifier: Apache-2.0 + * + * The OpenSearch Contributors require contributions made to + * this file be licensed under the Apache-2.0 license or a + * compatible open source license. + */ + +apply plugin: 'org.openrewrite.rewrite' + +rewrite { + activeRecipe('org.opensearch.openrewrite.SanityCheck') + exclusion('**package-info.java') + setExportDatatables(true) + setFailOnDryRunResults(true) +} + +dependencies { + rewrite(platform('org.openrewrite.recipe:rewrite-recipe-bom:3.17.0')) + rewrite('org.openrewrite.recipe:rewrite-migrate-java:3.20.0') + rewrite('org.openrewrite.recipe:rewrite-java-security:3.19.2') + rewrite('org.openrewrite.recipe:rewrite-rewrite:0.14.1') + rewrite('org.openrewrite.recipe:rewrite-static-analysis:2.20.0') + rewrite('org.openrewrite.recipe:rewrite-third-party:0.30.0') +} diff --git a/rewrite.yml b/rewrite.yml new file mode 100644 index 000000000000..65da96fcf6a5 --- /dev/null +++ b/rewrite.yml @@ -0,0 +1,16 @@ +--- +type: specs.openrewrite.org/v1beta/recipe +name: org.opensearch.openrewrite.SanityCheck +displayName: Apply all Java & Gradle best practices +description: Comprehensive code quality recipe combining modernization, security, and best practices. +tags: + - java + - gradle + - static-analysis + - cleanup +recipeList: + - org.openrewrite.gradle.EnableGradleBuildCache + - org.openrewrite.gradle.EnableGradleParallelExecution + - org.openrewrite.java.RemoveUnusedImports + - org.openrewrite.staticanalysis.RemoveUnusedPrivateMethods +--- diff --git a/server/sonar-auth-github/src/main/java/org/sonar/auth/github/GitHubRestClient.java b/server/sonar-auth-github/src/main/java/org/sonar/auth/github/GitHubRestClient.java index 1642ca650970..918aa41d43aa 100644 --- a/server/sonar-auth-github/src/main/java/org/sonar/auth/github/GitHubRestClient.java +++ b/server/sonar-auth-github/src/main/java/org/sonar/auth/github/GitHubRestClient.java @@ -20,18 +20,12 @@ package org.sonar.auth.github; import com.github.scribejava.core.model.OAuth2AccessToken; -import com.github.scribejava.core.model.OAuthRequest; -import com.github.scribejava.core.model.Response; -import com.github.scribejava.core.model.Verb; import com.github.scribejava.core.oauth.OAuth20Service; import java.io.IOException; -import java.net.HttpURLConnection; import java.util.List; -import java.util.concurrent.ExecutionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static java.lang.String.format; import static org.sonar.auth.OAuthRestClient.executePaginatedRequest; import static org.sonar.auth.OAuthRestClient.executeRequest; diff --git a/server/sonar-ce-common/src/it/java/org/sonar/ce/queue/CeQueueImplIT.java b/server/sonar-ce-common/src/it/java/org/sonar/ce/queue/CeQueueImplIT.java index ac9e403a2d05..d5c7a18f279c 100644 --- a/server/sonar-ce-common/src/it/java/org/sonar/ce/queue/CeQueueImplIT.java +++ b/server/sonar-ce-common/src/it/java/org/sonar/ce/queue/CeQueueImplIT.java @@ -634,10 +634,6 @@ private CeTaskSubmit createTaskSubmit(String type, @Nullable Component component .build(); } - private ComponentDto insertComponent(ComponentDto componentDto) { - return db.components().insertComponent(componentDto); - } - private UserDto insertUser(UserDto userDto) { db.getDbClient().userDao().insert(session, userDto); session.commit(); diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/LoadPeriodsStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/LoadPeriodsStepIT.java index a3ad472bf940..0734dcfa16e6 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/LoadPeriodsStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/LoadPeriodsStepIT.java @@ -24,9 +24,7 @@ import com.tngtech.java.junit.dataprovider.UseDataProvider; import java.time.ZoneId; import java.time.ZonedDateTime; -import java.util.ArrayList; import java.util.Arrays; -import java.util.List; import java.util.Optional; import java.util.Random; import java.util.stream.Stream; @@ -489,16 +487,6 @@ public static Object[][] anyValidLeakPeriodSettingValue() { }; } - private List createSnapshots(ComponentDto project) { - ArrayList list = new ArrayList<>(); - list.add(dbTester.components().insertSnapshot(project, snapshot -> snapshot.setCreatedAt(1226379600000L).setLast(false))); // 2008-11-11 - list.add(dbTester.components().insertSnapshot(project, snapshot -> snapshot.setCreatedAt(1226494680000L).setLast(false))); // 2008-11-12 - list.add(dbTester.components().insertSnapshot(project, snapshot -> snapshot.setCreatedAt(1227157200000L).setLast(false))); // 2008-11-20 - list.add(dbTester.components().insertSnapshot(project, snapshot -> snapshot.setCreatedAt(1227358680000L).setLast(false))); // 2008-11-22 - list.add(dbTester.components().insertSnapshot(project, snapshot -> snapshot.setCreatedAt(1227934800000L).setLast(true))); // 2008-11-29 - return list; - } - private long milisSinceEpoch(int year, int month, int day, int hour) { return ZonedDateTime.of(year, month, day, hour, 0, 0, 0, ZoneId.systemDefault()) .toInstant().toEpochMilli(); diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/ValidateProjectStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/ValidateProjectStepIT.java index 57c40297a7de..eab35d7e7192 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/ValidateProjectStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/ValidateProjectStepIT.java @@ -20,7 +20,6 @@ package org.sonar.ce.task.projectanalysis.step; import java.util.Date; -import javax.annotation.Nullable; import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.DateUtils; @@ -35,13 +34,10 @@ import org.sonar.ce.task.step.TestComputationStepContext; import org.sonar.db.DbClient; import org.sonar.db.DbTester; -import org.sonar.db.component.BranchType; import org.sonar.db.component.ComponentDto; import org.sonar.db.component.SnapshotTesting; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; import static org.sonar.db.component.BranchDto.DEFAULT_MAIN_BRANCH_NAME; public class ValidateProjectStepIT { @@ -110,11 +106,4 @@ public void fail_when_project_key_is_invalid() { "Allowed characters are alphanumeric, '-', '_', '.' and ':', with at least one non-digit.", "You should update the project key with the expected format."); } - - private void setBranch(BranchType type, @Nullable String mergeBranchUuid) { - Branch branch = mock(Branch.class); - when(branch.getType()).thenReturn(type); - when(branch.getReferenceBranchUuid()).thenReturn(mergeBranchUuid); - analysisMetadataHolder.setBranch(branch); - } } diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/ViewsPersistComponentsStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/ViewsPersistComponentsStepIT.java index 03e61118c8ee..cdd42ede842e 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/ViewsPersistComponentsStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/ViewsPersistComponentsStepIT.java @@ -516,22 +516,6 @@ private void assertDtoIsView(ComponentDto dto) { assertThat(dto.getCreatedAt()).isEqualTo(now); } - /** - * Assertions to verify the DTO created from {@link #createViewBuilder(ViewAttributes.Type)} ()} - */ - private void assertDtoIsApplication(ComponentDto dto) { - assertThat(dto.name()).isEqualTo(VIEW_NAME); - assertThat(dto.longName()).isEqualTo(VIEW_NAME); - assertThat(dto.description()).isEqualTo(VIEW_DESCRIPTION); - assertThat(dto.path()).isNull(); - assertThat(dto.uuid()).isEqualTo(VIEW_UUID); - assertThat(dto.branchUuid()).isEqualTo(VIEW_UUID); - assertThat(dto.qualifier()).isEqualTo(ComponentQualifiers.APP); - assertThat(dto.scope()).isEqualTo(ComponentScopes.PROJECT); - assertThat(dto.getCopyComponentUuid()).isNull(); - assertThat(dto.getCreatedAt()).isEqualTo(now); - } - /** * Assertions to verify the DTO created from {@link #createProjectView1Builder(ComponentDto, Long)} */ diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/PostMeasuresComputationCheck.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/PostMeasuresComputationCheck.java index 9863836e1d01..5359796cd10e 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/PostMeasuresComputationCheck.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/PostMeasuresComputationCheck.java @@ -22,7 +22,6 @@ import org.sonar.api.ExtensionPoint; import org.sonar.api.ce.ComputeEngineSide; import org.sonar.ce.common.scanner.ScannerReportReader; -import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; import org.sonar.ce.task.projectanalysis.analysis.Branch; import org.sonar.ce.task.projectanalysis.component.Component; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/event/EventRepositoryImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/event/EventRepositoryImplTest.java index ea8932a6945e..8cd4c80de8cf 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/event/EventRepositoryImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/event/EventRepositoryImplTest.java @@ -20,8 +20,6 @@ package org.sonar.ce.task.projectanalysis.event; import org.junit.Test; -import org.sonar.ce.task.projectanalysis.component.Component; -import org.sonar.ce.task.projectanalysis.component.ReportComponent; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -50,8 +48,4 @@ public void can_add_and_retrieve_many_events() { assertThat(underTest.getEvents()).extracting("name").containsOnly(EVENT_1.getName(), EVENT_2.getName()); } - - private static Component newComponent(int i) { - return ReportComponent.builder(Component.Type.PROJECT, i).build(); - } } diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/PostMeasuresComputationChecksStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/PostMeasuresComputationChecksStepTest.java index e5ea57b43335..5151831d8637 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/PostMeasuresComputationChecksStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/PostMeasuresComputationChecksStepTest.java @@ -19,7 +19,6 @@ */ package org.sonar.ce.task.projectanalysis.measure; -import java.util.UUID; import org.junit.Rule; import org.junit.Test; import org.mockito.ArgumentCaptor; @@ -41,7 +40,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; import static org.sonar.api.measures.CoreMetrics.NCLOC; import static org.sonar.ce.task.projectanalysis.component.ReportComponent.DUMB_PROJECT; import static org.sonar.db.component.ComponentTesting.newPrivateProjectDto; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/notification/NotificationFactoryTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/notification/NotificationFactoryTest.java index 0582837bcd1f..26c52073c926 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/notification/NotificationFactoryTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/notification/NotificationFactoryTest.java @@ -38,7 +38,6 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.sonar.api.rule.RuleKey; -import org.sonar.api.utils.Durations; import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolderRule; import org.sonar.ce.task.projectanalysis.analysis.Branch; import org.sonar.ce.task.projectanalysis.component.ReportComponent; @@ -740,21 +739,6 @@ private static Branch newNonMainBranch(BranchType branchType, String branchName) return nonMainBranch; } - private static Durations readDurationsField(NewIssuesNotification notification) { - return readField(notification, "durations"); - } - - private static Durations readField(NewIssuesNotification notification, String fieldName) { - try { - Field durationsField = NewIssuesNotification.class.getDeclaredField(fieldName); - durationsField.setAccessible(true); - Object o = durationsField.get(notification); - return (Durations) o; - } catch (IllegalAccessException | NoSuchFieldException e) { - throw new RuntimeException(e); - } - } - private static DetailsSupplier readDetailsSupplier(NewIssuesNotification notification) { try { Field durationsField = NewIssuesNotification.class.getDeclaredField("detailsSupplier"); diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/purge/PurgeDatastoresStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/purge/PurgeDatastoresStepTest.java index 50560bb1e8b4..81e728ee8a7a 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/purge/PurgeDatastoresStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/purge/PurgeDatastoresStepTest.java @@ -20,9 +20,7 @@ package org.sonar.ce.task.projectanalysis.purge; import com.tngtech.java.junit.dataprovider.DataProviderRunner; -import java.util.Arrays; import java.util.Collections; -import java.util.function.Predicate; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -38,7 +36,6 @@ import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; import org.sonar.ce.task.projectanalysis.component.ViewsComponent; import org.sonar.ce.task.projectanalysis.step.BaseStepTest; -import org.sonar.ce.task.projectanalysis.util.WrapInSingleElementArray; import org.sonar.ce.task.step.ComputationStep; import org.sonar.ce.task.step.TestComputationStepContext; import org.sonar.db.DbClient; @@ -100,13 +97,6 @@ private void verify_call_purge_method_of_the_purge_task(Component project) { assertThat(argumentCaptor.getValue()).isEqualTo(PROJECT_UUID); } - private static Object[][] dataproviderFromComponentTypeValues(Predicate predicate) { - return Arrays.stream(Component.Type.values()) - .filter(predicate) - .map(WrapInSingleElementArray.INSTANCE) - .toArray(Object[][]::new); - } - @Override protected ComputationStep step() { return underTest; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/IssueDetectionEventsStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/IssueDetectionEventsStepTest.java index 32ca49477be0..35c2c0e2b38a 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/IssueDetectionEventsStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/IssueDetectionEventsStepTest.java @@ -211,13 +211,6 @@ private static QualityProfile qp(String qpName, String languageKey, Date date) { return new QualityProfile(qpName + "-" + languageKey, qpName, languageKey, date); } - /** - * Just a trick to use variable args which is shorter than writing new QualityProfile[] { } - */ - private static QualityProfile[] arrayOf(QualityProfile... qps) { - return qps; - } - private static Measure newMeasure(@Nullable QualityProfile... qps) { return Measure.newMeasureBuilder().create(toJson(qps)); } diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeQueueDaoIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeQueueDaoIT.java index 26d2ce03fcfc..acdc63784035 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeQueueDaoIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeQueueDaoIT.java @@ -19,13 +19,9 @@ */ package org.sonar.db.ce; -import com.google.common.base.Function; -import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import java.util.Collections; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.Optional; import java.util.Random; import java.util.function.Consumer; @@ -786,28 +782,6 @@ private void insertCharacteristic(String key, String value, String uuid, String db.getDbClient().ceTaskCharacteristicsDao().insert(db.getSession(), dto1); } - private static Iterable> upperizeKeys(List> select) { - return select.stream().map((Function, Map>) input -> { - Map res = new HashMap<>(input.size()); - for (Map.Entry entry : input.entrySet()) { - res.put(entry.getKey().toUpperCase(), entry.getValue()); - } - return res; - }).toList(); - } - - private void verifyCeQueueStatuses(String[] taskUuids, CeQueueDto.Status[] statuses) { - Map[] rows = new Map[taskUuids.length]; - for (int i = 0; i < taskUuids.length; i++) { - rows[i] = rowMap(taskUuids[i], statuses[i]); - } - assertThat(upperizeKeys(db.select(SELECT_QUEUE_UUID_AND_STATUS_QUERY))).containsOnly(rows); - } - - private static Map rowMap(String uuid, CeQueueDto.Status status) { - return ImmutableMap.of("UUID", uuid, "STATUS", status.name()); - } - private void mockSystem2ForSingleCall(long now) { Mockito.reset(mockedSystem2); when(mockedSystem2.now()) diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeScannerContextDaoIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeScannerContextDaoIT.java index 93dbdd87d230..417dfdd907ba 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeScannerContextDaoIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeScannerContextDaoIT.java @@ -27,7 +27,6 @@ import org.sonar.db.DbSession; import org.sonar.db.DbTester; -import static java.lang.System.lineSeparator; import static java.util.Collections.singleton; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatNoException; diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/property/PropertiesDaoWithPersisterIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/property/PropertiesDaoWithPersisterIT.java index f3bab89943e4..9ed7ff5f4c16 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/property/PropertiesDaoWithPersisterIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/property/PropertiesDaoWithPersisterIT.java @@ -30,8 +30,6 @@ import org.sonar.db.DbTester; import org.sonar.db.audit.AuditPersister; import org.sonar.db.audit.model.PropertyNewValue; -import org.sonar.db.component.ComponentDto; -import org.sonar.db.user.UserDto; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -303,34 +301,4 @@ private PropertyQuery getPropertyQuery(String key) { .setUserUuid(USER_UUID) .build(); } - - private UserDto setUserProperties(@Nullable String value) { - when(auditPersister.isTrackedProperty(KEY)).thenReturn(true); - when(auditPersister.isTrackedProperty(ANOTHER_KEY)).thenReturn(false); - when(auditPersister.isTrackedProperty(SECURED_KEY)).thenReturn(true); - - ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent(); - UserDto user = db.users().insertUser(); - - if (value == null) { - value = user.getLogin(); - } - - PropertyDto dto1 = new PropertyDto().setKey(KEY) - .setEntityUuid(project.uuid()) - .setUserUuid(user.getUuid()) - .setValue(value); - PropertyDto dto2 = new PropertyDto().setKey(ANOTHER_KEY) - .setEntityUuid(project.uuid()) - .setUserUuid(user.getUuid()) - .setValue(value); - PropertyDto dto3 = new PropertyDto().setKey(SECURED_KEY) - .setEntityUuid(project.uuid()) - .setUserUuid(user.getUuid()) - .setValue(value); - db.properties().insertProperty(dto1, project.getKey(), project.name(), project.qualifier(), user.getLogin()); - db.properties().insertProperty(dto2, project.getKey(), project.name(), project.qualifier(), user.getLogin()); - db.properties().insertProperty(dto3, project.getKey(), project.name(), project.qualifier(), user.getLogin()); - return user; - } } diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/component/BranchDto.java b/server/sonar-db-dao/src/main/java/org/sonar/db/component/BranchDto.java index 863a4b2016c2..155f7ef133f0 100644 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/component/BranchDto.java +++ b/server/sonar-db-dao/src/main/java/org/sonar/db/component/BranchDto.java @@ -115,13 +115,6 @@ public BranchDto setIsMain(boolean isMain) { return this; } - /** - * This is the getter used by MyBatis mapper. - */ - private String getKee() { - return kee; - } - public String getKey() { return kee; } diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/component/SnapshotDto.java b/server/sonar-db-dao/src/main/java/org/sonar/db/component/SnapshotDto.java index 71cd8f19420a..791f795a8916 100644 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/component/SnapshotDto.java +++ b/server/sonar-db-dao/src/main/java/org/sonar/db/component/SnapshotDto.java @@ -24,7 +24,6 @@ import javax.annotation.Nullable; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.commons.lang3.StringUtils.trimToNull; public final class SnapshotDto { @@ -119,13 +118,6 @@ public String getProjectVersion() { return projectVersion; } - /** - * Used by MyBatis - */ - private void setRawProjectVersion(@Nullable String projectVersion) { - this.projectVersion = trimToNull(projectVersion); - } - @CheckForNull public String getBuildString() { return buildString; @@ -137,13 +129,6 @@ public SnapshotDto setBuildString(@Nullable String buildString) { return this; } - /** - * Used by MyBatis - */ - private void setRawBuildString(@Nullable String buildString) { - this.buildString = trimToNull(buildString); - } - public SnapshotDto setPeriodMode(@Nullable String p) { periodMode = p; return this; diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/event/EventComponentChangeDto.java b/server/sonar-db-dao/src/main/java/org/sonar/db/event/EventComponentChangeDto.java index a41690098cfe..176ffcb43ca9 100644 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/event/EventComponentChangeDto.java +++ b/server/sonar-db-dao/src/main/java/org/sonar/db/event/EventComponentChangeDto.java @@ -78,24 +78,6 @@ public EventComponentChangeDto setCategory(ChangeCategory category) { return this; } - /** - * Used by MyBatis through reflection. - */ - private String getChangeCategory() { - return category == null ? null : category.dbValue; - } - - /** - * Used by MyBatis through reflection. - * - * @throws IllegalArgumentException if not a support change category DB value - */ - private EventComponentChangeDto setChangeCategory(String changeCategory) { - this.category = ChangeCategory.fromDbValue(changeCategory) - .orElseThrow(() -> new IllegalArgumentException("Unsupported changeCategory DB value: " + changeCategory)); - return this; - } - public String getComponentUuid() { return componentUuid; } @@ -136,11 +118,4 @@ public EventComponentChangeDto setComponentBranchKey(@Nullable String componentB public long getCreatedAt() { return createdAt; } - - /** - * Used by MyBatis through reflection. - */ - private void setCreatedAt(long createdAt) { - this.createdAt = createdAt; - } } diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserDto.java b/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserDto.java index a6e4fab242c7..f547e1e7bd32 100644 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserDto.java +++ b/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserDto.java @@ -120,13 +120,6 @@ public UserDto setActive(boolean b) { return this; } - /** - * Used by mybatis - */ - private List getScmAccounts() { - return scmAccounts; - } - public List getSortedScmAccounts() { // needs to be done when reading, as mybatis do not use the setter return scmAccounts.stream().sorted(comparing(s -> s, CASE_INSENSITIVE_ORDER)).toList(); diff --git a/server/sonar-db-migration/src/it/java/org/sonar/server/platform/db/migration/sql/CreateTableBuilderIT.java b/server/sonar-db-migration/src/it/java/org/sonar/server/platform/db/migration/sql/CreateTableBuilderIT.java index e45ca221a519..6533f578c954 100644 --- a/server/sonar-db-migration/src/it/java/org/sonar/server/platform/db/migration/sql/CreateTableBuilderIT.java +++ b/server/sonar-db-migration/src/it/java/org/sonar/server/platform/db/migration/sql/CreateTableBuilderIT.java @@ -141,10 +141,6 @@ private void assertTableAndColumnsExists(String tableName, String... columnNames assertThat(row).isEmpty(); } - private CreateTableBuilder newCreateTableBuilder() { - return new CreateTableBuilder(dialect, createTableName()); - } - private static String createTableName() { return "table_" + tableNameGenerator++; } diff --git a/server/sonar-process/src/test/java/org/sonar/process/sharedmemoryfile/AllProcessesCommandsTest.java b/server/sonar-process/src/test/java/org/sonar/process/sharedmemoryfile/AllProcessesCommandsTest.java index bbc418ea58aa..7192f62ff28d 100644 --- a/server/sonar-process/src/test/java/org/sonar/process/sharedmemoryfile/AllProcessesCommandsTest.java +++ b/server/sonar-process/src/test/java/org/sonar/process/sharedmemoryfile/AllProcessesCommandsTest.java @@ -209,8 +209,4 @@ public void clean_cleans_sharedMemory_of_any_process_less_than_MAX_PROCESSES() t private byte readByte(AllProcessesCommands commands, int offset) { return commands.mappedByteBuffer.get(commands.offset(PROCESS_NUMBER) + offset); } - - private long readLong(AllProcessesCommands commands, int offset) { - return commands.mappedByteBuffer.getLong(offset + commands.offset(PROCESS_NUMBER)); - } } diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/issue/notification/ChangesOnMyIssueNotificationHandlerTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/issue/notification/ChangesOnMyIssueNotificationHandlerTest.java index 4fbba01c5081..062837ebfd26 100644 --- a/server/sonar-server-common/src/test/java/org/sonar/server/issue/notification/ChangesOnMyIssueNotificationHandlerTest.java +++ b/server/sonar-server-common/src/test/java/org/sonar/server/issue/notification/ChangesOnMyIssueNotificationHandlerTest.java @@ -28,10 +28,8 @@ import java.util.List; import java.util.Random; import java.util.Set; -import java.util.stream.Collectors; import java.util.stream.IntStream; import java.util.stream.Stream; -import javax.annotation.Nullable; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; @@ -440,16 +438,6 @@ private static Rule newRule() { return newRandomNotAHotspotRule(secure().nextAlphabetic(5)); } - private static Set randomSetOfNotifications(@Nullable String projectKey, @Nullable String assignee, @Nullable String changeAuthor) { - return IntStream.range(0, 1 + new Random().nextInt(5)) - .mapToObj(i -> newNotification(projectKey, assignee, changeAuthor)) - .collect(Collectors.toSet()); - } - - private static IssuesChangesNotification newNotification(@Nullable String projectKey, @Nullable String assignee, @Nullable String changeAuthor) { - return mock(IssuesChangesNotification.class); - } - private static NotificationManager.EmailRecipient emailRecipientOf(String login) { return new NotificationManager.EmailRecipient(login, emailOf(login)); } diff --git a/server/sonar-webserver-api/src/test/projects/fake-sqale-plugin/src/BasePlugin.java b/server/sonar-webserver-api/src/test/projects/fake-sqale-plugin/src/BasePlugin.java index ff5cfda1bca6..a79222606e0d 100644 --- a/server/sonar-webserver-api/src/test/projects/fake-sqale-plugin/src/BasePlugin.java +++ b/server/sonar-webserver-api/src/test/projects/fake-sqale-plugin/src/BasePlugin.java @@ -19,9 +19,6 @@ */ import org.sonar.api.Plugin; -import java.util.Collections; -import java.util.List; - public class BasePlugin extends Plugin { public void define(Plugin.Context context) { diff --git a/server/sonar-webserver-api/src/test/projects/test-extend-plugin/src/ExtendPlugin.java b/server/sonar-webserver-api/src/test/projects/test-extend-plugin/src/ExtendPlugin.java index 6b5c98305f64..77c50a0c906d 100644 --- a/server/sonar-webserver-api/src/test/projects/test-extend-plugin/src/ExtendPlugin.java +++ b/server/sonar-webserver-api/src/test/projects/test-extend-plugin/src/ExtendPlugin.java @@ -19,9 +19,6 @@ */ import org.sonar.api.Plugin; -import java.util.Collections; -import java.util.List; - public class ExtendPlugin extends Plugin { public void define(Plugin.Context context) { diff --git a/server/sonar-webserver-api/src/test/projects/test-libs-plugin/src/LibsPlugin.java b/server/sonar-webserver-api/src/test/projects/test-libs-plugin/src/LibsPlugin.java index 83a63f81662b..dd9f4261bd52 100644 --- a/server/sonar-webserver-api/src/test/projects/test-libs-plugin/src/LibsPlugin.java +++ b/server/sonar-webserver-api/src/test/projects/test-libs-plugin/src/LibsPlugin.java @@ -19,9 +19,6 @@ */ import org.sonar.api.Plugin; -import java.util.Collections; -import java.util.List; - public class LibsPlugin extends Plugin { public void define(Plugin.Context context) { diff --git a/server/sonar-webserver-api/src/test/projects/test-requirenew-plugin/src/RequirePlugin.java b/server/sonar-webserver-api/src/test/projects/test-requirenew-plugin/src/RequirePlugin.java index e20491aea80a..dd88e6d1afdf 100644 --- a/server/sonar-webserver-api/src/test/projects/test-requirenew-plugin/src/RequirePlugin.java +++ b/server/sonar-webserver-api/src/test/projects/test-requirenew-plugin/src/RequirePlugin.java @@ -19,9 +19,6 @@ */ import org.sonar.api.Plugin; -import java.util.Collections; -import java.util.List; - public class RequirePlugin extends Plugin { public RequirePlugin() { diff --git a/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/OAuth2AuthenticationParameters.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/OAuth2AuthenticationParameters.java index 42e23dd51ff9..ab7e5856dc25 100644 --- a/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/OAuth2AuthenticationParameters.java +++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/OAuth2AuthenticationParameters.java @@ -20,7 +20,6 @@ package org.sonar.server.authentication; import java.util.Optional; -import jakarta.servlet.FilterConfig; import org.sonar.api.server.authentication.OAuth2IdentityProvider; import org.sonar.api.server.http.HttpRequest; import org.sonar.api.server.http.HttpResponse; diff --git a/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/JwtCsrfVerifierTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/JwtCsrfVerifierTest.java index 390aa28bdf43..cfb38aaf97ce 100644 --- a/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/JwtCsrfVerifierTest.java +++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/JwtCsrfVerifierTest.java @@ -177,15 +177,6 @@ public void remove_state() { assertThat(cookie.getMaxAge()).isZero(); } - private void verifyCookie(Cookie cookie) { - assertThat(cookie.getName()).isEqualTo("XSRF-TOKEN"); - assertThat(cookie.getValue()).isNotEmpty(); - assertThat(cookie.getPath()).isEqualTo("/"); - assertThat(cookie.isHttpOnly()).isFalse(); - assertThat(cookie.getMaxAge()).isEqualTo(TIMEOUT); - assertThat(cookie.isSecure()).isFalse(); - } - private void mockPostJavaWsRequest() { when(request.getRequestURI()).thenReturn(JAVA_WS_URL); when(request.getMethod()).thenReturn("POST"); diff --git a/server/sonar-webserver-auth/src/testFixtures/java/org/sonar/server/tester/AbstractMockUserSession.java b/server/sonar-webserver-auth/src/testFixtures/java/org/sonar/server/tester/AbstractMockUserSession.java index 1c0484de5272..d542a4f4f9c5 100644 --- a/server/sonar-webserver-auth/src/testFixtures/java/org/sonar/server/tester/AbstractMockUserSession.java +++ b/server/sonar-webserver-auth/src/testFixtures/java/org/sonar/server/tester/AbstractMockUserSession.java @@ -20,7 +20,6 @@ package org.sonar.server.tester; import com.google.common.collect.HashMultimap; -import com.google.common.collect.ImmutableSet; import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; diff --git a/server/sonar-webserver-common/src/test/java/org/sonar/server/common/health/CeStatusNodeCheckTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/common/health/CeStatusNodeCheckTest.java index 234be67e9d31..7b2535e41cd7 100644 --- a/server/sonar-webserver-common/src/test/java/org/sonar/server/common/health/CeStatusNodeCheckTest.java +++ b/server/sonar-webserver-common/src/test/java/org/sonar/server/common/health/CeStatusNodeCheckTest.java @@ -21,7 +21,6 @@ import org.junit.Test; import org.sonar.server.app.ProcessCommandWrapper; -import org.sonar.server.common.health.CeStatusNodeCheck; import org.sonar.server.health.Health; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-webserver-common/src/test/java/org/sonar/server/common/health/DbConnectionNodeCheckTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/common/health/DbConnectionNodeCheckTest.java index efe2d75b97b6..5aa3aaef84ac 100644 --- a/server/sonar-webserver-common/src/test/java/org/sonar/server/common/health/DbConnectionNodeCheckTest.java +++ b/server/sonar-webserver-common/src/test/java/org/sonar/server/common/health/DbConnectionNodeCheckTest.java @@ -24,7 +24,6 @@ import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.IsAliveMapper; -import org.sonar.server.common.health.DbConnectionNodeCheck; import org.sonar.server.health.Health; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-webserver-common/src/test/java/org/sonar/server/common/health/EsStatusNodeCheckTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/common/health/EsStatusNodeCheckTest.java index 26e9f8b4d253..48da20b21c55 100644 --- a/server/sonar-webserver-common/src/test/java/org/sonar/server/common/health/EsStatusNodeCheckTest.java +++ b/server/sonar-webserver-common/src/test/java/org/sonar/server/common/health/EsStatusNodeCheckTest.java @@ -22,7 +22,6 @@ import org.elasticsearch.cluster.health.ClusterHealthStatus; import org.junit.Test; import org.mockito.Mockito; -import org.sonar.server.common.health.EsStatusNodeCheck; import org.sonar.server.es.EsClient; import org.sonar.server.health.Health; diff --git a/server/sonar-webserver-common/src/test/java/org/sonar/server/common/health/WebServerSafemodeNodeCheckTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/common/health/WebServerSafemodeNodeCheckTest.java index 4d88c627018f..4cca474331b4 100644 --- a/server/sonar-webserver-common/src/test/java/org/sonar/server/common/health/WebServerSafemodeNodeCheckTest.java +++ b/server/sonar-webserver-common/src/test/java/org/sonar/server/common/health/WebServerSafemodeNodeCheckTest.java @@ -20,7 +20,6 @@ package org.sonar.server.common.health; import org.junit.Test; -import org.sonar.server.common.health.WebServerSafemodeNodeCheck; import org.sonar.server.health.Health; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-webserver-common/src/test/java/org/sonar/server/common/health/WebServerStatusNodeCheckTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/common/health/WebServerStatusNodeCheckTest.java index ca4e9df5a300..ddefd5075b38 100644 --- a/server/sonar-webserver-common/src/test/java/org/sonar/server/common/health/WebServerStatusNodeCheckTest.java +++ b/server/sonar-webserver-common/src/test/java/org/sonar/server/common/health/WebServerStatusNodeCheckTest.java @@ -23,7 +23,6 @@ import java.util.Random; import org.junit.Test; import org.sonar.server.app.RestartFlagHolder; -import org.sonar.server.common.health.WebServerStatusNodeCheck; import org.sonar.server.health.Health; import org.sonar.server.platform.Platform; import org.sonar.server.platform.db.migration.DatabaseMigrationState; diff --git a/server/sonar-webserver-es/src/main/java/org/sonar/server/issue/index/IssueQueryFactory.java b/server/sonar-webserver-es/src/main/java/org/sonar/server/issue/index/IssueQueryFactory.java index 0fca9849d89a..2a267c4e9fe8 100644 --- a/server/sonar-webserver-es/src/main/java/org/sonar/server/issue/index/IssueQueryFactory.java +++ b/server/sonar-webserver-es/src/main/java/org/sonar/server/issue/index/IssueQueryFactory.java @@ -39,7 +39,6 @@ import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; -import java.util.stream.Stream; import javax.annotation.Nullable; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; diff --git a/server/sonar-webserver-es/src/test/java/org/sonar/server/issue/index/IssueIndexSecurityReportsTest.java b/server/sonar-webserver-es/src/test/java/org/sonar/server/issue/index/IssueIndexSecurityReportsTest.java index 0c002a4e13cc..26c3b020b059 100644 --- a/server/sonar-webserver-es/src/test/java/org/sonar/server/issue/index/IssueIndexSecurityReportsTest.java +++ b/server/sonar-webserver-es/src/test/java/org/sonar/server/issue/index/IssueIndexSecurityReportsTest.java @@ -32,7 +32,6 @@ import org.sonar.api.issue.Issue; import org.sonar.api.issue.IssueStatus; import org.sonar.api.rule.Severity; -import org.sonar.api.server.rule.RulesDefinition; import org.sonar.core.rule.RuleType; import org.sonar.api.server.rule.RulesDefinition.StigVersion; import org.sonar.db.component.ComponentDto; diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/project/ws/BulkDeleteActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/project/ws/BulkDeleteActionIT.java index f486fca178d5..b4d4c136d704 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/project/ws/BulkDeleteActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/project/ws/BulkDeleteActionIT.java @@ -43,7 +43,6 @@ import org.sonar.db.DbSession; import org.sonar.db.DbTester; import org.sonar.db.component.ComponentDto; -import org.sonar.db.component.PortfolioData; import org.sonar.db.component.ProjectData; import org.sonar.db.entity.EntityDto; import org.sonar.db.portfolio.PortfolioDto; @@ -344,10 +343,6 @@ private void verifyListenersOnProjectsDeleted(ProjectData... projectData) { verifyListenersOnProjectsDeleted(Arrays.stream(projectData).collect(Collectors.toMap(ProjectData::getProjectDto, data -> data.getMainBranchDto().getUuid()))); } - private void verifyListenersOnProjectsDeleted(PortfolioData... portfolioData) { - verifyListenersOnProjectsDeleted(Arrays.stream(portfolioData).collect(Collectors.toMap(PortfolioData::getPortfolioDto, null))); - } - private void verifyListenersOnProjectsDeleted(Map entityWithBranchUuid) { verify(projectLifeCycleListeners) .onProjectsDeleted(entityWithBranchUuid.entrySet() diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/setting/ws/ValuesActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/setting/ws/ValuesActionIT.java index 252cc78512e2..0f810530a3cd 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/setting/ws/ValuesActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/setting/ws/ValuesActionIT.java @@ -65,7 +65,6 @@ import static org.sonar.db.property.PropertyTesting.newComponentPropertyDto; import static org.sonar.db.property.PropertyTesting.newGlobalPropertyDto; import static org.sonarqube.ws.MediaTypes.JSON; -import static org.sonarqube.ws.Settings.Setting.ParentValueOneOfCase.PARENTVALUEONEOF_NOT_SET; public class ValuesActionIT { @@ -801,33 +800,4 @@ private void assertFieldValues(Settings.Setting setting, Map... index++; } } - - private void assertParentValue(Settings.Setting setting, @Nullable String parentValue) { - if (parentValue == null) { - assertThat(setting.getParentValueOneOfCase()).isEqualTo(PARENTVALUEONEOF_NOT_SET); - } else { - assertThat(setting.getParentValue()).isEqualTo(parentValue); - } - } - - private void assertParentValues(Settings.Setting setting, String... parentValues) { - if (parentValues.length == 0) { - assertThat(setting.getParentValueOneOfCase()).isEqualTo(PARENTVALUEONEOF_NOT_SET); - } else { - assertThat(setting.getParentValues().getValuesList()).containsOnly(parentValues); - } - } - - private void assertParentFieldValues(Settings.Setting setting, Map... fieldsValues) { - if (fieldsValues.length == 0) { - assertThat(setting.getParentValueOneOfCase()).isEqualTo(PARENTVALUEONEOF_NOT_SET); - } else { - assertThat(setting.getParentFieldValues().getFieldValuesList()).hasSize(fieldsValues.length); - int index = 0; - for (Settings.FieldValues.Value fieldsValue : setting.getParentFieldValues().getFieldValuesList()) { - assertThat(fieldsValue.getValue()).isEqualTo(fieldsValues[index]); - index++; - } - } - } } diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/SearchActionFeatureGatingTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/SearchActionFeatureGatingTest.java index be08a925c598..6e04796df6f7 100644 --- a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/SearchActionFeatureGatingTest.java +++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/SearchActionFeatureGatingTest.java @@ -20,7 +20,6 @@ package org.sonar.server.issue.ws; import org.junit.jupiter.api.Test; -import org.mockito.Mockito; import org.sonar.api.server.ws.WebService; import org.sonar.api.utils.System2; import org.sonar.db.DbClient; @@ -29,7 +28,6 @@ import org.sonar.server.issue.index.IssueIndexSyncProgressChecker; import org.sonar.server.issue.index.IssueQueryFactory; import org.sonar.server.tester.UserSessionRule; -import org.sonar.server.ws.TestRequest; import org.sonar.server.ws.WsActionTester; import java.util.Objects; diff --git a/sonar-core/src/test/java/org/sonar/core/platform/ModuleTest.java b/sonar-core/src/test/java/org/sonar/core/platform/ModuleTest.java index ca99fc7767db..d046e9f6982d 100644 --- a/sonar-core/src/test/java/org/sonar/core/platform/ModuleTest.java +++ b/sonar-core/src/test/java/org/sonar/core/platform/ModuleTest.java @@ -71,8 +71,4 @@ protected void configureModule() { assertThat(container.getAddedObjects()).hasSize(2); } - - private static int sizeOf(SpringComponentContainer container) { - return container.context.getBeanDefinitionCount(); - } } diff --git a/sonar-core/src/test/java/org/sonar/core/scadata/DefaultScaDataSourceImplTest.java b/sonar-core/src/test/java/org/sonar/core/scadata/DefaultScaDataSourceImplTest.java index 08c6a38f324c..99a7ccbe959e 100644 --- a/sonar-core/src/test/java/org/sonar/core/scadata/DefaultScaDataSourceImplTest.java +++ b/sonar-core/src/test/java/org/sonar/core/scadata/DefaultScaDataSourceImplTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import java.util.OptionalInt; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; public class DefaultScaDataSourceImplTest { diff --git a/sonar-core/src/test/java/org/sonar/core/util/rule/RuleSetChangedEventTest.java b/sonar-core/src/test/java/org/sonar/core/util/rule/RuleSetChangedEventTest.java index adddebb4aa63..87e6dc659fae 100644 --- a/sonar-core/src/test/java/org/sonar/core/util/rule/RuleSetChangedEventTest.java +++ b/sonar-core/src/test/java/org/sonar/core/util/rule/RuleSetChangedEventTest.java @@ -46,10 +46,4 @@ public void getLanguage_givenBothArraysEmpty_throwException() { assertThatThrownBy(() -> new RuleSetChangedEvent(project, activatedRules, deactivatedRules)) .isInstanceOf(IllegalArgumentException.class); } - - private RuleChange createRuleChange(String language) { - RuleChange ruleChange = new RuleChange(); - ruleChange.setLanguage(language); - return ruleChange; - } } diff --git a/sonar-duplications/src/test/java/org/sonar/duplications/detector/ContainsInComparatorTest.java b/sonar-duplications/src/test/java/org/sonar/duplications/detector/ContainsInComparatorTest.java index 5439c6dedbb9..1f4451607a30 100644 --- a/sonar-duplications/src/test/java/org/sonar/duplications/detector/ContainsInComparatorTest.java +++ b/sonar-duplications/src/test/java/org/sonar/duplications/detector/ContainsInComparatorTest.java @@ -20,7 +20,7 @@ package org.sonar.duplications.detector; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.*; +import static org.junit.Assert.assertThat; import java.util.Comparator; diff --git a/sonar-duplications/src/test/java/org/sonar/duplications/detector/suffixtree/StringText.java b/sonar-duplications/src/test/java/org/sonar/duplications/detector/suffixtree/StringText.java index 70a267dd1ccf..d61b2f4a8c89 100644 --- a/sonar-duplications/src/test/java/org/sonar/duplications/detector/suffixtree/StringText.java +++ b/sonar-duplications/src/test/java/org/sonar/duplications/detector/suffixtree/StringText.java @@ -19,9 +19,6 @@ */ package org.sonar.duplications.detector.suffixtree; -import org.sonar.duplications.detector.suffixtree.AbstractText; -import org.sonar.duplications.detector.suffixtree.Text; - /** * Implementation of {@link Text} based on {@link String}. */ diff --git a/sonar-scanner-engine/src/it/java/org/sonar/scanner/mediumtest/analysisdata/AnalysisDataIT.java b/sonar-scanner-engine/src/it/java/org/sonar/scanner/mediumtest/analysisdata/AnalysisDataIT.java index 94ccedfa9465..4c1a322dd655 100644 --- a/sonar-scanner-engine/src/it/java/org/sonar/scanner/mediumtest/analysisdata/AnalysisDataIT.java +++ b/sonar-scanner-engine/src/it/java/org/sonar/scanner/mediumtest/analysisdata/AnalysisDataIT.java @@ -32,7 +32,6 @@ import org.sonar.scanner.mediumtest.AnalysisResult; import org.sonar.scanner.mediumtest.ScannerMediumTester; import org.sonar.scanner.protocol.output.ScannerReport; -import org.sonar.xoo.Xoo; import org.sonar.xoo.XooPlugin; public class AnalysisDataIT { diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/repository/featureflags/DefaultFeatureFlagsLoaderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/repository/featureflags/DefaultFeatureFlagsLoaderTest.java index 59a73e86f163..6f65cf844d75 100644 --- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/repository/featureflags/DefaultFeatureFlagsLoaderTest.java +++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/repository/featureflags/DefaultFeatureFlagsLoaderTest.java @@ -30,7 +30,6 @@ import org.sonar.scanner.WsTestUtil; import org.sonar.scanner.http.DefaultScannerWsClient; import org.sonar.scanner.scan.branch.BranchConfiguration; -import wiremock.org.apache.hc.core5.http.HttpException; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatException; diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/MockWsResponse.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/MockWsResponse.java index 0d39a6922555..e22c788da394 100644 --- a/sonar-ws/src/main/java/org/sonarqube/ws/client/MockWsResponse.java +++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/MockWsResponse.java @@ -33,7 +33,7 @@ import org.sonarqube.ws.MediaTypes; import static java.util.Objects.requireNonNull; -import static java.util.stream.Collectors.*; +import static java.util.stream.Collectors.toMap; public class MockWsResponse extends BaseResponse {