diff --git a/.cirrus/.cirrus.yml b/.cirrus/.cirrus.yml index 7ec4d710d357..dde7cb0e17cb 100644 --- a/.cirrus/.cirrus.yml +++ b/.cirrus/.cirrus.yml @@ -120,3 +120,18 @@ sq_analysis_task: - .cirrus/cirrus-sq-analysis.sh <<: *CLEANUP_GRADLE_CACHE_SCRIPT <<: *DEFAULT_ARTIFACTS_TEMPLATE + +rewrite_task: + depends_on: junit_task + container: + dockerfile: .cirrus/Dockerfile + cpu: 8 + memory: 10Gb + no_output_timeout: 1.5h +# timeout: 1.5h + <<: *DEFAULT_TEMPLATE + <<: *GRADLE_CACHE_TEMPLATE + script: + - .cirrus/cirrus-rewrite.sh + <<: *CLEANUP_GRADLE_CACHE_SCRIPT + <<: *DEFAULT_ARTIFACTS_TEMPLATE \ No newline at end of file diff --git a/.cirrus/cirrus-rewrite.sh b/.cirrus/cirrus-rewrite.sh new file mode 100755 index 000000000000..0ebed409bf1d --- /dev/null +++ b/.cirrus/cirrus-rewrite.sh @@ -0,0 +1,7 @@ +#!/bin/bash +set -euo pipefail + +source .cirrus/cirrus-env + +./gradlew rewriteDryRun --build-cache -Dorg.gradle.jvmargs=-Xmx8G +# https://docs.openrewrite.org/reference/faq#im-getting-javalangoutofmemoryerror-java-heap-space-when-running-openrewrite diff --git a/build.gradle b/build.gradle index 99cadc2ec9c8..20dd2d482066 100644 --- a/build.gradle +++ b/build.gradle @@ -3,20 +3,23 @@ import org.sonar.build.BlackBoxTest import static org.gradle.api.JavaVersion.VERSION_17 +// Ordered alphabetically plugins { - // Ordered alphabetically + //id 'com.jfrog.artifactory' version '5.2.5' // dont update new version contains a bug 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 - // dont update com.jfrog.artifactory, new version contains a bug - id 'com.jfrog.artifactory' version '5.2.5' - id "de.undercouch.download" version "5.6.0" apply false + id 'com.gradleup.shadow' version '8.3.6' apply false + id 'com.jfrog.artifactory' version '6.0.0' + 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.12.1' apply false id 'org.sonarqube' version '6.2.0.5505' } +apply from: "$rootDir/gradle/rewrite.gradle" + if (!JavaVersion.current().isCompatibleWith(VERSION_17)) { throw new GradleException("JDK 17+ is required to perform this build. It's currently " + System.getProperty("java.home") + ".") } diff --git a/gradle.properties b/gradle.properties index 5bfe64dc9ec0..43bc507c4578 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,19 +1,23 @@ -group=org.sonarsource.sonarqube -version=25.8 -# End Of Life date for the version. MMF-3763. format is yyyy-MM-dd -# 6 months from the release date for non LTA versions # 18 months from the release date for LTA versions +# 6 months from the release date for non LTA versions +# End Of Life date for the version. MMF-3763. format is yyyy-MM-dd # No change required for patch versions -versionEOL=2026-04-01 -pdfreportVersion=2.0.0.263 -pluginApiVersion=13.0.0.3026 +artifactoryUrl=https://repox.jfrog.io/repox description=Open source platform for continuous inspection of code quality -projectTitle=SonarQube -org.gradle.jvmargs=-Xmx2048m +elasticSearchServerVersion=8.16.3 +group=org.sonarsource.sonarqube +jre_release_name=jdk-17.0.13+11 +options.forkOptions.memoryMaximumSize=2g org.gradle.caching=true +org.gradle.jvmargs=-Xmx4g +org.gradle.parallel=true org.gradle.vfs.watch=true -elasticSearchServerVersion=8.16.3 +org.gradle.warning.mode=none +org.gradle.workers.max=2 +pdfreportVersion=2.0.0.263 +pluginApiVersion=13.0.0.3026 +projectTitle=SonarQube projectType=application -artifactoryUrl=https://repox.jfrog.io/repox -jre_release_name=jdk-17.0.13+11 -webappVersion=2025.4.0.23179 +version=25.8 +versionEOL=2026-04-01 +webappVersion=2025.4.0.23179 \ No newline at end of file diff --git a/gradle/rewrite.gradle b/gradle/rewrite.gradle new file mode 100644 index 000000000000..0b6eda3672d7 --- /dev/null +++ b/gradle/rewrite.gradle @@ -0,0 +1,54 @@ +project.apply plugin: "org.openrewrite.rewrite" + +rewrite { + activeRecipe( + "org.openrewrite.gradle.GradleBestPractices", + "org.openrewrite.java.RemoveUnusedImports", + "org.openrewrite.staticanalysis.LowercasePackage", + "org.openrewrite.staticanalysis.ModifierOrder", + "org.openrewrite.staticanalysis.RemoveUnusedLocalVariables", + "org.openrewrite.staticanalysis.RemoveUnusedPrivateFields", + "org.openrewrite.staticanalysis.RemoveUnusedPrivateMethods", + "tech.picnic.errorprone.refasterrules.BugCheckerRulesRecipes", + "tech.picnic.errorprone.refasterrules.SuggestedFixRulesRecipes", + //"org.openrewrite.java.migrate.UpgradeToJava17", + //"org.openrewrite.java.recipes.JavaRecipeBestPractices", + //"org.openrewrite.java.recipes.RecipeNullabilityBestPractices", + //"org.openrewrite.java.recipes.RecipeTestingBestPractices", + //"org.openrewrite.staticanalysis.CodeCleanup", + //"org.openrewrite.staticanalysis.CommonStaticAnalysis", + //"org.openrewrite.staticanalysis.EqualsAvoidsNull", + //"org.openrewrite.staticanalysis.JavaApiBestPractices", + //"org.openrewrite.staticanalysis.MissingOverrideAnnotation", + //"org.openrewrite.staticanalysis.NoFinalizer", + //"org.openrewrite.staticanalysis.UnnecessaryThrows", + //"org.sonar.openrewrite.java.AddLicenseHeader", https://github.com/openrewrite/rewrite/issues/5762 + //"tech.picnic.errorprone.refasterrules.BigDecimalRulesRecipes", + //"tech.picnic.errorprone.refasterrules.CharSequenceRulesRecipes", + //"tech.picnic.errorprone.refasterrules.ClassRulesRecipes", + //"tech.picnic.errorprone.refasterrules.CollectionRulesRecipes", bug + //"tech.picnic.errorprone.refasterrules.ComparatorRulesRecipes", + //"tech.picnic.errorprone.refasterrules.EqualityRulesRecipes", + //"tech.picnic.errorprone.refasterrules.FileRulesRecipes", + //"tech.picnic.errorprone.refasterrules.JUnitRulesRecipes", + //"tech.picnic.errorprone.refasterrules.MicrometerRulesRecipes", + //"tech.picnic.errorprone.refasterrules.NullRulesRecipes", + //"tech.picnic.errorprone.refasterrules.OptionalRulesRecipes", + //"tech.picnic.errorprone.refasterrules.PatternRulesRecipes", + //"tech.picnic.errorprone.refasterrules.PreconditionsRulesRecipes", + //"tech.picnic.errorprone.refasterrules.PrimitiveRulesRecipes", + //"tech.picnic.errorprone.refasterrules.StreamRulesRecipes", + //"tech.picnic.errorprone.refasterrules.StringRulesRecipes", + //"tech.picnic.errorprone.refasterrules.TimeRulesRecipes", + ) + exclusions.add("**DefaultAdminCredentialsVerifierImpl.java") // bug + exportDatatables = true + failOnDryRunResults = true +} + +dependencies { + rewrite("org.openrewrite.recipe:rewrite-migrate-java:3.14.1") + rewrite("org.openrewrite.recipe:rewrite-rewrite:0.10.1") + rewrite("org.openrewrite.recipe:rewrite-static-analysis:2.14.0") + rewrite("org.openrewrite.recipe:rewrite-third-party:0.24.1") +} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 2c3521197d7c..1b33c55baabb 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index dedd5d1e69e6..92510698672a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,8 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531 diff --git a/gradlew b/gradlew index f5feea6d6b11..f3b75f3b0d4f 100755 --- a/gradlew +++ b/gradlew @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/plugins/sonar-education-plugin/src/main/java/org/sonar/education/EducationRulesDefinition.java b/plugins/sonar-education-plugin/src/main/java/org/sonar/education/EducationRulesDefinition.java index 04a38ff5d6e8..b7d35ac04162 100644 --- a/plugins/sonar-education-plugin/src/main/java/org/sonar/education/EducationRulesDefinition.java +++ b/plugins/sonar-education-plugin/src/main/java/org/sonar/education/EducationRulesDefinition.java @@ -40,9 +40,6 @@ public class EducationRulesDefinition implements RulesDefinition { public static final String EDUCATION_RULE_REPOSITORY_KEY = "edu"; public static final String EDUCATION_KEY = "education"; - - private static final String[] ALL_SECTIONS = {INTRODUCTION_SECTION_KEY, ROOT_CAUSE_SECTION_KEY, ASSESS_THE_PROBLEM_SECTION_KEY, - RESOURCES_SECTION_KEY, HOW_TO_FIX_SECTION_KEY}; private static final String IGNORED_FAKE_SECTION = "fake_section_to_be_ignored"; public static final String[] CONTEXTS = {"spring", "hibernate", "apache_commons", "vaadin", "mybatis"}; diff --git a/server/sonar-alm-client/src/test/java/org/sonar/alm/client/github/GithubApplicationClientImplTest.java b/server/sonar-alm-client/src/test/java/org/sonar/alm/client/github/GithubApplicationClientImplTest.java index 11dba5b0200b..5a7598f97cfd 100644 --- a/server/sonar-alm-client/src/test/java/org/sonar/alm/client/github/GithubApplicationClientImplTest.java +++ b/server/sonar-alm-client/src/test/java/org/sonar/alm/client/github/GithubApplicationClientImplTest.java @@ -80,7 +80,6 @@ @RunWith(DataProviderRunner.class) public class GithubApplicationClientImplTest { private static final String ORG_NAME = "ORG_NAME"; - private static final String TEAM_NAME = "team1"; private static final String REPO_NAME = "repo1"; private static final String APP_URL = "https://github.com/"; private static final String REPO_TEAMS_ENDPOINT = "/repos/ORG_NAME/repo1/teams"; diff --git a/server/sonar-auth-github/build.gradle b/server/sonar-auth-github/build.gradle index 363886bb3326..074f5fba6ae7 100644 --- a/server/sonar-auth-github/build.gradle +++ b/server/sonar-auth-github/build.gradle @@ -31,6 +31,7 @@ dependencies { testImplementation project(path: ':server:sonar-webserver-api') testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' + testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.13.4" testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' } 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-auth-github/src/test/java/org/sonar/auth/github/UserIdentityFactoryImplTest.java b/server/sonar-auth-github/src/test/java/org/sonar/auth/github/UserIdentityFactoryImplTest.java index 2b2da45a0c21..00597661cdc6 100644 --- a/server/sonar-auth-github/src/test/java/org/sonar/auth/github/UserIdentityFactoryImplTest.java +++ b/server/sonar-auth-github/src/test/java/org/sonar/auth/github/UserIdentityFactoryImplTest.java @@ -21,16 +21,12 @@ import org.junit.Test; import org.sonar.api.config.PropertyDefinitions; -import org.sonar.api.config.internal.MapSettings; import org.sonar.api.server.authentication.UserIdentity; import org.sonar.api.utils.System2; import static org.assertj.core.api.Assertions.assertThat; public class UserIdentityFactoryImplTest { - - - private MapSettings settings = new MapSettings(new PropertyDefinitions(System2.INSTANCE, GitHubSettings.definitions())); private UserIdentityFactoryImpl underTest = new UserIdentityFactoryImpl(); @Test diff --git a/server/sonar-auth-gitlab/build.gradle b/server/sonar-auth-gitlab/build.gradle index bc6749ecba6b..fbe9916fec27 100644 --- a/server/sonar-auth-gitlab/build.gradle +++ b/server/sonar-auth-gitlab/build.gradle @@ -29,6 +29,7 @@ dependencies { testImplementation 'org.mockito:mockito-junit-jupiter' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' + testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.13.4" testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' } diff --git a/server/sonar-auth-ldap/build.gradle b/server/sonar-auth-ldap/build.gradle index cce816c74540..8d970f615091 100644 --- a/server/sonar-auth-ldap/build.gradle +++ b/server/sonar-auth-ldap/build.gradle @@ -22,6 +22,7 @@ dependencies { testImplementation project(":sonar-testing-ldap") testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' + testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.13.4" testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' } diff --git a/server/sonar-auth-saml/build.gradle b/server/sonar-auth-saml/build.gradle index 997886ddf05d..629e925e13f5 100644 --- a/server/sonar-auth-saml/build.gradle +++ b/server/sonar-auth-saml/build.gradle @@ -27,6 +27,7 @@ dependencies { testImplementation testFixtures(project(':server:sonar-db-dao')) testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' + testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.13.4" testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' } diff --git a/server/sonar-auth-saml/src/main/java/org/sonar/auth/saml/SamlIdentityProvider.java b/server/sonar-auth-saml/src/main/java/org/sonar/auth/saml/SamlIdentityProvider.java index 1b0098a9c558..dff7ceaba5be 100644 --- a/server/sonar-auth-saml/src/main/java/org/sonar/auth/saml/SamlIdentityProvider.java +++ b/server/sonar-auth-saml/src/main/java/org/sonar/auth/saml/SamlIdentityProvider.java @@ -19,7 +19,6 @@ */ package org.sonar.auth.saml; -import java.util.regex.Pattern; import org.sonar.api.server.ServerSide; import org.sonar.api.server.authentication.Display; import org.sonar.api.server.authentication.OAuth2IdentityProvider; @@ -27,8 +26,6 @@ @ServerSide public class SamlIdentityProvider implements OAuth2IdentityProvider { - - private static final Pattern HTTPS_PATTERN = Pattern.compile("https?://"); public static final String KEY = "saml"; public static final String RSA_SHA_256_URL = "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"; 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/build.gradle b/server/sonar-ce-task-projectanalysis/build.gradle index 0e024680b5c6..4f3151a5e75e 100644 --- a/server/sonar-ce-task-projectanalysis/build.gradle +++ b/server/sonar-ce-task-projectanalysis/build.gradle @@ -69,7 +69,8 @@ dependencies { testFixturesCompileOnly 'com.github.spotbugs:spotbugs-annotations' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' - testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' + testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.13.4" + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' } test { diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/component/BranchPersisterImplIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/component/BranchPersisterImplIT.java index c723f1ceab66..f550adead4e8 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/component/BranchPersisterImplIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/component/BranchPersisterImplIT.java @@ -56,9 +56,9 @@ @RunWith(DataProviderRunner.class) public class BranchPersisterImplIT { - private final static Component MAIN = builder(Component.Type.PROJECT, 1, "PROJECT_KEY").setUuid("PROJECT_UUID").setName("p1").build(); - private final static Component BRANCH1 = builder(Component.Type.PROJECT, 2, "BRANCH_KEY").setUuid("BRANCH_UUID").build(); - private final static Component PR1 = builder(Component.Type.PROJECT, 3, "develop").setUuid("PR_UUID").build(); + private static final Component MAIN = builder(Component.Type.PROJECT, 1, "PROJECT_KEY").setUuid("PROJECT_UUID").setName("p1").build(); + private static final Component BRANCH1 = builder(Component.Type.PROJECT, 2, "BRANCH_KEY").setUuid("BRANCH_UUID").build(); + private static final Component PR1 = builder(Component.Type.PROJECT, 3, "develop").setUuid("PR_UUID").build(); private static final Project PROJECT = new Project("PROJECT_UUID", MAIN.getKey(), MAIN.getName(), null, Collections.emptyList()); @Rule diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/component/ProjectPersisterIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/component/ProjectPersisterIT.java index 78d6d551ac63..98b91cd180f5 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/component/ProjectPersisterIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/component/ProjectPersisterIT.java @@ -38,7 +38,7 @@ import static org.sonar.ce.task.projectanalysis.component.ReportComponent.builder; public class ProjectPersisterIT { - private final static Component ROOT = builder(PROJECT, 1) + private static final Component ROOT = builder(PROJECT, 1) .setUuid("PROJECT_UUID") .setKey("PROJECT_KEY") .setDescription("PROJECT_DESC") diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/issue/TrackerReferenceBranchInputFactoryIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/issue/TrackerReferenceBranchInputFactoryIT.java index 867432e7e97a..9a1a3782178b 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/issue/TrackerReferenceBranchInputFactoryIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/issue/TrackerReferenceBranchInputFactoryIT.java @@ -36,8 +36,8 @@ import static org.mockito.Mockito.when; class TrackerReferenceBranchInputFactoryIT { - private final static String COMPONENT_KEY = "file1"; - private final static String COMPONENT_UUID = "uuid1"; + private static final String COMPONENT_KEY = "file1"; + private static final String COMPONENT_UUID = "uuid1"; @RegisterExtension private final DbTester db = DbTester.create(); diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/issue/TrackerSourceBranchInputFactoryIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/issue/TrackerSourceBranchInputFactoryIT.java index dcc34e8fa431..621b7007eed2 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/issue/TrackerSourceBranchInputFactoryIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/issue/TrackerSourceBranchInputFactoryIT.java @@ -35,8 +35,8 @@ import static org.mockito.Mockito.when; public class TrackerSourceBranchInputFactoryIT { - private final static String COMPONENT_KEY = "file1"; - private final static String COMPONENT_UUID = "uuid1"; + private static final String COMPONENT_KEY = "file1"; + private static final String COMPONENT_UUID = "uuid1"; @Rule public DbTester db = DbTester.create(); diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/issue/TrackerTargetBranchInputFactoryIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/issue/TrackerTargetBranchInputFactoryIT.java index 7c3c81d80ed5..0b5a819505a6 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/issue/TrackerTargetBranchInputFactoryIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/issue/TrackerTargetBranchInputFactoryIT.java @@ -38,10 +38,10 @@ import static org.mockito.Mockito.when; public class TrackerTargetBranchInputFactoryIT { - private final static String COMPONENT_KEY = "file1"; - private final static String COMPONENT_UUID = "uuid1"; - private final static String ORIGINAL_COMPONENT_KEY = "file2"; - private final static String ORIGINAL_COMPONENT_UUID = "uuid2"; + private static final String COMPONENT_KEY = "file1"; + private static final String COMPONENT_UUID = "uuid1"; + private static final String ORIGINAL_COMPONENT_KEY = "file2"; + private static final String ORIGINAL_COMPONENT_UUID = "uuid2"; @Rule public DbTester db = DbTester.create(); diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/measure/MeasureRepositoryImplIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/measure/MeasureRepositoryImplIT.java index 034fb6ef3f2e..13b0bbc71ebe 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/measure/MeasureRepositoryImplIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/measure/MeasureRepositoryImplIT.java @@ -75,13 +75,9 @@ public class MeasureRepositoryImplIT { private static final ReportComponent FILE_COMPONENT = ReportComponent.builder(Component.Type.FILE, 1).setKey(FILE_COMPONENT_KEY).build(); private static final ReportComponent OTHER_COMPONENT = ReportComponent.builder(Component.Type.FILE, 2).setKey("some other key").build(); private static final String METRIC_KEY_1 = "metric 1"; - private static final int METRIC_ID_1 = 1; private static final String METRIC_KEY_2 = "metric 2"; - private static final int METRIC_ID_2 = 2; private final Metric metric1 = mock(Metric.class); private final Metric metric2 = mock(Metric.class); - private static final String LAST_ANALYSIS_UUID = "u123"; - private static final String OTHER_ANALYSIS_UUID = "u369"; private static final Measure SOME_MEASURE = Measure.newMeasureBuilder().create("some value"); private static final String SOME_DATA = "some data"; 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/PersistEventsStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistEventsStepIT.java index 44214178c24a..5fa50ab6d3b4 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistEventsStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistEventsStepIT.java @@ -34,7 +34,6 @@ import org.sonar.ce.task.projectanalysis.event.EventRepository; import org.sonar.ce.task.step.ComputationStep; import org.sonar.ce.task.step.TestComputationStepContext; -import org.sonar.core.platform.SonarQubeVersion; import org.sonar.core.util.UuidFactory; import org.sonar.core.util.UuidFactoryImpl; import org.sonar.db.DbTester; @@ -90,8 +89,6 @@ public class PersistEventsStepIT extends BaseStepTest { private final EventRepository eventRepository = mock(EventRepository.class); private final UuidFactory uuidFactory = UuidFactoryImpl.INSTANCE; - private final SonarQubeVersion sonarQubeVersion = mock(); - private PersistEventsStep underTest; @Before 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/it/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepIT/v1/AddAnalysisUuidColumnToDuplicationsIndex.java b/server/sonar-ce-task-projectanalysis/src/it/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepIT/v1/AddAnalysisUuidColumnToDuplicationsIndex.java index dd98a4876f50..859ad7722013 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepIT/v1/AddAnalysisUuidColumnToDuplicationsIndex.java +++ b/server/sonar-ce-task-projectanalysis/src/it/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepIT/v1/AddAnalysisUuidColumnToDuplicationsIndex.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.ce.task.projectanalysis.filemove.FileMoveDetectionStepTest.v1; +package org.sonar.ce.task.projectanalysis.filemove.filemovedetectionsteptest.v1; import java.sql.SQLException; import org.sonar.db.Database; diff --git a/server/sonar-ce-task-projectanalysis/src/it/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepIT/v1/AddComponentUuidColumnToDuplicationsIndex.java b/server/sonar-ce-task-projectanalysis/src/it/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepIT/v1/AddComponentUuidColumnToDuplicationsIndex.java index e0bcaeb4c82b..fa453e77ef41 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepIT/v1/AddComponentUuidColumnToDuplicationsIndex.java +++ b/server/sonar-ce-task-projectanalysis/src/it/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepIT/v1/AddComponentUuidColumnToDuplicationsIndex.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.ce.task.projectanalysis.filemove.FileMoveDetectionStepTest.v1; +package org.sonar.ce.task.projectanalysis.filemove.filemovedetectionsteptest.v1; import java.sql.SQLException; import org.sonar.db.Database; diff --git a/server/sonar-ce-task-projectanalysis/src/it/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepIT/v1/DeleteOrphanDuplicationsIndexRowsWithoutComponent.java b/server/sonar-ce-task-projectanalysis/src/it/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepIT/v1/DeleteOrphanDuplicationsIndexRowsWithoutComponent.java index 05f440ae3846..df94b909e7ac 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepIT/v1/DeleteOrphanDuplicationsIndexRowsWithoutComponent.java +++ b/server/sonar-ce-task-projectanalysis/src/it/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepIT/v1/DeleteOrphanDuplicationsIndexRowsWithoutComponent.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.ce.task.projectanalysis.filemove.FileMoveDetectionStepTest.v1; +package org.sonar.ce.task.projectanalysis.filemove.filemovedetectionsteptest.v1; import java.sql.SQLException; import org.sonar.db.Database; diff --git a/server/sonar-ce-task-projectanalysis/src/it/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepIT/v1/MakeComponentUuidNotNullOnDuplicationsIndex.java b/server/sonar-ce-task-projectanalysis/src/it/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepIT/v1/MakeComponentUuidNotNullOnDuplicationsIndex.java index 53a3dc88ca0b..c78d85e0e821 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepIT/v1/MakeComponentUuidNotNullOnDuplicationsIndex.java +++ b/server/sonar-ce-task-projectanalysis/src/it/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepIT/v1/MakeComponentUuidNotNullOnDuplicationsIndex.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.ce.task.projectanalysis.filemove.FileMoveDetectionStepTest.v1; +package org.sonar.ce.task.projectanalysis.filemove.filemovedetectionsteptest.v1; import java.sql.SQLException; import org.sonar.db.Database; diff --git a/server/sonar-ce-task-projectanalysis/src/it/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepIT/v2/AddComponentUuidAndAnalysisUuidColumnToDuplicationsIndex.java b/server/sonar-ce-task-projectanalysis/src/it/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepIT/v2/AddComponentUuidAndAnalysisUuidColumnToDuplicationsIndex.java index 751fbba8c405..0634daba1014 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepIT/v2/AddComponentUuidAndAnalysisUuidColumnToDuplicationsIndex.java +++ b/server/sonar-ce-task-projectanalysis/src/it/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepIT/v2/AddComponentUuidAndAnalysisUuidColumnToDuplicationsIndex.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.ce.task.projectanalysis.filemove.FileMoveDetectionStepTest.v2; +package org.sonar.ce.task.projectanalysis.filemove.filemovedetectionsteptest.v2; import java.sql.SQLException; import org.sonar.db.Database; diff --git a/server/sonar-ce-task-projectanalysis/src/it/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepIT/v2/MakeComponentUuidAndAnalysisUuidNotNullOnDuplicationsIndex.java b/server/sonar-ce-task-projectanalysis/src/it/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepIT/v2/MakeComponentUuidAndAnalysisUuidNotNullOnDuplicationsIndex.java index abd35d3c9e27..31076a19b9aa 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepIT/v2/MakeComponentUuidAndAnalysisUuidNotNullOnDuplicationsIndex.java +++ b/server/sonar-ce-task-projectanalysis/src/it/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepIT/v2/MakeComponentUuidAndAnalysisUuidNotNullOnDuplicationsIndex.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.ce.task.projectanalysis.filemove.FileMoveDetectionStepTest.v2; +package org.sonar.ce.task.projectanalysis.filemove.filemovedetectionsteptest.v2; import java.sql.SQLException; import org.sonar.db.Database; 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/analysis/AnalysisImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/analysis/AnalysisImplTest.java index a361ee0f77aa..d2e8801e59c1 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/analysis/AnalysisImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/analysis/AnalysisImplTest.java @@ -25,8 +25,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; public class AnalysisImplTest { - - private static final long ID = 10; private static final String UUID = "uuid "; private static final long CREATED_AT = 123456789L; 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/formula/counter/IntSumCounterTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/formula/counter/IntSumCounterTest.java index 42b89b6c8ac1..2135ddb156d0 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/formula/counter/IntSumCounterTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/formula/counter/IntSumCounterTest.java @@ -31,7 +31,7 @@ public class IntSumCounterTest { - private final static String METRIC_KEY = "metric"; + private static final String METRIC_KEY = "metric"; CounterInitializationContext counterInitializationContext = mock(CounterInitializationContext.class); 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/qualityprofile/QualityProfileRuleChangeResolverTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualityprofile/QualityProfileRuleChangeResolverTest.java index 77c68dd0974f..ab425ce5c1b0 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualityprofile/QualityProfileRuleChangeResolverTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualityprofile/QualityProfileRuleChangeResolverTest.java @@ -59,7 +59,7 @@ QualityProfileRuleChangeResolverTest.ExceptionTest.class }) public class QualityProfileRuleChangeResolverTest { - private final static String COMPONENT_UUID = "123"; + private static final String COMPONENT_UUID = "123"; @RunWith(Parameterized.class) public static class TextResolutionTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/NewLinesRepositoryTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/NewLinesRepositoryTest.java index 80fe4262b75c..717f7967e3da 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/NewLinesRepositoryTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/NewLinesRepositoryTest.java @@ -42,7 +42,7 @@ import static org.mockito.Mockito.when; public class NewLinesRepositoryTest { - private final static ReportComponent FILE = ReportComponent.builder(Component.Type.FILE, 1).build(); + private static final ReportComponent FILE = ReportComponent.builder(Component.Type.FILE, 1).build(); @Rule public ScannerReportReaderRule reader = new ScannerReportReaderRule(); 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-ce-task/build.gradle b/server/sonar-ce-task/build.gradle index 146b13989eef..4385a891e416 100644 --- a/server/sonar-ce-task/build.gradle +++ b/server/sonar-ce-task/build.gradle @@ -47,7 +47,8 @@ dependencies { testFixturesCompileOnly 'com.github.spotbugs:spotbugs-annotations' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' - testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' + testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.13.4" + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' } test { diff --git a/server/sonar-ce/build.gradle b/server/sonar-ce/build.gradle index 0e0a7269003d..bd9fb0171e0d 100644 --- a/server/sonar-ce/build.gradle +++ b/server/sonar-ce/build.gradle @@ -39,7 +39,8 @@ dependencies { testImplementation testFixtures(project(':server:sonar-server-common')) testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' - testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' + testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.13.4" + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' } test { diff --git a/server/sonar-ce/src/it/java/org/sonar/ce/analysis/cache/cleaning/AnalysisCacheCleaningSchedulerImplIT.java b/server/sonar-ce/src/it/java/org/sonar/ce/analysis/cache/cleaning/AnalysisCacheCleaningSchedulerImplIT.java index b39d402fded7..ab230826140b 100644 --- a/server/sonar-ce/src/it/java/org/sonar/ce/analysis/cache/cleaning/AnalysisCacheCleaningSchedulerImplIT.java +++ b/server/sonar-ce/src/it/java/org/sonar/ce/analysis/cache/cleaning/AnalysisCacheCleaningSchedulerImplIT.java @@ -45,7 +45,7 @@ public class AnalysisCacheCleaningSchedulerImplIT { private System2 system2 = mock(System2.class); - private final static UuidFactory uuidFactory = new SequenceUuidFactory(); + private static final UuidFactory uuidFactory = new SequenceUuidFactory(); @Rule public DbTester dbTester = DbTester.create(system2); private DbSession dbSession = dbTester.getSession(); diff --git a/server/sonar-ce/src/it/java/org/sonar/ce/taskprocessor/CeWorkerImplIT.java b/server/sonar-ce/src/it/java/org/sonar/ce/taskprocessor/CeWorkerImplIT.java index 979edf48411b..bf38471718ba 100644 --- a/server/sonar-ce/src/it/java/org/sonar/ce/taskprocessor/CeWorkerImplIT.java +++ b/server/sonar-ce/src/it/java/org/sonar/ce/taskprocessor/CeWorkerImplIT.java @@ -772,7 +772,7 @@ private T makeTaskProcessorFail(CeTask task, T t) { return t; } - private static abstract class SimpleCeTaskProcessor implements CeTaskProcessor { + private abstract static class SimpleCeTaskProcessor implements CeTaskProcessor { @Override public Set getHandledCeTaskTypes() { throw new UnsupportedOperationException("getHandledCeTaskTypes should not be called"); diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeProcessingSchedulerImplTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeProcessingSchedulerImplTest.java index 12010118bc9a..64415a12d89c 100644 --- a/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeProcessingSchedulerImplTest.java +++ b/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeProcessingSchedulerImplTest.java @@ -547,7 +547,7 @@ public T invokeAny(Collection> tasks, long timeout, Ti } } - private static abstract class AbstractPartiallyImplementedScheduledFuture extends AbstractPartiallyImplementedFuture implements ScheduledFuture { + private abstract static class AbstractPartiallyImplementedScheduledFuture extends AbstractPartiallyImplementedFuture implements ScheduledFuture { @Override public long getDelay(TimeUnit unit) { throw new UnsupportedOperationException("getDelay(TimeUnit unit) not implemented"); @@ -560,7 +560,7 @@ public int compareTo(Delayed o) { } - private static abstract class AbstractPartiallyImplementedFuture implements Future { + private abstract static class AbstractPartiallyImplementedFuture implements Future { private boolean cancelled = false; @Override diff --git a/server/sonar-db-core/build.gradle b/server/sonar-db-core/build.gradle index af766e406c0e..e56435ac38d7 100644 --- a/server/sonar-db-core/build.gradle +++ b/server/sonar-db-core/build.gradle @@ -33,7 +33,8 @@ dependencies { testImplementation project(':sonar-testing-harness') testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' - testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' + testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.13.4" + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' testRuntimeOnly 'com.h2database:h2' testRuntimeOnly 'com.microsoft.sqlserver:mssql-jdbc' testRuntimeOnly 'com.oracle.database.jdbc:ojdbc11' diff --git a/server/sonar-db-dao/build.gradle b/server/sonar-db-dao/build.gradle index 1fc05084c9cc..0923a2e8834a 100644 --- a/server/sonar-db-dao/build.gradle +++ b/server/sonar-db-dao/build.gradle @@ -40,7 +40,8 @@ dependencies { testRuntimeOnly 'com.microsoft.sqlserver:mssql-jdbc' testRuntimeOnly 'com.oracle.database.jdbc:ojdbc11' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' - testRuntimeOnly 'org.postgresql:postgresql' + testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.13.4" + testRuntimeOnly 'org.postgresql:postgresql' testFixturesApi 'org.junit.jupiter:junit-jupiter-api' testFixturesApi testFixtures(project(':server:sonar-db-core')) 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/component/ProjectLinkDaoIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/component/ProjectLinkDaoIT.java index 25e476a0087f..c3355f5be1c1 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/component/ProjectLinkDaoIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/component/ProjectLinkDaoIT.java @@ -33,8 +33,8 @@ class ProjectLinkDaoIT { - private final static long PAST = 5_000_000_000L; - private final static long NOW = 10_000_000_000L; + private static final long PAST = 5_000_000_000L; + private static final long NOW = 10_000_000_000L; private final System2 system2 = new TestSystem2().setNow(NOW); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/property/PropertiesDaoIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/property/PropertiesDaoIT.java index 05283591dbe0..bb5bfd394857 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/property/PropertiesDaoIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/property/PropertiesDaoIT.java @@ -37,7 +37,6 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; import org.sonar.api.impl.utils.AlwaysIncreasingSystem2; -import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.DbTester; import org.sonar.db.EmailSubscriberDto; @@ -77,8 +76,6 @@ class PropertiesDaoIT { @RegisterExtension private final DbTester db = DbTester.create(system2, auditPersister); - - private final DbClient dbClient = db.getDbClient(); private final DbSession session = db.getSession(); private final PropertiesDao underTest = db.getDbClient().propertiesDao(); 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/it/java/org/sonar/db/report/RegulatoryReportDaoIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/report/RegulatoryReportDaoIT.java index 88440d187a16..d4a7521fadad 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/report/RegulatoryReportDaoIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/report/RegulatoryReportDaoIT.java @@ -43,8 +43,6 @@ class RegulatoryReportDaoIT { private static final String PROJECT_KEY = "prj_key"; private static final String FILE_UUID = "file_uuid"; private static final String FILE_KEY = "file_key"; - private static final String BRANCH_UUID = "branch_uuid"; - private static final String BRANCH_NAME = "branch"; @RegisterExtension private final DbTester db = DbTester.create(System2.INSTANCE); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/scannercache/ScannerAnalysisCacheDaoIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/scannercache/ScannerAnalysisCacheDaoIT.java index 78551c96ab90..ed405494778f 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/scannercache/ScannerAnalysisCacheDaoIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/scannercache/ScannerAnalysisCacheDaoIT.java @@ -47,7 +47,7 @@ class ScannerAnalysisCacheDaoIT { @RegisterExtension private final DbTester dbTester = DbTester.create(System2.INSTANCE); - private final static UuidFactory uuidFactory = new SequenceUuidFactory(); + private static final UuidFactory uuidFactory = new SequenceUuidFactory(); private final DbSession dbSession = dbTester.getSession(); private final ScannerAnalysisCacheDao underTest = dbTester.getDbClient().scannerAnalysisCacheDao(); diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserTokenDaoIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserTokenDaoIT.java index 5c182810c7f6..8a4958b189f7 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserTokenDaoIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserTokenDaoIT.java @@ -24,7 +24,6 @@ import java.time.ZoneOffset; import java.util.List; import java.util.Map; -import java.util.Random; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.sonar.api.utils.System2; @@ -39,8 +38,6 @@ class UserTokenDaoIT { - private final Random random = new SecureRandom(); - @RegisterExtension private final DbTester db = DbTester.create(System2.INSTANCE); 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-dao/src/testFixtures/java/org/sonar/db/component/ComponentTesting.java b/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/component/ComponentTesting.java index 682105f7084f..4acad3a6de3c 100644 --- a/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/component/ComponentTesting.java +++ b/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/component/ComponentTesting.java @@ -72,7 +72,6 @@ public static ComponentDto newFileDto(ComponentDto branch, @Nullable ComponentDt } public static ComponentDto newDependencyDto(ComponentDto branch, String dependencyUuid) { - String name = "NAME_" + dependencyUuid; return newChildComponent(dependencyUuid, branch, branch) .setKey("DEP_KEY_" + dependencyUuid) .setName("NAME_" + dependencyUuid) diff --git a/server/sonar-db-migration/build.gradle b/server/sonar-db-migration/build.gradle index 7e51703034d7..65b4b87a6c93 100644 --- a/server/sonar-db-migration/build.gradle +++ b/server/sonar-db-migration/build.gradle @@ -44,7 +44,8 @@ dependencies { testRuntimeOnly 'com.microsoft.sqlserver:mssql-jdbc' testRuntimeOnly 'com.oracle.database.jdbc:ojdbc11' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' - testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' + testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.13.4" + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' testRuntimeOnly 'org.postgresql:postgresql' } 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-db-migration/src/test/java/org/sonar/server/platform/db/migration/engine/MigrationContainerPopulatorImplTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/engine/MigrationContainerPopulatorImplTest.java index 36ea87745453..47d35889a323 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/engine/MigrationContainerPopulatorImplTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/engine/MigrationContainerPopulatorImplTest.java @@ -96,7 +96,7 @@ public void populateCotnainer_does_not_fail_if_same_class_is_used_for_more_than_ assertThat(migrationContainer.getComponentsByType(MigrationStep3.class)).isNotNull(); } - private static abstract class NoopMigrationStep implements MigrationStep { + private abstract static class NoopMigrationStep implements MigrationStep { @Override public void execute() { throw new UnsupportedOperationException("execute not implemented"); diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/step/MigrationStepRegistryImplTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/step/MigrationStepRegistryImplTest.java index 8cd92e80c0a5..48fa5f310db0 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/step/MigrationStepRegistryImplTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/step/MigrationStepRegistryImplTest.java @@ -105,7 +105,7 @@ private static void verify(RegisteredMigrationStep step, int migrationNUmber, St assertThat(step.getStepClass()).isEqualTo(stepClass); } - private static abstract class NoopMigrationStep implements MigrationStep { + private abstract static class NoopMigrationStep implements MigrationStep { @Override public void execute() { throw new IllegalStateException("execute is not implemented"); diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/step/MigrationStepsExecutorImplTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/step/MigrationStepsExecutorImplTest.java index 0625ecf562fd..9ae6c6bd9c5b 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/step/MigrationStepsExecutorImplTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/step/MigrationStepsExecutorImplTest.java @@ -193,7 +193,7 @@ private static RegisteredMigrationStep registeredStepOf(int migrationNumber, Cla return new RegisteredMigrationStep(migrationNumber, migrationNumber + "-" + migrationStep1Class.getSimpleName(), migrationStep1Class); } - private static abstract class SingleCallCheckerMigrationStep implements MigrationStep { + private abstract static class SingleCallCheckerMigrationStep implements MigrationStep { private static List> calledSteps = new ArrayList<>(); private boolean called = false; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/step/RegisteredMigrationStepTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/step/RegisteredMigrationStepTest.java index 2cf368bc2f1c..d8014cf84d26 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/step/RegisteredMigrationStepTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/step/RegisteredMigrationStepTest.java @@ -48,7 +48,7 @@ public void verify_getters() { assertThat(underTest.getStepClass()).isEqualTo(MyMigrationStep.class); } - private static abstract class MyMigrationStep implements MigrationStep { + private abstract static class MyMigrationStep implements MigrationStep { } } diff --git a/server/sonar-main/src/test/java/org/sonar/application/process/EsManagedProcessTest.java b/server/sonar-main/src/test/java/org/sonar/application/process/EsManagedProcessTest.java index f15106e03811..578039113a6e 100644 --- a/server/sonar-main/src/test/java/org/sonar/application/process/EsManagedProcessTest.java +++ b/server/sonar-main/src/test/java/org/sonar/application/process/EsManagedProcessTest.java @@ -34,8 +34,8 @@ public class EsManagedProcessTest { - private final static int WAIT_FOR_UP_TIMEOUT = 1; - private final static int WAIT_FOR_UP_TIMEOUT_LONG = 2; + private static final int WAIT_FOR_UP_TIMEOUT = 1; + private static final int WAIT_FOR_UP_TIMEOUT_LONG = 2; @Test public void isOperational_should_return_false_if_status_is_unknown() { diff --git a/server/sonar-process/build.gradle b/server/sonar-process/build.gradle index 543bca3f05b9..38fa279041bb 100644 --- a/server/sonar-process/build.gradle +++ b/server/sonar-process/build.gradle @@ -36,7 +36,8 @@ dependencies { testImplementation project(':sonar-testing-harness') testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' - testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' + testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.13.4" + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' } test { 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/build.gradle b/server/sonar-server-common/build.gradle index 5533700fdaca..fa1b62e6cff0 100644 --- a/server/sonar-server-common/build.gradle +++ b/server/sonar-server-common/build.gradle @@ -70,7 +70,8 @@ dependencies { testFixturesImplementation 'org.junit.jupiter:junit-jupiter-api' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' - testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' + testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.13.4" + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' } test { diff --git a/server/sonar-server-common/src/it/java/org/sonar/server/setting/ProjectConfigurationLoaderImplIT.java b/server/sonar-server-common/src/it/java/org/sonar/server/setting/ProjectConfigurationLoaderImplIT.java index 54419f8489bd..0805004eaf8e 100644 --- a/server/sonar-server-common/src/it/java/org/sonar/server/setting/ProjectConfigurationLoaderImplIT.java +++ b/server/sonar-server-common/src/it/java/org/sonar/server/setting/ProjectConfigurationLoaderImplIT.java @@ -34,15 +34,15 @@ public class ProjectConfigurationLoaderImplIT { @Rule public DbTester db = DbTester.create(); - private final static String GLOBAL_PROP_KEY = "GLOBAL_PROP_KEY"; - private final static String GLOBAL_PROP_VALUE = "GLOBAL_PROP_VALUE"; - private final static String MAIN_BRANCH_PROP_KEY = "MAIN_BRANCH_PROP_KEY"; - private final static String MAIN_BRANCH_PROP_VALUE = "MAIN_BRANCH_PROP_VALUE"; - private final static String BRANCH_PROP_KEY = "BRANCH_PROP_KEY"; - private final static String BRANCH_PROP_VALUE = "BRANCH_PROP_VALUE"; - - private final static String MAIN_BRANCH_UUID = "MAIN_BRANCH_UUID"; - private final static String BRANCH_UUID = "BRANCH_UUID"; + private static final String GLOBAL_PROP_KEY = "GLOBAL_PROP_KEY"; + private static final String GLOBAL_PROP_VALUE = "GLOBAL_PROP_VALUE"; + private static final String MAIN_BRANCH_PROP_KEY = "MAIN_BRANCH_PROP_KEY"; + private static final String MAIN_BRANCH_PROP_VALUE = "MAIN_BRANCH_PROP_VALUE"; + private static final String BRANCH_PROP_KEY = "BRANCH_PROP_KEY"; + private static final String BRANCH_PROP_VALUE = "BRANCH_PROP_VALUE"; + + private static final String MAIN_BRANCH_UUID = "MAIN_BRANCH_UUID"; + private static final String BRANCH_UUID = "BRANCH_UUID"; private final MapSettings globalSettings = new MapSettings(); private ProjectConfigurationLoaderImpl underTest; diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/es/EsClientTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/es/EsClientTest.java index b840015ff862..0084981fd865 100644 --- a/server/sonar-server-common/src/test/java/org/sonar/server/es/EsClientTest.java +++ b/server/sonar-server-common/src/test/java/org/sonar/server/es/EsClientTest.java @@ -94,7 +94,7 @@ public class EsClientTest { " }" + "}"; - private final static String EXAMPLE_NODE_STATS_JSON = "{" + + private static final String EXAMPLE_NODE_STATS_JSON = "{" + " \"nodes\": {" + " \"YnKPZcbGRamRQGxjErLWoQ\": {" + " \"name\": \"sonarqube\"," + diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/es/response/NodeStatsResponseTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/es/response/NodeStatsResponseTest.java index 36a575689a46..090308b93970 100644 --- a/server/sonar-server-common/src/test/java/org/sonar/server/es/response/NodeStatsResponseTest.java +++ b/server/sonar-server-common/src/test/java/org/sonar/server/es/response/NodeStatsResponseTest.java @@ -26,7 +26,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class NodeStatsResponseTest { - private final static String EXAMPLE_JSON = "{" + + private static final String EXAMPLE_JSON = "{" + " \"nodes\": {" + " \"YnKPZcbGRamRQGxjErLWoQ\": {" + " \"name\": \"sonarqube\"," + diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/es/searchrequest/RequestFiltersComputerTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/es/searchrequest/RequestFiltersComputerTest.java index 1b5a7da771b5..dbdc15819b62 100644 --- a/server/sonar-server-common/src/test/java/org/sonar/server/es/searchrequest/RequestFiltersComputerTest.java +++ b/server/sonar-server-common/src/test/java/org/sonar/server/es/searchrequest/RequestFiltersComputerTest.java @@ -258,7 +258,6 @@ public void filters_on_nestedField_of_sticky_TopAggregation_go_to_PostFilters_an QueryBuilder filterField4 = newQuery(); allFilters.addFilter("filter_field4", filterScopeField4, filterField4); // has top-aggs by no filter - String field5 = "field5"; NestedFieldTopAggregationDefinition stickyTopAggField5 = newNestedFieldTopAggDef(field1, nestField, nestField_value5, STICKY); NestedFieldTopAggregationDefinition nonStickyTopAggField5 = newNestedFieldTopAggDef(field1, nestField, nestField_value5, NON_STICKY); Set> declaredTopAggregations = ImmutableSet.of( 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..cc1fdde97229 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; @@ -68,7 +66,6 @@ @RunWith(DataProviderRunner.class) public class ChangesOnMyIssueNotificationHandlerTest { private static final String CHANGE_ON_MY_ISSUES_DISPATCHER_KEY = "ChangesOnMyIssue"; - private static final String NO_CHANGE_AUTHOR = null; private NotificationManager notificationManager = mock(NotificationManager.class); private EmailNotificationChannel emailNotificationChannel = mock(EmailNotificationChannel.class); @@ -440,16 +437,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-statemachine/build.gradle b/server/sonar-statemachine/build.gradle index d15abf7c90d5..233d6eeaf107 100644 --- a/server/sonar-statemachine/build.gradle +++ b/server/sonar-statemachine/build.gradle @@ -20,7 +20,8 @@ dependencies { testImplementation 'org.mockito:mockito-junit-jupiter' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' - testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' + testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.13.4" + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' } test { diff --git a/server/sonar-telemetry-core/build.gradle b/server/sonar-telemetry-core/build.gradle index 7ae81051fd70..7c6cdea9639d 100644 --- a/server/sonar-telemetry-core/build.gradle +++ b/server/sonar-telemetry-core/build.gradle @@ -21,6 +21,7 @@ dependencies { testImplementation 'org.mockito:mockito-core' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' + testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.13.4" } tasks.test { diff --git a/server/sonar-telemetry/build.gradle b/server/sonar-telemetry/build.gradle index 63ebe5fe9570..c028ba0fe473 100644 --- a/server/sonar-telemetry/build.gradle +++ b/server/sonar-telemetry/build.gradle @@ -27,6 +27,7 @@ dependencies { testImplementation testFixtures(project(':server:sonar-server-common')) testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' + testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.13.4" } tasks.test { 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/build.gradle b/server/sonar-webserver-auth/build.gradle index c7067302c766..cc971a04e1f9 100644 --- a/server/sonar-webserver-auth/build.gradle +++ b/server/sonar-webserver-auth/build.gradle @@ -44,7 +44,8 @@ dependencies { testFixturesCompileOnly 'org.junit.jupiter:junit-jupiter-api' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' - testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' + testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.13.4" + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' } test { 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/test/java/org/sonar/server/authentication/OAuth2CallbackFilterTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/OAuth2CallbackFilterTest.java index 69a847a74806..fddcfe9a117f 100644 --- a/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/OAuth2CallbackFilterTest.java +++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/OAuth2CallbackFilterTest.java @@ -250,7 +250,7 @@ public void callback(CallbackContext context) { } } - private static abstract class FailingIdentityProvider extends TestIdentityProvider implements OAuth2IdentityProvider { + private abstract static class FailingIdentityProvider extends TestIdentityProvider implements OAuth2IdentityProvider { FailingIdentityProvider() { this.setKey("failing"); this.setName("Failing"); 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/build.gradle b/server/sonar-webserver-common/build.gradle index 38b5f22e1ab5..0feaa0a7f9ae 100644 --- a/server/sonar-webserver-common/build.gradle +++ b/server/sonar-webserver-common/build.gradle @@ -38,7 +38,8 @@ dependencies { testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' - testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' + testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.13.4" + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' } test { 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-core/build.gradle b/server/sonar-webserver-core/build.gradle index 99ab89c9f2d6..2d711541ca7f 100644 --- a/server/sonar-webserver-core/build.gradle +++ b/server/sonar-webserver-core/build.gradle @@ -78,7 +78,8 @@ dependencies { testImplementation project(':sonar-testing-harness') testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' - testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' + testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.13.4" + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' runtimeOnly 'io.jsonwebtoken:jjwt-jackson' } diff --git a/server/sonar-webserver-es/build.gradle b/server/sonar-webserver-es/build.gradle index d51c2b4f16bb..fe09cbdc66fd 100644 --- a/server/sonar-webserver-es/build.gradle +++ b/server/sonar-webserver-es/build.gradle @@ -30,7 +30,7 @@ dependencies { testFixturesApi testFixtures(project(':server:sonar-server-common')) testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' - testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' + testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.13.4" } test { diff --git a/server/sonar-webserver-es/src/test/java/org/sonar/server/es/IndexCreatorTest.java b/server/sonar-webserver-es/src/test/java/org/sonar/server/es/IndexCreatorTest.java index 63d9c80e39a3..3cb909cd2fe3 100644 --- a/server/sonar-webserver-es/src/test/java/org/sonar/server/es/IndexCreatorTest.java +++ b/server/sonar-webserver-es/src/test/java/org/sonar/server/es/IndexCreatorTest.java @@ -60,7 +60,6 @@ public class IndexCreatorTest { private final MetadataIndexDefinition metadataIndexDefinition = new MetadataIndexDefinition(new MapSettings().asConfig()); private final MetadataIndex metadataIndex = new MetadataIndexImpl(es.client()); private final TestEsDbCompatibility esDbCompatibility = new TestEsDbCompatibility(); - private final MapSettings settings = new MapSettings(); @Test public void create_index() { 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-monitoring/build.gradle b/server/sonar-webserver-monitoring/build.gradle index d5fe638db08e..d274b4866139 100644 --- a/server/sonar-webserver-monitoring/build.gradle +++ b/server/sonar-webserver-monitoring/build.gradle @@ -16,6 +16,7 @@ dependencies { testImplementation 'org.sonarsource.api.plugin:sonar-plugin-api-test-fixtures' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' + testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.13.4" testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' } diff --git a/server/sonar-webserver-pushapi/build.gradle b/server/sonar-webserver-pushapi/build.gradle index b21b754052d0..e71f15d06364 100644 --- a/server/sonar-webserver-pushapi/build.gradle +++ b/server/sonar-webserver-pushapi/build.gradle @@ -23,6 +23,7 @@ dependencies { testFixturesCompileOnly testFixtures(project(':server:sonar-webserver-ws')) testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' + testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.13.4" testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' } diff --git a/server/sonar-webserver-pushapi/src/test/java/org/sonar/server/pushapi/sonarlint/SonarLintClientPermissionsValidatorTest.java b/server/sonar-webserver-pushapi/src/test/java/org/sonar/server/pushapi/sonarlint/SonarLintClientPermissionsValidatorTest.java index 776bb3c071cd..51584d1f0ac5 100644 --- a/server/sonar-webserver-pushapi/src/test/java/org/sonar/server/pushapi/sonarlint/SonarLintClientPermissionsValidatorTest.java +++ b/server/sonar-webserver-pushapi/src/test/java/org/sonar/server/pushapi/sonarlint/SonarLintClientPermissionsValidatorTest.java @@ -41,7 +41,7 @@ public class SonarLintClientPermissionsValidatorTest { - private final static String USER_UUID = "USER_UUID"; + private static final String USER_UUID = "USER_UUID"; private final Set exampleProjectuuids = Set.of("project1", "project2"); private final List projectDtos = List.of(mock(ProjectDto.class), mock(ProjectDto.class)); diff --git a/server/sonar-webserver-webapi-v2/build.gradle b/server/sonar-webserver-webapi-v2/build.gradle index fb7b4af92e14..6bc9bf01aed0 100644 --- a/server/sonar-webserver-webapi-v2/build.gradle +++ b/server/sonar-webserver-webapi-v2/build.gradle @@ -30,6 +30,7 @@ dependencies { testRuntimeOnly 'org.apache.logging.log4j:log4j-core' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' + testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.13.4" testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' } diff --git a/server/sonar-webserver-webapi-v2/src/test/java/org/sonar/server/v2/common/DeprecatedHandlerTest.java b/server/sonar-webserver-webapi-v2/src/test/java/org/sonar/server/v2/common/DeprecatedHandlerTest.java index ae9136ece1df..b92e754d0f77 100644 --- a/server/sonar-webserver-webapi-v2/src/test/java/org/sonar/server/v2/common/DeprecatedHandlerTest.java +++ b/server/sonar-webserver-webapi-v2/src/test/java/org/sonar/server/v2/common/DeprecatedHandlerTest.java @@ -196,7 +196,6 @@ void notDeprecatedPost(@RequestBody Object request) { private static class GetRequest { @Deprecated(since = DEPRECATED_VERSION) private String deprecatedField; - private String notDeprecatedField; } private record UserSessionData(boolean isLoggedIn, boolean isAuthenticatedBrowserSession) { diff --git a/server/sonar-webserver-webapi/build.gradle b/server/sonar-webserver-webapi/build.gradle index 2ce5ac6dde76..ba116f29c146 100644 --- a/server/sonar-webserver-webapi/build.gradle +++ b/server/sonar-webserver-webapi/build.gradle @@ -57,7 +57,8 @@ dependencies { testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' - testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' + testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.13.4" + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' } test { // Enabling the JUnit Platform (see https://github.com/junit-team/junit5-samples/tree/master/junit5-migration-gradle) diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/SearchActionFacetsIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/SearchActionFacetsIT.java index 6249b00a8295..109bb8068bd6 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/SearchActionFacetsIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/SearchActionFacetsIT.java @@ -70,9 +70,6 @@ class SearchActionFacetsIT { - private static final String[] ISSUE_STATUSES = Issue.STATUSES.stream().filter(s -> !Issue.STATUS_TO_REVIEW.equals(s)).filter(s -> !Issue.STATUS_REVIEWED.equals(s)) - .toArray(String[]::new); - @RegisterExtension private final UserSessionRule userSession = standalone(); @RegisterExtension 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/projectdump/ws/StatusActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/projectdump/ws/StatusActionIT.java index 87d3f266ffb8..db4bd0707fbf 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/projectdump/ws/StatusActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/projectdump/ws/StatusActionIT.java @@ -69,9 +69,9 @@ public class StatusActionIT { private final DbSession dbSession = db.getSession(); private final ComponentTypesRule resourceTypes = new ComponentTypesRule().setRootQualifiers(PROJECT); - private final static String projectDumpsDirectoryPathname = "data/governance/project_dumps/"; - private final static String importDirectoryPathname = Paths.get(projectDumpsDirectoryPathname, "import").toString(); - private final static String exportDirectoryPathname = Paths.get(projectDumpsDirectoryPathname, "export").toString(); + private static final String projectDumpsDirectoryPathname = "data/governance/project_dumps/"; + private static final String importDirectoryPathname = Paths.get(projectDumpsDirectoryPathname, "import").toString(); + private static final String exportDirectoryPathname = Paths.get(projectDumpsDirectoryPathname, "export").toString(); private ProjectDto project; diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualityprofile/QProfileCopierIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualityprofile/QProfileCopierIT.java index b7c7c5e626ab..266813b160a1 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualityprofile/QProfileCopierIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualityprofile/QProfileCopierIT.java @@ -41,8 +41,6 @@ import static org.mockito.Mockito.verifyNoInteractions; public class QProfileCopierIT { - - private static final String BACKUP = ""; private final System2 system2 = new AlwaysIncreasingSystem2(); @Rule diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualityprofile/builtin/RuleActivatorIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualityprofile/builtin/RuleActivatorIT.java index 363005b4f4e2..85ca0651f840 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualityprofile/builtin/RuleActivatorIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualityprofile/builtin/RuleActivatorIT.java @@ -50,7 +50,6 @@ import org.sonar.db.rule.RuleImpactChangeDto; import org.sonar.db.rule.RuleParamDto; import org.sonar.server.exceptions.BadRequestException; -import org.sonar.server.pushapi.qualityprofile.QualityProfileChangeEventService; import org.sonar.server.qualityprofile.ActiveRuleChange; import org.sonar.server.qualityprofile.ActiveRuleInheritance; import org.sonar.server.qualityprofile.RuleActivation; @@ -90,8 +89,6 @@ class RuleActivatorIT { private static final long PAST = NOW - 100; private final System2 system2 = new TestSystem2().setNow(NOW); private final TypeValidations typeValidations = new TypeValidations(asList(new StringTypeValidation(), new IntegerTypeValidation())); - - private final QualityProfileChangeEventService qualityProfileChangeEventService = mock(QualityProfileChangeEventService.class); private final SonarQubeVersion sonarQubeVersion = new SonarQubeVersion(Version.create(10, 3)); private final RuleActivator underTest = new RuleActivator(system2, db.getDbClient(), UuidFactoryImpl.INSTANCE, typeValidations, userSession, mock(Configuration.class), sonarQubeVersion); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualityprofile/ws/ShowActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualityprofile/ws/ShowActionIT.java index db94690617ca..95959f61909e 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualityprofile/ws/ShowActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualityprofile/ws/ShowActionIT.java @@ -57,9 +57,9 @@ @RunWith(DataProviderRunner.class) public class ShowActionIT { - private final static Language XOO1 = newLanguage("xoo1"); - private final static Language XOO2 = newLanguage("xoo2"); - private final static Languages LANGUAGES = new Languages(XOO1, XOO2); + private static final Language XOO1 = newLanguage("xoo1"); + private static final Language XOO2 = newLanguage("xoo2"); + private static final Languages LANGUAGES = new Languages(XOO1, XOO2); @Rule public EsTester es = EsTester.create(); 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/it/java/org/sonar/server/user/ws/UpdateIdentityProviderActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/user/ws/UpdateIdentityProviderActionIT.java index 291b5aa1af9f..e7c778949fd9 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/user/ws/UpdateIdentityProviderActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/user/ws/UpdateIdentityProviderActionIT.java @@ -51,7 +51,7 @@ import static org.sonar.db.user.UserTesting.newUserDto; public class UpdateIdentityProviderActionIT { - private final static String SQ_AUTHORITY = "sonarqube"; + private static final String SQ_AUTHORITY = "sonarqube"; @Rule public IdentityProviderRepositoryRule identityProviderRepository = new IdentityProviderRepositoryRule() diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/language/ws/ListActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/language/ws/ListActionTest.java index 993137b9b134..b8a19e924553 100644 --- a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/language/ws/ListActionTest.java +++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/language/ws/ListActionTest.java @@ -88,7 +88,7 @@ public void filter_escapes_the_user_query() { .execute().assertJson(EMPTY_JSON_RESPONSE); } - static abstract class TestLanguage extends AbstractLanguage { + abstract static class TestLanguage extends AbstractLanguage { TestLanguage(String key, String language) { super(key, language); } diff --git a/server/sonar-webserver/build.gradle b/server/sonar-webserver/build.gradle index b0c69ed86da1..b35e4f373042 100644 --- a/server/sonar-webserver/build.gradle +++ b/server/sonar-webserver/build.gradle @@ -44,7 +44,8 @@ dependencies { testImplementation project(':sonar-testing-harness') testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' - testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' + testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.13.4" + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' } test { diff --git a/sonar-application/bundled_plugins.gradle b/sonar-application/bundled_plugins.gradle index 2e060e4d1084..24a800519501 100644 --- a/sonar-application/bundled_plugins.gradle +++ b/sonar-application/bundled_plugins.gradle @@ -7,7 +7,7 @@ dependencies { bundledPlugin 'org.sonarsource.java:sonar-java-plugin' bundledPlugin 'org.sonarsource.java:sonar-java-symbolic-execution-plugin' bundledPlugin 'org.sonarsource.jacoco:sonar-jacoco-plugin' - bundledPlugin (group: 'org.sonarsource.javascript', name: 'sonar-javascript-plugin', classifier:'multi') + bundledPlugin ("org.sonarsource.javascript:sonar-javascript-plugin::multi") bundledPlugin 'org.sonarsource.php:sonar-php-plugin' bundledPlugin 'org.sonarsource.plugins.cayc:sonar-cayc-plugin' bundledPlugin 'org.sonarsource.python:sonar-python-plugin' diff --git a/sonar-core/build.gradle b/sonar-core/build.gradle index 8406f2f1e08d..ad06ba7cf55f 100644 --- a/sonar-core/build.gradle +++ b/sonar-core/build.gradle @@ -39,7 +39,7 @@ dependencies { testCompileOnly 'com.github.spotbugs:spotbugs-annotations' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' - testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' + testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.13.4" } // Used by sonar-db-core to run DB Unit Tests 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-plugin-api-impl/build.gradle b/sonar-plugin-api-impl/build.gradle index 978379e5f13a..3dc6eabdb07c 100644 --- a/sonar-plugin-api-impl/build.gradle +++ b/sonar-plugin-api-impl/build.gradle @@ -28,7 +28,8 @@ dependencies { testImplementation 'org.sonarsource.api.plugin:sonar-plugin-api-test-fixtures' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' - testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' + testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.13.4" + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' } import org.apache.tools.ant.filters.ReplaceTokens diff --git a/sonar-plugin-api-impl/src/test/java/org/sonar/api/batch/sensor/issue/internal/DefaultIssueTest.java b/sonar-plugin-api-impl/src/test/java/org/sonar/api/batch/sensor/issue/internal/DefaultIssueTest.java index 39f79c37741c..5f0f4a492705 100644 --- a/sonar-plugin-api-impl/src/test/java/org/sonar/api/batch/sensor/issue/internal/DefaultIssueTest.java +++ b/sonar-plugin-api-impl/src/test/java/org/sonar/api/batch/sensor/issue/internal/DefaultIssueTest.java @@ -61,8 +61,6 @@ public class DefaultIssueTest { .build(); private DefaultInputProject project; - private final NewQuickFix quickFix = mock(NewQuickFix.class); - @Before public void prepare() throws IOException { project = new DefaultInputProject(ProjectDefinition.create() 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/cache/DefaultAnalysisCacheLoaderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/cache/DefaultAnalysisCacheLoaderTest.java index 757b898b2097..418cfc94e560 100644 --- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/cache/DefaultAnalysisCacheLoaderTest.java +++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/cache/DefaultAnalysisCacheLoaderTest.java @@ -52,7 +52,7 @@ import static org.sonar.scanner.cache.DefaultAnalysisCacheLoader.CONTENT_ENCODING; public class DefaultAnalysisCacheLoaderTest { - private final static SensorCacheEntry MSG = SensorCacheEntry.newBuilder() + private static final SensorCacheEntry MSG = SensorCacheEntry.newBuilder() .setKey("key") .setData(ByteString.copyFrom("value", StandardCharsets.UTF_8)) .build(); diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/repository/DefaultProjectRepositoriesLoaderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/repository/DefaultProjectRepositoriesLoaderTest.java index dac5c93c71a8..ff0b254944b4 100644 --- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/repository/DefaultProjectRepositoriesLoaderTest.java +++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/repository/DefaultProjectRepositoriesLoaderTest.java @@ -42,7 +42,7 @@ import static org.mockito.Mockito.when; public class DefaultProjectRepositoriesLoaderTest { - private final static String PROJECT_KEY = "foo?"; + private static final String PROJECT_KEY = "foo?"; private DefaultProjectRepositoriesLoader loader; private DefaultScannerWsClient wsClient; diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/repository/ReferenceBranchSupplierTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/repository/ReferenceBranchSupplierTest.java index 7f242dd2d5d5..96e89cb50016 100644 --- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/repository/ReferenceBranchSupplierTest.java +++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/repository/ReferenceBranchSupplierTest.java @@ -41,9 +41,9 @@ import static org.mockito.Mockito.when; public class ReferenceBranchSupplierTest { - private final static String PROJECT_KEY = "project"; - private final static String BRANCH_KEY = "branch"; - private final static Path BASE_DIR = Paths.get("root"); + private static final String PROJECT_KEY = "project"; + private static final String BRANCH_KEY = "branch"; + private static final Path BASE_DIR = Paths.get("root"); private final NewCodePeriodLoader newCodePeriodLoader = mock(NewCodePeriodLoader.class); private final BranchConfiguration branchConfiguration = mock(BranchConfiguration.class); 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-scanner-engine/src/test/java/org/sonar/scanner/scan/ModuleConfigurationProviderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/ModuleConfigurationProviderTest.java index 338d553629dd..714c4c9a42fd 100644 --- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/ModuleConfigurationProviderTest.java +++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/ModuleConfigurationProviderTest.java @@ -43,14 +43,11 @@ public class ModuleConfigurationProviderTest { private static final String GLOBAL_KEY_PROPERTIES_1 = "sonar.global.key1"; private static final String NON_GLOBAL_KEY_PROPERTIES_1 = "sonar.key1"; - private static final String DEFAULT_KEY_PROPERTIES_1 = "default.key1"; private static final String GLOBAL_VALUE_PROPERTIES_1 = "Value for " + GLOBAL_KEY_PROPERTIES_1; private static final String NON_GLOBAL_VALUE_PROPERTIES_1 = "Value for " + NON_GLOBAL_KEY_PROPERTIES_1; - private static final String DEFAULT_VALUE_1 = "Value for " + DEFAULT_KEY_PROPERTIES_1; private static final Map GLOBAL_SERVER_PROPERTIES = Map.of(GLOBAL_KEY_PROPERTIES_1, GLOBAL_VALUE_PROPERTIES_1); private static final Map PROJECT_SERVER_PROPERTIES = Map.of(NON_GLOBAL_KEY_PROPERTIES_1, NON_GLOBAL_VALUE_PROPERTIES_1); - private static final Map DEFAULT_PROJECT_PROPERTIES = Map.of(DEFAULT_KEY_PROPERTIES_1, DEFAULT_VALUE_1); private static final Map ALL_PROPERTIES_MAP = Stream.of(GLOBAL_SERVER_PROPERTIES, PROJECT_SERVER_PROPERTIES) diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/scanner/cpd/ManyStatements.java b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/cpd/ManyStatements.java index ed2297068e44..99494a50618d 100644 --- a/sonar-scanner-engine/src/test/resources/org/sonar/scanner/cpd/ManyStatements.java +++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/cpd/ManyStatements.java @@ -2,10 +2,7 @@ public class ManyStatements { - void foo() { - int A1 = 0; int B = 0; int C = 0; int D = 0; int E = 0; int F = 0; int G = 0; int H = 0; int I = 0; int J = 0; int K = 0; - int A2 = 0; int B = 0; int C = 0; int D = 0; int E = 0; int F = 0; int G = 0; int H = 0; int I = 0; int J = 0; int K = 0; - int A1 = 0; int B = 0; int C = 0; int D = 0; int E = 0; int F = 0; int G = 0; int H = 0; int I = 0; int J = 0; int K = 0; + void foo() { } } \ No newline at end of file diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/simple-project-with-build-dir/sources/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/simple-project-with-build-dir/sources/Fake.java index aee03e60b4a2..ed6d97dd6f75 100644 --- a/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/simple-project-with-build-dir/sources/Fake.java +++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/simple-project-with-build-dir/sources/Fake.java @@ -1,3 +1,3 @@ -package org.sonar.runner.batch.ProjectReactorBuilderTest.simple; +package org.sonar.runner.batch.projectreactorbuildertest.simple; class Fake {} diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/simple-project-with-lib-dir/sources/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/simple-project-with-lib-dir/sources/Fake.java index aee03e60b4a2..ed6d97dd6f75 100644 --- a/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/simple-project-with-lib-dir/sources/Fake.java +++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/simple-project-with-lib-dir/sources/Fake.java @@ -1,3 +1,3 @@ -package org.sonar.runner.batch.ProjectReactorBuilderTest.simple; +package org.sonar.runner.batch.projectreactorbuildertest.simple; class Fake {} diff --git a/sonar-scanner-protocol/build.gradle b/sonar-scanner-protocol/build.gradle index 4402ce004ecd..3f4a990a9fb7 100644 --- a/sonar-scanner-protocol/build.gradle +++ b/sonar-scanner-protocol/build.gradle @@ -22,7 +22,8 @@ dependencies { testImplementation 'org.assertj:assertj-core' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' - testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' + testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.13.4" + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' } test { 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 { diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/issues/SearchRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/issues/SearchRequest.java index 85048f7836f7..46fc0385dd00 100644 --- a/sonar-ws/src/main/java/org/sonarqube/ws/client/issues/SearchRequest.java +++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/issues/SearchRequest.java @@ -44,7 +44,6 @@ public class SearchRequest { private String createdInLast; private List cwe; private List directories; - private String facetMode; private List facets; private List fileUuids; private List issues;