Replace Guava's immutable collections with java.util ones

ImmutableList, ImmutableMap, ImmutableSet and ImmutableSortedSet give
way to List.of, List.copyOf, Map.of, Stream.toList() and, where a
builder filled them, an ArrayList or a TreeSet handed out with
List.copyOf or an unmodifiable view. FileBasedTests lists its test
resources with Files.walk rather than Guava's ClassPath, whose
getResources() returns an ImmutableSet.

What differs between the two kinds of collection decided three places:
- Newlines.BREAKS is a List: it is tried in order, "\r\n" before "\n",
  and Set.of keeps no order. StringWrapper's ranges are a LinkedHashSet
  for the same reason.
- JavaInput.buildToks asks its stop tokens whether they contain the
  kind of a comment token, which is null, and Set.of throws on
  contains(null). They are a HashSet.
- Error Prone's @immutable cannot prove a java.util List or Map
  immutable, so it is gone from Input.Token, JavaInput.Token,
  OpsBuilder.BlankLineWanted, InputMetadata and doc.Token.

The SPI does not change. FormatterService.getFormatReplacements still
returns ImmutableList, so that code compiled against an older SPI keeps
linking, and its three implementations still declare it:
FormatterServiceImpl copies Formatter's list into one. Formatter's own
getFormatReplacements, Input.getPositionTokenMap (a RangeMap now) and
SnippetFormatter.format return java.util types.

Author: abashev

gradle-open-java-format/src/main/groovy/com/palantir/javaformat/gradle/PalantirJavaFormatIdeaPlugin.java

@@ -17,7 +17,6 @@
 package com.palantir.javaformat.gradle;
 
 import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableList;
 import java.util.stream.Stream;
 import org.gradle.StartParameter;
 import org.gradle.api.Plugin;
@@ -80,9 +79,8 @@ public void apply(Project rootProject) {
     // Adds the tasks to the Gradle start parameters, so they run with whatever the build was asked to do.
     private static void runWithEveryBuild(Project rootProject, TaskProvider<?>... tasks) {
         StartParameter startParameter = rootProject.getGradle().getStartParameter();
-        startParameter.setTaskNames(ImmutableList.<String>builder()
-                .addAll(startParameter.getTaskNames())
-                .addAll(Stream.of(tasks).map(task -> ":" + task.getName()).toList())
-                .build());
+        startParameter.setTaskNames(Stream.concat(
+                        startParameter.getTaskNames().stream(), Stream.of(tasks).map(task -> ":" + task.getName()))
+                .toList());
     }
 }

gradle-open-java-format/src/main/groovy/com/palantir/javaformat/gradle/XmlUtils.java

@@ -16,7 +16,6 @@
 
 package com.palantir.javaformat.gradle;
 
-import com.google.common.collect.ImmutableMap;
 import com.google.common.io.Files;
 import groovy.util.Node;
 import groovy.xml.XmlNodePrinter;
@@ -26,6 +25,7 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.nio.charset.Charset;
+import java.util.Map;
 import java.util.function.Consumer;
 import javax.xml.parsers.ParserConfigurationException;
 import org.xml.sax.SAXException;
@@ -41,7 +41,7 @@ public static void updateIdeaXmlFile(File configurationFile, Consumer<Node> conf
                 throw new RuntimeException("Couldn't parse existing configuration file: " + configurationFile, e);
             }
         } else {
-            rootNode = new Node(null, "project", ImmutableMap.of("version", "4"));
+            rootNode = new Node(null, "project", Map.of("version", "4"));
         }
 
         configure.accept(rootNode);

gradle-open-java-format/src/main/java/com/palantir/javaformat/gradle/FormatDiff.java

@@ -22,7 +22,6 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Splitter;
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterators;
 import com.google.common.collect.Range;
 import com.google.common.collect.RangeSet;
