Stop using Guava's ImmutableSet and ImmutableMap

Author: tomasz-tylenda-sonarsource

its/autoscan/src/test/java/org/sonar/java/it/AutoScanTest.java

@@ -16,7 +16,6 @@
  */
 package org.sonar.java.it;
 
-import com.google.common.collect.ImmutableMap;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
@@ -228,7 +227,7 @@ private static String absolutePathFor(String path) {
 
   private static List<String> generateSonarWay(OrchestratorRule orchestrator) {
     Set<String> results = new TreeSet<>(RULE_KEY_COMPARATOR);
-    ProfileGenerator.generate(orchestrator, "Sonar Way", ImmutableMap.of(), Collections.emptySet(), Collections.emptySet(), results);
+    ProfileGenerator.generate(orchestrator, "Sonar Way", Map.of(), Collections.emptySet(), Collections.emptySet(), results);
     return new ArrayList<>(results);
   }
 

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

@@ -16,7 +16,6 @@
  */
 package org.sonar.java.it;
 
-import com.google.common.collect.ImmutableMap;
 import com.google.common.io.Files;
 import com.sonar.orchestrator.container.Server;
 import com.sonar.orchestrator.junit4.OrchestratorRule;
@@ -47,15 +46,15 @@ public class ProfileGenerator {
 
   private static final Logger LOG = LoggerFactory.getLogger(ProfileGenerator.class);
 
-  static void generate(OrchestratorRule orchestrator, ImmutableMap<String, ImmutableMap<String, String>> rulesParameters,
+  static void generate(OrchestratorRule orchestrator, Map<String, Map<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,
+  static void generate(OrchestratorRule orchestrator, @Nullable String qualityProfile, Map<String, Map<String, String>> rulesParameters,
     Set<String> excluded, Set<String> subsetOfEnabledRules, Set<String> activatedRuleKeys) {
     try {
       LOG.info("Generating profile containing all the rules");

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

@@ -17,8 +17,6 @@
 package org.sonar.java.it;
 
 import com.google.common.base.Splitter;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
 import com.sonar.orchestrator.build.Build;
 import com.sonar.orchestrator.build.BuildResult;
 import com.sonar.orchestrator.build.MavenBuild;
@@ -40,6 +38,7 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
@@ -79,7 +78,7 @@ public class JavaRulingTest {
    * mvn test -DsonarRules=S100,S101
    * }</pre>
    */
-  private static final ImmutableSet<String> SUBSET_OF_ENABLED_RULES = ImmutableSet.copyOf(
+  private static final Set<String> SUBSET_OF_ENABLED_RULES = Set.copyOf(
       Splitter.on(',').trimResults().omitEmptyStrings().splitToList(
           System.getProperty("sonarRules", "")
       )
@@ -114,23 +113,20 @@ private static OrchestratorRule createOrchestrator() {
 
   @BeforeClass
   public static void prepare_quality_profiles() throws Exception {
-    ImmutableMap<String, ImmutableMap<String, String>> rulesParameters = ImmutableMap.<String, ImmutableMap<String, String>>builder()
-      .put(
-        "S1120",
-        ImmutableMap.of("indentationLevel", "4"))
-      .put(
+    Map<String, Map<String, String>> rulesParameters = Map.of(
+        "S1120", Map.of("indentationLevel", "4"),
         "S1451",
-        ImmutableMap.of(
+        Map.of(
           "headerFormat",
           """
             
             /*
              * Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved.
-             * ORACLE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms."""))
-      .put("S5961", ImmutableMap.of("MaximumAssertionNumber", "50"))
-      .put("S6539", ImmutableMap.of("couplingThreshold", "20"))
-      .build();
-    ImmutableSet<String> disabledRules = ImmutableSet.of(
+             * ORACLE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms."""),
+        "S5961", Map.of("MaximumAssertionNumber", "50"),
+        "S6539", Map.of("couplingThreshold", "20")
+      );
+    Set<String> disabledRules = Set.of(
       "S1874",
       "CycleBetweenPackages",
       // disable because it generates too many issues, performance reasons

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

@@ -16,7 +16,6 @@
  */
 package org.sonar.java.it;
 
-import com.google.common.collect.ImmutableMap;
 import com.google.common.io.Files;
 import com.sonar.orchestrator.junit4.OrchestratorRule;
 import com.sonar.orchestrator.locator.FileLocation;
@@ -45,15 +44,15 @@ public class ProfileGenerator {
 
   private static final Logger LOG = LoggerFactory.getLogger(ProfileGenerator.class);
 
-  static void generate(OrchestratorRule orchestrator, ImmutableMap<String, ImmutableMap<String, String>> rulesParameters,
+  static void generate(OrchestratorRule orchestrator, Map<String, Map<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,
+  static void generate(OrchestratorRule orchestrator, @Nullable String qualityProfile, Map<String, Map<String, String>> rulesParameters,
     Set<String> excluded, Set<String> subsetOfEnabledRules, Set<String> activatedRuleKeys) {
     try {
       LOG.info("Generating profile containing all the rules");