Upgrade spotless plugin to 6.17.0 (#94994)

Fixes #82794. Upgrade the spotless plugin, which addresses the issue
around formatting `instanceof` expressions. Formatting of statements
including lambdas seems to have improved too.

Author: pugnascotia

benchmarks/src/main/java/org/elasticsearch/benchmark/index/mapper/MapperServiceFactory.java

@@ -60,7 +60,9 @@ public static MapperService create(String mappings) {
                 .withDeprecationHandler(LoggingDeprecationHandler.INSTANCE),
             similarityService,
             mapperRegistry,
-            () -> { throw new UnsupportedOperationException(); },
+            () -> {
+                throw new UnsupportedOperationException();
+            },
             new ProvidedIdFieldMapper(() -> true),
             new ScriptCompiler() {
                 @Override

benchmarks/src/main/java/org/elasticsearch/benchmark/search/QueryParserHelperBenchmark.java

@@ -175,7 +175,9 @@ protected final MapperService createMapperService(String mappings) {
                 .withDeprecationHandler(LoggingDeprecationHandler.INSTANCE),
             similarityService,
             mapperRegistry,
-            () -> { throw new UnsupportedOperationException(); },
+            () -> {
+                throw new UnsupportedOperationException();
+            },
             new ProvidedIdFieldMapper(() -> true),
             new ScriptCompiler() {
                 @Override

benchmarks/src/main/java/org/elasticsearch/benchmark/vector/DistanceFunctionBenchmark.java

@@ -406,50 +406,50 @@ public void setBenchmarkFunction() {
             case "float" -> {
                 switch (function) {
                     case "dot" -> benchmarkFunction = switch (type) {
-                            case "knn" -> new DotKnnFloatBenchmarkFunction(dims);
-                            case "binary" -> new DotBinaryFloatBenchmarkFunction(dims);
-                            default -> throw new UnsupportedOperationException("unexpected type [" + type + "]");
-                        };
+                        case "knn" -> new DotKnnFloatBenchmarkFunction(dims);
+                        case "binary" -> new DotBinaryFloatBenchmarkFunction(dims);
+                        default -> throw new UnsupportedOperationException("unexpected type [" + type + "]");
+                    };
                     case "cosine" -> benchmarkFunction = switch (type) {
-                            case "knn" -> new CosineKnnFloatBenchmarkFunction(dims);
-                            case "binary" -> new CosineBinaryFloatBenchmarkFunction(dims);
-                            default -> throw new UnsupportedOperationException("unexpected type [" + type + "]");
-                        };
+                        case "knn" -> new CosineKnnFloatBenchmarkFunction(dims);
+                        case "binary" -> new CosineBinaryFloatBenchmarkFunction(dims);
+                        default -> throw new UnsupportedOperationException("unexpected type [" + type + "]");
+                    };
                     case "l1" -> benchmarkFunction = switch (type) {
-                            case "knn" -> new L1KnnFloatBenchmarkFunction(dims);
-                            case "binary" -> new L1BinaryFloatBenchmarkFunction(dims);
-                            default -> throw new UnsupportedOperationException("unexpected type [" + type + "]");
-                        };
+                        case "knn" -> new L1KnnFloatBenchmarkFunction(dims);
+                        case "binary" -> new L1BinaryFloatBenchmarkFunction(dims);
+                        default -> throw new UnsupportedOperationException("unexpected type [" + type + "]");
+                    };
                     case "l2" -> benchmarkFunction = switch (type) {
-                            case "knn" -> new L2KnnFloatBenchmarkFunction(dims);
-                            case "binary" -> new L2BinaryFloatBenchmarkFunction(dims);
-                            default -> throw new UnsupportedOperationException("unexpected type [" + type + "]");
-                        };
+                        case "knn" -> new L2KnnFloatBenchmarkFunction(dims);
+                        case "binary" -> new L2BinaryFloatBenchmarkFunction(dims);
+                        default -> throw new UnsupportedOperationException("unexpected type [" + type + "]");
+                    };
                     default -> throw new UnsupportedOperationException("unexpected function [" + function + "]");
                 }
             }
             case "byte" -> {
                 switch (function) {
                     case "dot" -> benchmarkFunction = switch (type) {
-                            case "knn" -> new DotKnnByteBenchmarkFunction(dims);
-                            case "binary" -> new DotBinaryByteBenchmarkFunction(dims);
-                            default -> throw new UnsupportedOperationException("unexpected type [" + type + "]");
-                        };
+                        case "knn" -> new DotKnnByteBenchmarkFunction(dims);
+                        case "binary" -> new DotBinaryByteBenchmarkFunction(dims);
+                        default -> throw new UnsupportedOperationException("unexpected type [" + type + "]");
+                    };
                     case "cosine" -> benchmarkFunction = switch (type) {
-                            case "knn" -> new CosineKnnByteBenchmarkFunction(dims);
-                            case "binary" -> new CosineBinaryByteBenchmarkFunction(dims);
-                            default -> throw new UnsupportedOperationException("unexpected type [" + type + "]");
-                        };
+                        case "knn" -> new CosineKnnByteBenchmarkFunction(dims);
+                        case "binary" -> new CosineBinaryByteBenchmarkFunction(dims);
+                        default -> throw new UnsupportedOperationException("unexpected type [" + type + "]");
+                    };
                     case "l1" -> benchmarkFunction = switch (type) {
-                            case "knn" -> new L1KnnByteBenchmarkFunction(dims);
-                            case "binary" -> new L1BinaryByteBenchmarkFunction(dims);
-                            default -> throw new UnsupportedOperationException("unexpected type [" + type + "]");
-                        };
+                        case "knn" -> new L1KnnByteBenchmarkFunction(dims);
+                        case "binary" -> new L1BinaryByteBenchmarkFunction(dims);
+                        default -> throw new UnsupportedOperationException("unexpected type [" + type + "]");
+                    };
                     case "l2" -> benchmarkFunction = switch (type) {
-                            case "knn" -> new L2KnnByteBenchmarkFunction(dims);
-                            case "binary" -> new L2BinaryByteBenchmarkFunction(dims);
-                            default -> throw new UnsupportedOperationException("unexpected type [" + type + "]");
-                        };
+                        case "knn" -> new L2KnnByteBenchmarkFunction(dims);
+                        case "binary" -> new L2BinaryByteBenchmarkFunction(dims);
+                        default -> throw new UnsupportedOperationException("unexpected type [" + type + "]");
+                    };
                     default -> throw new UnsupportedOperationException("unexpected function [" + function + "]");
                 }
             }

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchJavaModulePathPlugin.java

