Excavator: Format Java files (#1605)

Author: svc-excavator-bot

build.gradle

@@ -19,7 +19,7 @@ buildscript {
         classpath 'com.palantir.gradle.jdks:gradle-jdks:0.75.0'
         classpath 'com.palantir.gradle.jdkslatest:gradle-jdks-latest:0.26.0'
         classpath 'com.palantir.gradle.plugintesting:gradle-plugin-testing:0.54.0'
-        classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.88.0'
+        classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.89.0'
         classpath 'com.palantir.suppressible-error-prone:gradle-suppressible-error-prone:2.28.0'
         classpath 'me.champeau.jmh:jmh-gradle-plugin:0.7.3'
         classpath 'org.revapi:gradle-revapi:1.8.0'

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

@@ -61,17 +61,18 @@ public void apply(Project rootProject) {
                                         .getByName(PalantirJavaFormatProviderPlugin.CONFIGURATION_NAME));
                         maybeGetNativeImplConfiguration().ifPresent(config -> {
                             task.getNativeImageConfig().from(config);
-                            task.getNativeImageOutputFile().fileProvider(rootProject.provider(() -> rootProject
-                                    .getGradle()
-                                    .getGradleUserHomeDir()
-                                    .toPath()
-                                    .resolve("palantir-java-format-caches/")
-                                    .resolve(Paths.get(task.getNativeImageConfig()
-                                                    .getSingleFile()
-                                                    .toURI())
-                                            .getFileName()
-                                            .toString())
-                                    .toFile()));
+                            task.getNativeImageOutputFile()
+                                    .fileProvider(rootProject.provider(() -> rootProject
+                                            .getGradle()
+                                            .getGradleUserHomeDir()
+                                            .toPath()
+                                            .resolve("palantir-java-format-caches/")
+                                            .resolve(Paths.get(task.getNativeImageConfig()
+                                                            .getSingleFile()
+                                                            .toURI())
+                                                    .getFileName()
+                                                    .toString())
+                                            .toFile()));
                         });
                     });
 

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

@@ -37,8 +37,8 @@ public void apply(Project project) {
 
         SpotlessInterop spotlessInterop = rootProject.getObjects().newInstance(SpotlessInterop.class, memoizedService);
         project.getPluginManager().withPlugin("java", _javaPlugin -> {
-            SPOTLESS_PLUGINS.forEach(
-                    spotlessPluginId -> project.getPluginManager().withPlugin(spotlessPluginId, _spotlessPlugin -> {
+            SPOTLESS_PLUGINS.forEach(spotlessPluginId -> project.getPluginManager()
+                    .withPlugin(spotlessPluginId, _spotlessPlugin -> {
                         SpotlessExtension spotlessExtension =
                                 project.getExtensions().getByType(SpotlessExtension.class);
                         spotlessExtension.java(spotlessInterop);

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

@@ -115,23 +115,25 @@ Optional<String> getImplementationVersion() {
     }
 
     Optional<String> computeFormatterVersion() {
-        return getImplementationClassPath().map(classpath -> classpath.stream()
-                .flatMap(uri -> {
-                    try {
-                        JarFile jar = new JarFile(uri.getPath());
-                        // Identify the implementation jar by the service it produces.
-                        if (jar.getEntry("META-INF/services/" + FormatterService.class.getName()) != null) {
-                            String implementationVersion =
-                                    jar.getManifest().getMainAttributes().getValue("Implementation-Version");
-                            return Stream.of(implementationVersion);
-                        }
-                        return Stream.empty();
-                    } catch (IOException e) {
-                        throw new UncheckedIOException(e);
-                    }
-                })
-                .findFirst()
-                .orElseThrow(() -> new RuntimeException("Couldn't find implementation JAR")));
+        return getImplementationClassPath()
+                .map(classpath -> classpath.stream()
+                        .flatMap(uri -> {
+                            try {
+                                JarFile jar = new JarFile(uri.getPath());
+                                // Identify the implementation jar by the service it produces.
+                                if (jar.getEntry("META-INF/services/" + FormatterService.class.getName()) != null) {
+                                    String implementationVersion = jar.getManifest()
+                                            .getMainAttributes()
+                                            .getValue("Implementation-Version");
+                                    return Stream.of(implementationVersion);
+                                }
+                                return Stream.empty();
+                            } catch (IOException e) {
+                                throw new UncheckedIOException(e);
+                            }
+                        })
+                        .findFirst()
+                        .orElseThrow(() -> new RuntimeException("Couldn't find implementation JAR")));
     }
 
     enum EnabledState {