Excavator: Upgrades Baseline to the latest version (#1321)

Author: svc-excavator-bot

build.gradle

@@ -7,7 +7,7 @@ buildscript {
     dependencies {
         classpath 'com.palantir.jakartapackagealignment:jakarta-package-alignment:0.6.0'
         classpath 'com.gradle.publish:plugin-publish-plugin:1.3.1'
-        classpath 'com.palantir.baseline:gradle-baseline-java:6.34.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:6.35.0'
         classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.34.0'
         classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.19.0'
         classpath 'com.palantir.gradle.failure-reports:gradle-failure-reports:1.14.0'

eclipse_plugin/src/main/java/com/palantir/javaformat/java/PalantirJavaFormatter.java

@@ -83,7 +83,6 @@ private TextEdit formatInternal(int kind, String source, IRegion[] regions, int
                 default:
                     throw new IllegalArgumentException(String.format("Unknown snippet kind: %d", kind));
             }
-            @SuppressWarnings("for-rollout:PreferredInterfaceType")
             List<Replacement> replacements = new SnippetFormatter()
                     .format(snippetKind, source, rangesFromRegions(regions), initialIndent, includeComments);
             if (idempotent(source, regions, replacements)) {

gradle-palantir-java-format/src/main/java/com/palantir/javaformat/gradle/ExecutableTransform.java

@@ -47,7 +47,6 @@ public abstract class ExecutableTransform implements TransformAction<TransformPa
     @InputArtifact
     public abstract Provider<FileSystemLocation> getInputArtifact();
 
-    @SuppressWarnings("for-rollout:ThrowSpecificExceptions")
     @Override
     public void transform(TransformOutputs outputs) {
         File inputFile = getInputArtifact().get().getAsFile();
@@ -60,7 +59,6 @@ public void transform(TransformOutputs outputs) {
         }
     }
 
-    @SuppressWarnings("for-rollout:ThrowSpecificExceptions")
     private static void makeFileExecutable(Path pathToExe) {
         try {
             Set<PosixFilePermission> existingPermissions = Files.getPosixFilePermissions(pathToExe);

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

@@ -163,7 +163,6 @@ private static RangeSet<Integer> lineRangesToCharRanges(String input, RangeSet<I
         Iterators.addAll(lines, new LineOffsetIterator(input));
         lines.add(input.length() + 1);
 
-        @SuppressWarnings("for-rollout:UnnecessaryFinal")
         final RangeSet<Integer> characterRanges = TreeRangeSet.create();
         for (Range<Integer> lineRange :
                 lineRanges.subRangeSet(Range.closedOpen(0, lines.size() - 1)).asRanges()) {

gradle-palantir-java-format/src/main/java/com/palantir/javaformat/gradle/JavaFormatExtension.java

@@ -41,7 +41,6 @@ public FormatterService serviceLoad() {
 
     @SuppressWarnings("for-rollout:NullAway")
     private FormatterService serviceLoadInternal() {
-        @SuppressWarnings("for-rollout:ThrowSpecificExceptions")
         URL[] jarUris = configuration.getFiles().stream()
                 .map(file -> {
                     try {

gradle-palantir-java-format/src/main/java/com/palantir/javaformat/gradle/spotless/PalantirJavaFormatStep.java

@@ -73,7 +73,6 @@ FormatterFunc createFormat() {
         }
     }
 
-    @SuppressWarnings("for-rollout:ThrowSpecificExceptions")
     private static void ensureImplementationNotDirectlyLoadable() {
         try {
             PalantirJavaFormatStep.class.getClassLoader().loadClass(IMPL_CLASS);

idea-plugin/src/main/java/com/palantir/javaformat/intellij/FormatterProvider.java

@@ -196,7 +196,6 @@ private static Optional<Sdk> getProjectJdk(Project project) {
         return Optional.ofNullable(ProjectRootManager.getInstance(project).getProjectSdk());
     }
 
-    @SuppressWarnings("for-rollout:ThrowSpecificExceptions")
     private static URL[] toUrlsUnchecked(List<Path> paths) {
         return paths.stream()
                 .map(path -> {
@@ -209,7 +208,6 @@ private static URL[] toUrlsUnchecked(List<Path> paths) {
                 .toArray(URL[]::new);
     }
 
-    @SuppressWarnings("for-rollout:ThrowSpecificExceptions")
     private static List<Path> listDirAsUrlsUnchecked(Path dir) {
         try (Stream<Path> list = Files.list(dir)) {
             return list.collect(Collectors.toList());

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

@@ -101,7 +101,6 @@ public void run() {
                             request.getDocumentText().length(),
                             request.getFormattingRanges()));
                 }
-                @SuppressWarnings("for-rollout:PreferredInterfaceType")
                 List<Replacement> replacements =
                         formatterService.get().getFormatReplacements(request.getDocumentText(), toRanges(request));
                 if (logger.isDebugEnabled()) {
@@ -141,7 +140,6 @@ public static String applyReplacements(String input, Collection<Replacement> rep
             return writer.toString();
         }
 
-        @SuppressWarnings("for-rollout:PreferredInterfaceType")
         private static Collection<Range<Integer>> toRanges(AsyncFormattingRequest request) {
             if (isWholeFile(request)) {
                 // The IDE sometimes passes invalid ranges when the file is unsaved before invoking the

idea-plugin/src/main/java/com/palantir/javaformat/intellij/PalantirJavaFormatSettings.java

@@ -113,7 +113,6 @@ Optional<String> getImplementationVersion() {
         return Optional.ofNullable(FormatterProvider.getPluginDescriptor().getVersion());
     }
 
-    @SuppressWarnings("for-rollout:ThrowSpecificExceptions")
     Optional<String> computeFormatterVersion() {
         return getImplementationClassPath().map(classpath -> classpath.stream()
                 .flatMap(uri -> {

idea-plugin/src/main/java/com/palantir/javaformat/intellij/UiFormatterStyle.java

@@ -28,12 +28,9 @@ enum UiFormatterStyle {
 
     private final String description;
 
-    @SuppressWarnings("for-rollout:DifferentNameButSame")
     private final JavaFormatterOptions.Style style;
 
-    UiFormatterStyle(
-            String description,
-            @SuppressWarnings("for-rollout:DifferentNameButSame") JavaFormatterOptions.Style style) {
+    UiFormatterStyle(String description, JavaFormatterOptions.Style style) {
         this.description = description;
         this.style = style;
     }
@@ -43,13 +40,11 @@ public String toString() {
         return description;
     }
 
-    @SuppressWarnings("for-rollout:DifferentNameButSame")
     public JavaFormatterOptions.Style convert() {
         return style;
     }
 
-    static UiFormatterStyle convert(
-            @SuppressWarnings("for-rollout:DifferentNameButSame") JavaFormatterOptions.Style style) {
+    static UiFormatterStyle convert(JavaFormatterOptions.Style style) {
         return Arrays.stream(UiFormatterStyle.values())
                 .filter(value -> Objects.equals(value.style, style))
                 .findFirst()