Fix quality gate issues

Author: leonardo-pilastri-sonarsource

its/ruling/src/test/java/org/sonar/java/it/JavaRulingTest.java

@@ -29,7 +29,6 @@
 import com.sonar.orchestrator.locator.MavenLocation;
 import java.io.File;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -92,7 +91,8 @@ public static void afterAllAnalysis() throws IOException {
   public static void prepare() throws Exception {
     Set<String> result = new HashSet<>();
     List<String> extraNonDefaultRules = List.of("S3546", "S6374");
-    ProfileGenerator.generate(ORCHESTRATOR, "Sonar Way", ImmutableMap.of(), new HashSet<>(), SUBSET_OF_ENABLED_RULES, result, extraNonDefaultRules);
+    ProfileGenerator.generate(ORCHESTRATOR, "Sonar Way", ImmutableMap.of(), new HashSet<>(), SUBSET_OF_ENABLED_RULES, result,
+      extraNonDefaultRules);
     assertThat(result).hasSize(23); // ALL symbolic-execution rules
 
     Path allRulesFolder = Paths.get("src/test/resources");
@@ -123,7 +123,7 @@ private static void copyFile(Path source, Path targetDir) {
     try {
       Files.copy(source, targetDir.resolve(source.getFileName()), StandardCopyOption.REPLACE_EXISTING);
     } catch (IOException e) {
-      throw new IllegalStateException("Unable to copy file: " + source.toString());
+      throw new IllegalStateException("Unable to copy file: " + source);
     }
   }
 
@@ -143,16 +143,15 @@ public void guava() throws Exception {
 
   @Test
   public void eclipse_jetty() throws Exception {
-    List<String> dirs = Arrays.asList("jetty-http/", "jetty-io/", "jetty-jmx/", "jetty-server/", "jetty-slf4j-impl/", "jetty-util/", "jetty-util-ajax/", "jetty-xml/", "tests" +
+    List<String> dirs = Arrays.asList("jetty-http/", "jetty-io/", "jetty-jmx/", "jetty-server/", "jetty-slf4j-impl/", "jetty-util/",
+      "jetty-util-ajax/", "jetty-xml/", "tests" +
       "/jetty-http-tools/");
 
     String mainBranchSourceCode = "eclipse-jetty";
     String mainBinaries = dirs.stream().map(dir -> FileLocation.of("../sources/" + mainBranchSourceCode + "/" + dir + "target/classes"))
       .map(JavaRulingTest::getFileLocationAbsolutePath)
       .collect(Collectors.joining(","));
 
-    final var mainBranch = "eclipse-jetty-main";
-
     MavenBuild branchBuild = test_project("org.eclipse.jetty:jetty-project", mainBranchSourceCode)
       // re-define binaries from initial maven build
       .setProperty("sonar.java.binaries", mainBinaries)
@@ -234,15 +233,6 @@ private static MavenBuild test_project(String projectKey, @Nullable String path,
     return mavenBuild;
   }
 
-  private static MavenBuild test_existing_project(String projectKey, String projectName) throws IOException {
-    String pomLocation = "../sources/" + projectName + "/pom.xml";
-    File pomFile = FileLocation.of(pomLocation).getFile().getCanonicalFile();
-    //prepareProject(projectKey, projectName);
-    MavenBuild mavenBuild = MavenBuild.create().setPom(pomFile).setCleanPackageSonarGoals().addArgument("-DskipTests");
-    mavenBuild.setProperty("sonar.projectKey", projectKey);
-    return mavenBuild;
-  }
-
   private static void prepareProject(String projectKey, String projectName) {
     ORCHESTRATOR.getServer().provisionProject(projectKey, projectName);
     ORCHESTRATOR.getServer().associateProjectToQualityProfile(projectKey, "java", "rules");
@@ -299,9 +289,9 @@ private static void dumpServerLogLastLines(File logFile) throws IOException {
     if (nbLines > LOGS_NUMBER_LINES) {
       logs = logs.subList(nbLines - LOGS_NUMBER_LINES, nbLines);
     }
-    LOG.error("=================================== START " + logFile.getName() + " ===================================");
-    LOG.error(System.lineSeparator() + logs.stream().collect(Collectors.joining(System.lineSeparator())));
-    LOG.error("===================================== END " + logFile.getName() + " ===================================");
+    LOG.error("=================================== START {} ===================================", logFile.getName());
+    LOG.error("{}{}", System.lineSeparator(), logs.stream().collect(Collectors.joining(System.lineSeparator())));
+    LOG.error("===================================== END {} ===================================", logFile.getName());
   }
 
   private static String litsDifferencesPath(String projectName) {
@@ -310,7 +300,7 @@ private static String litsDifferencesPath(String projectName) {
 
   private static void assertNoDifferences(String projectName) throws IOException {
 
-    String differences = new String(Files.readAllBytes(Paths.get(litsDifferencesPath(projectName))), StandardCharsets.UTF_8);
+    String differences = Files.readString(Paths.get(litsDifferencesPath(projectName)));
     assertThat(differences).isEmpty();
   }
 

its/ruling/src/test/java/org/sonar/java/it/ProfileGenerator.java

@@ -45,20 +45,8 @@ public class ProfileGenerator {
 
   private static final Logger LOG = LoggerFactory.getLogger(ProfileGenerator.class);
 
-  static void generate(OrchestratorRule orchestrator, ImmutableMap<String, ImmutableMap<String, String>> rulesParameters,
-    Set<String> excluded, Set<String> subsetOfEnabledRules, Set<String> activatedRuleKeys) {
-    generate(orchestrator, null, rulesParameters, excluded, subsetOfEnabledRules, activatedRuleKeys);
-  }
-
-  /**
-   * @return the list of enabled rule keys for the given profile
-   */
-  static void generate(OrchestratorRule orchestrator, @Nullable String qualityProfile, ImmutableMap<String, ImmutableMap<String, String>> rulesParameters,
-    Set<String> excluded, Set<String> subsetOfEnabledRules, Set<String> activatedRuleKeys) {
-    generate(orchestrator, null, rulesParameters, excluded, subsetOfEnabledRules, activatedRuleKeys, List.of());
-  }
-
-  static void generate(OrchestratorRule orchestrator, @Nullable String qualityProfile, ImmutableMap<String, ImmutableMap<String, String>> rulesParameters,
+  static void generate(OrchestratorRule orchestrator, @Nullable String qualityProfile,
+    ImmutableMap<String, ImmutableMap<String, String>> rulesParameters,
     Set<String> excluded, Set<String> subsetOfEnabledRules, Set<String> activatedRuleKeys, List<String> extraNonDefaultRules) {
     try {
       LOG.info("Generating profile containing all the rules");
@@ -143,7 +131,8 @@ private static Optional<String> getQualityProfileName(OrchestratorRule orchestra
     if (qualityProfile == null || qualityProfile.isEmpty()) {
       return Optional.empty();
     }
-    org.sonarqube.ws.client.qualityprofiles.SearchRequest request = new org.sonarqube.ws.client.qualityprofiles.SearchRequest().setLanguage(LANGUAGE);
+    org.sonarqube.ws.client.qualityprofiles.SearchRequest request =
+      new org.sonarqube.ws.client.qualityprofiles.SearchRequest().setLanguage(LANGUAGE);
 
     return newAdminWsClient(orchestrator).qualityprofiles().search(request).getProfilesList().stream()
       .filter(p -> qualityProfile.equalsIgnoreCase(p.getName()))