@@ -110,7 +109,7 @@ private static void format(FormatterService formatter, SingleFileDiff diff) {
 
         try {
             System.err.println("Formatting " + diff.path);
-            ImmutableList<Replacement> replacements = formatter.getFormatReplacements(input, charRanges.asRanges());
+            List<Replacement> replacements = formatter.getFormatReplacements(input, charRanges.asRanges());
             String output = applyReplacements(input, replacements);
             Files.write(diff.path, output.getBytes(UTF_8));
         } catch (IOException | FormatterException e) {

gradle-open-java-format/src/main/java/com/palantir/javaformat/gradle/PalantirJavaFormatSpotlessPlugin.java

@@ -16,7 +16,7 @@
 package com.palantir.javaformat.gradle;
 
 import com.diffplug.gradle.spotless.SpotlessExtension;
-import com.google.common.collect.ImmutableList;
+import java.util.List;
 import org.gradle.api.Action;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
@@ -25,8 +25,8 @@
 
 public abstract class PalantirJavaFormatSpotlessPlugin implements Plugin<Project> {
     // The spotless gradle plugin got renamed to 'com.diffplug.spotless' at version 5.0.0
-    private static final ImmutableList<String> SPOTLESS_PLUGINS =
-            ImmutableList.of("com.diffplug.gradle.spotless", "com.diffplug.spotless");
+    private static final List<String> SPOTLESS_PLUGINS =
+            List.of("com.diffplug.gradle.spotless", "com.diffplug.spotless");
 
     @Override
     public void apply(Project project) {

gradle-open-java-format/src/test/java/com/palantir/javaformat/gradle/FormatDiffTest.java

@@ -21,7 +21,6 @@
 
 import com.google.common.base.Preconditions;
 import com.google.common.base.Splitter;
-import com.google.common.collect.ImmutableList;
 import com.palantir.javaformat.bootstrap.BootstrappingFormatterService;
 import com.palantir.javaformat.bootstrap.NativeImageFormatterService;
 import com.palantir.javaformat.java.FormatterService;
@@ -80,10 +79,10 @@ void reformat_a_subpath_of_a_git_directory_for_only_changed_lines(FormatterServi
         Files.createDirectories(subdir);
 
         Path reformatMe = subdir.resolve("ReformatMe.java");
-        Files.write(reformatMe, ImmutableList.of("                                 class ReformatMe {}"), UTF_8);
+        Files.write(reformatMe, List.of("                                 class ReformatMe {}"), UTF_8);
 
         Path dontTouchMe = repo.resolve("DontTouchMe.java");
-        Files.write(dontTouchMe, ImmutableList.of("                                 class DontTouchMe {}"), UTF_8);
+        Files.write(dontTouchMe, List.of("                                 class DontTouchMe {}"), UTF_8);
 
         runCommandInRepo("git", "add", "-N", ".");
 

open-java-format-eclipse-plugin/src/main/java/com/palantir/javaformat/java/SnippetFormatter.java

@@ -14,12 +14,9 @@
 
 package com.palantir.javaformat.java;
 
-import static com.google.common.collect.ImmutableList.toImmutableList;
-
 import com.google.common.base.CharMatcher;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.DiscreteDomain;
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Range;
 import com.google.common.collect.RangeSet;
 import com.google.common.collect.TreeRangeSet;
@@ -93,7 +90,7 @@ private static List<Range<Integer>> offsetRanges(List<Range<Integer>> ranges, in
      * Runs the Google Java formatter on the given source, with only the given
      * ranges specified.
      */
-    public ImmutableList<Replacement> format(
+    public List<Replacement> format(
             SnippetKind kind, String source, List<Range<Integer>> ranges, int initialIndent, boolean includeComments)
             throws FormatterException {
         RangeSet<Integer> rangeSet = TreeRangeSet.create();
@@ -115,7 +112,7 @@ public ImmutableList<Replacement> format(
 
         return toReplacements(source, replacement).stream()
                 .filter(r -> rangeSet.encloses(r.getReplaceRange()))
-                .collect(toImmutableList());
+                .toList();
     }
 
     /**

open-java-format-idea-plugin/src/main/java/com/palantir/javaformat/intellij/PalantirJavaFormatFormattingService.java

@@ -16,7 +16,9 @@
 
 package com.palantir.javaformat.intellij;
 
-import com.google.common.collect.ImmutableList;
+import static java.util.Comparator.comparing;
+import static java.util.Optional.ofNullable;
+
 import com.google.common.collect.Range;
 import com.intellij.formatting.service.AsyncDocumentFormattingService;
 import com.intellij.formatting.service.AsyncFormattingRequest;
@@ -33,16 +35,12 @@
 import com.palantir.javaformat.java.FormatterException;
 import com.palantir.javaformat.java.FormatterService;
 import com.palantir.javaformat.java.Replacement;
-import org.jspecify.annotations.Nullable;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
-
-import static java.util.Comparator.comparing;
-import static java.util.Optional.ofNullable;
+import org.jspecify.annotations.Nullable;
 
 class PalantirJavaFormatFormattingService extends AsyncDocumentFormattingService implements PluginAware {
     private static final Logger logger = Logger.getInstance(PalantirJavaFormatFormattingService.class);
@@ -191,12 +189,11 @@ private static Collection<Range<Integer>> toRanges(AsyncFormattingRequest reques
             if (isWholeFile(request)) {
                 // The IDE sometimes passes invalid ranges when the file is unsaved before invoking the
                 // formatter. So this is a workaround for that issue.
-                return ImmutableList.of(
-                        Range.closedOpen(0, request.getDocumentText().length()));
+                return List.of(Range.closedOpen(0, request.getDocumentText().length()));
             }
             return request.getFormattingRanges().stream()
                     .map(textRange -> Range.closedOpen(textRange.getStartOffset(), textRange.getEndOffset()))
-                    .collect(ImmutableList.toImmutableList());
+                    .toList();
         }
 
         private static boolean isWholeFile(AsyncFormattingRequest request) {

open-java-format-jdk-bootstrap/src/main/java/com/palantir/javaformat/bootstrap/BootstrappingFormatterService.java

@@ -29,6 +29,7 @@
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
@@ -125,27 +126,26 @@ record FormatterCliArgs(
             List<String> characterRanges) {
 
         List<String> toArgs() {
-            ImmutableList.Builder<String> args = ImmutableList.<String>builder()
-                    .add(jdkPath.toAbsolutePath().toString())
-                    .addAll(jvmArgs)
-                    .add(
-                            "-cp",
-                            implementationClasspath.stream()
-                                    .map(path -> path.toAbsolutePath().toString())
-                                    .collect(Collectors.joining(System.getProperty("path.separator"))))
-                    .add(FORMATTER_MAIN_CLASS);
+            var args = new ArrayList<String>();
+            args.add(jdkPath.toAbsolutePath().toString());
+            args.addAll(jvmArgs);
+            args.add("-cp");
+            args.add(implementationClasspath.stream()
+                    .map(path -> path.toAbsolutePath().toString())
+                    .collect(Collectors.joining(System.getProperty("path.separator"))));
+            args.add(FORMATTER_MAIN_CLASS);
 
             if (!characterRanges.isEmpty()) {
-                args.add("--character-ranges", Joiner.on(',').join(characterRanges));
+                args.add("--character-ranges");
+                args.add(Joiner.on(',').join(characterRanges));
             }
             if (outputReplacements) {
                 args.add("--output-replacements");
             }
 
-            return args
-                    // Trailing "-" enables formatting stdin -> stdout
-                    .add("-")
-                    .build();
+            // Trailing "-" enables formatting stdin -> stdout
+            args.add("-");
+            return List.copyOf(args);
         }
     }
 }

open-java-format-jdk-bootstrap/src/main/java/com/palantir/javaformat/bootstrap/NativeImageFormatterService.java

@@ -28,6 +28,7 @@
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
@@ -91,20 +92,20 @@ private String runFormatterCommand(String input) throws IOException {
     record FormatterNativeImageArgs(Path nativeImagePath, boolean outputReplacements, List<String> characterRanges) {
 
         List<String> toArgs() {
-            ImmutableList.Builder<String> args = ImmutableList.<String>builder()
-                    .add(nativeImagePath.toAbsolutePath().toString());
+            var args = new ArrayList<String>();
+            args.add(nativeImagePath.toAbsolutePath().toString());
 
             if (!characterRanges.isEmpty()) {
-                args.add("--character-ranges", Joiner.on(',').join(characterRanges));
+                args.add("--character-ranges");
+                args.add(Joiner.on(',').join(characterRanges));
             }
             if (outputReplacements) {
                 args.add("--output-replacements");
             }
 
-            return args
-                    // Trailing "-" enables formatting stdin -> stdout
-                    .add("-")
-                    .build();
+            // Trailing "-" enables formatting stdin -> stdout
+            args.add("-");
+            return List.copyOf(args);
         }
     }
 }

open-java-format-jdk-bootstrap/src/test/java/com/palantir/javaformat/bootstrap/FormatterServicesTest.java

@@ -20,7 +20,6 @@
 
 import com.google.common.base.Preconditions;
 import com.google.common.base.Splitter;
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Range;
 import com.palantir.javaformat.Utils;
 import com.palantir.javaformat.java.FormatterException;
@@ -44,7 +43,7 @@ void can_format_file_with_replacement(FormatterService formatterService) throws
         String input = getTestResourceContent("format.input");
         String expectedOutput = getTestResourceContent("format.output");
 
-        ImmutableList<Replacement> replacements =
+        List<Replacement> replacements =
                 formatterService.getFormatReplacements(input, List.of(Range.open(0, input.length())));
 
         assertThat(replacements).hasSize(1);
@@ -73,7 +72,7 @@ void can_format_large_input_file(FormatterService formatterService) throws Forma
                 + "  }\n"
                 + "}\n";
 
-        ImmutableList<Replacement> replacements =
+        List<Replacement> replacements =
                 formatterService.getFormatReplacements(input, List.of(Range.open(0, input.length())));
 
         assertThat(replacements).singleElement().satisfies(replacement -> {