@@ -133,7 +133,7 @@ static Stream<ComponentIdentifier> walkResolvedComponent(
                     return false;
                 }
                 return isModuleDependency
-                    || (it.getId()instanceof ProjectComponentIdentifier projectId && hasModuleInfoDotJava(project, projectId));
+                    || (it.getId() instanceof ProjectComponentIdentifier projectId && hasModuleInfoDotJava(project, projectId));
             })
             .flatMap(it -> Stream.concat(walkResolvedComponent(project, it, true, visited), Stream.of(it.getId())));
     }

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPlugin.java

@@ -54,12 +54,9 @@ public InternalDistributionBwcSetupPlugin(ProviderFactory providerFactory) {
     @Override
     public void apply(Project project) {
         project.getRootProject().getPluginManager().apply(GlobalBuildInfoPlugin.class);
-        BuildParams.getBwcVersions()
-            .forPreviousUnreleased(
-                (BwcVersions.UnreleasedVersionInfo unreleasedVersion) -> {
-                    configureBwcProject(project.project(unreleasedVersion.gradleProjectPath()), unreleasedVersion);
-                }
-            );
+        BuildParams.getBwcVersions().forPreviousUnreleased((BwcVersions.UnreleasedVersionInfo unreleasedVersion) -> {
+            configureBwcProject(project.project(unreleasedVersion.gradleProjectPath()), unreleasedVersion);
+        });
     }
 
     private void configureBwcProject(Project project, BwcVersions.UnreleasedVersionInfo versionInfo) {

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/docker/DockerSupportPlugin.java

@@ -32,13 +32,9 @@ public void apply(Project project) {
 
         Provider<DockerSupportService> dockerSupportServiceProvider = project.getGradle()
             .getSharedServices()
-            .registerIfAbsent(
-                DOCKER_SUPPORT_SERVICE_NAME,
-                DockerSupportService.class,
-                spec -> spec.parameters(
-                    params -> { params.setExclusionsFile(new File(project.getRootDir(), DOCKER_ON_LINUX_EXCLUSIONS_FILE)); }
-                )
-            );
+            .registerIfAbsent(DOCKER_SUPPORT_SERVICE_NAME, DockerSupportService.class, spec -> spec.parameters(params -> {
+                params.setExclusionsFile(new File(project.getRootDir(), DOCKER_ON_LINUX_EXCLUSIONS_FILE));
+            }));
 
         // Ensure that if we are trying to run any DockerBuildTask tasks, we assert an available Docker installation exists
         project.getGradle().getTaskGraph().whenReady(graph -> {

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/DistroTestPlugin.java

@@ -199,13 +199,9 @@ public void apply(Project project) {
 
             // windows boxes get windows distributions, and linux boxes get linux distributions
             if (isWindows(vmProject)) {
-                configureVMWrapperTasks(
-                    vmProject,
-                    windowsTestTasks,
-                    depsTasks,
-                    wrapperTask -> { vmLifecyleTasks.get(ARCHIVE).configure(t -> t.dependsOn(wrapperTask)); },
-                    vmDependencies
-                );
+                configureVMWrapperTasks(vmProject, windowsTestTasks, depsTasks, wrapperTask -> {
+                    vmLifecyleTasks.get(ARCHIVE).configure(t -> t.dependsOn(wrapperTask));
+                }, vmDependencies);
             } else {
                 for (var entry : linuxTestTasks.entrySet()) {
                     ElasticsearchDistributionType type = entry.getKey();

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/RestTestTransformer.java

@@ -130,8 +130,9 @@ private void traverseTest(
                     }
                 }
             }
-            currentNode.elements()
-                .forEachRemaining(node -> { traverseTest(testContext, node, parentKeyName, objectKeyFinders, arrayByObjectKeyFinders); });
+            currentNode.elements().forEachRemaining(node -> {
+                traverseTest(testContext, node, parentKeyName, objectKeyFinders, arrayByObjectKeyFinders);
+            });
         } else if (currentNode.isObject()) {
             currentNode.fields().forEachRemaining(entry -> {
                 List<RestTestTransformByParentObject> transforms = objectKeyFinders.get(entry.getKey());

build-tools/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java

@@ -1372,7 +1372,7 @@ private void sync(Path sourceRoot, Path destinationRoot, BiConsumer<Path, Path>
                 }
             });
         } catch (UncheckedIOException e) {
-            if (e.getCause()instanceof NoSuchFileException cause) {
+            if (e.getCause() instanceof NoSuchFileException cause) {
                 // Ignore these files that are sometimes left behind by the JVM
                 if (cause.getFile() == null || cause.getFile().contains(".attach_pid") == false) {
                     throw new UncheckedIOException(cause);

build-tools/src/main/java/org/elasticsearch/gradle/util/Pair.java

@@ -8,7 +8,7 @@
 
 package org.elasticsearch.gradle.util;
 
-public record Pair<L, R> (L left, R right) {
+public record Pair<L, R>(L left, R right) {
 
     public static <L, R> Pair<L, R> of(L left, R right) {
         return new Pair<>(left, right);

client/rest-high-level/src/main/java/org/elasticsearch/client/core/MainResponse.java

@@ -19,7 +19,9 @@ public class MainResponse {
     private static final ConstructingObjectParser<MainResponse, Void> PARSER = new ConstructingObjectParser<>(
         MainResponse.class.getName(),
         true,
-        args -> { return new MainResponse((String) args[0], (Version) args[1], (String) args[2], (String) args[3], (String) args[4]); }
+        args -> {
+            return new MainResponse((String) args[0], (Version) args[1], (String) args[2], (String) args[3], (String) args[4]);
+        }
     );
 
     static {

distribution/archives/integ-test-zip/src/javaRestTest/java/org/elasticsearch/test/rest/NodeRestUsageIT.java

@@ -143,24 +143,24 @@ public void testAggregationUsage() throws IOException {
         // Do some requests to get some rest usage stats
         Request create = new Request("PUT", "/test");
         create.setJsonEntity("""
-                {
-                  "mappings": {
-                    "properties": {
-                      "str": {
-                        "type": "keyword"
-                      },
-                      "foo": {
-                        "type": "keyword"
-                      },
-                      "num": {
-                        "type": "long"
-                      },
-                      "start": {
-                        "type": "date"
-                      }
-                    }
+            {
+              "mappings": {
+                "properties": {
+                  "str": {
+                    "type": "keyword"
+                  },
+                  "foo": {
+                    "type": "keyword"
+                  },
+                  "num": {
+                    "type": "long"
+                  },
+                  "start": {
+                    "type": "date"
                   }
-                }""");
+                }
+              }
+            }""");
         client().performRequest(create);
 
         Request searchRequest = new Request("GET", "/test/_search");

gradle/build.versions.toml

@@ -39,6 +39,6 @@ shadow-plugin = "gradle.plugin.com.github.johnrengelman:shadow:7.1.2"
 spock-core = { group = "org.spockframework", name="spock-core", version.ref="spock" }
 spock-junit4 = { group = "org.spockframework", name="spock-junit4", version.ref="spock" }
 spock-platform = { group = "org.spockframework", name="spock-bom", version.ref="spock" }
-spotless-plugin = "com.diffplug.spotless:spotless-plugin-gradle:6.11.0"
+spotless-plugin = "com.diffplug.spotless:spotless-plugin-gradle:6.17.0"
 wiremock = "com.github.tomakehurst:wiremock-jre8-standalone:2.23.2"
 xmlunit-core = "org.xmlunit:xmlunit-core:2.8.2"