Support Palantir Java Format

Author: ihostage

build.sbt

@@ -16,7 +16,10 @@ lazy val plugin = project
       ScmInfo(url("https://github.com/sbt/sbt-java-formatter"), "scm:git:[email protected]:sbt/sbt-java-formatter.git")),
     developers := List(
       Developer("ktoso", "Konrad 'ktoso' Malawski", "<[email protected]>", url("https://github.com/ktoso"))),
-    libraryDependencies ++= Seq("com.google.googlejavaformat" % "google-java-format" % "1.24.0"),
+    libraryDependencies ++= Seq(
+//      "com.google.googlejavaformat" % "google-java-format" % "1.24.0",
+      "com.palantir.javaformat" % "palantir-java-format" % "2.62.0"
+    ),
     startYear := Some(2015),
     description := "Formats Java code in your project.",
     licenses += ("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0.html")),

plugin/src/main/scala/BadFormatting.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2015 sbt community
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+public     class BadFormatting {
+  BadFormatting    () {example();}
+  public    void example     () {
+      var a = List.of("", "a").stream().filter(s -> !s.isEmpty()).map(s -> String.format("%s-%s-%s", s, s.toLowerCase(), s.toUpperCase())).map(Objects::toString).collect(Collectors.joining());
+  }
+}

plugin/src/main/scala/com/github/sbt/JavaFormatterPlugin.scala

@@ -18,8 +18,8 @@ package com.github.sbt
 
 import _root_.sbt.Keys._
 import _root_.sbt.{ Def, _ }
-import com.google.googlejavaformat.java.JavaFormatterOptions
 import com.github.sbt.javaformatter.JavaFormatter
+import com.palantir.javaformat.java.JavaFormatterOptions
 
 @deprecated("Use javafmtOnCompile setting instead", "0.5.1")
 object AutomateJavaFormatterPlugin extends AutoPlugin {

plugin/src/main/scala/com/github/sbt/javaformatter/JavaFormatter.scala

@@ -20,7 +20,7 @@ import _root_.sbt.Keys._
 import _root_.sbt._
 import _root_.sbt.util.CacheImplicits._
 import _root_.sbt.util.{ CacheStoreFactory, FileInfo, Logger }
-import com.google.googlejavaformat.java.{ Formatter, JavaFormatterOptions }
+import com.palantir.javaformat.java.{ Formatter, JavaFormatterOptions }
 import scala.collection.immutable.Seq
 
 object JavaFormatter {
@@ -33,7 +33,7 @@ object JavaFormatter {
       cacheStoreFactory: CacheStoreFactory,
       options: JavaFormatterOptions): Unit = {
     val files = sourceDirectories.descendantsExcept(includeFilter, excludeFilter).get().toList
-    cachedFormatSources(cacheStoreFactory, files, streams.log)(new Formatter(options))
+    cachedFormatSources(cacheStoreFactory, files, streams.log)(Formatter.createFormatter(options))
   }
 
   def check(
@@ -45,7 +45,8 @@ object JavaFormatter {
       cacheStoreFactory: CacheStoreFactory,
       options: JavaFormatterOptions): Boolean = {
     val files = sourceDirectories.descendantsExcept(includeFilter, excludeFilter).get().toList
-    val analysis = cachedCheckSources(cacheStoreFactory, baseDir, files, streams.log)(new Formatter(options))
+    val analysis =
+      cachedCheckSources(cacheStoreFactory, baseDir, files, streams.log)(Formatter.createFormatter(options))
     trueOrBoom(analysis)
   }
 

plugin/src/sbt-test/sbt-java-formatter/aosp-style/build.sbt

@@ -1,4 +1,4 @@
-import com.google.googlejavaformat.java.JavaFormatterOptions
+import com.palantir.javaformat.java.JavaFormatterOptions
 // no settings needed
 
 ThisBuild / javafmtStyle := JavaFormatterOptions.Style.AOSP

plugin/src/sbt-test/sbt-java-formatter/palantir-style/build.sbt

@@ -0,0 +1,5 @@
+import com.palantir.javaformat.java.JavaFormatterOptions
+// no settings needed
+
+ThisBuild / javafmtStyle := JavaFormatterOptions.Style.PALANTIR
+ThisBuild / javafmtOnCompile := true

plugin/src/sbt-test/sbt-java-formatter/palantir-style/project/plugins.sbt

@@ -0,0 +1 @@
+addSbtPlugin("com.github.sbt"  % "sbt-java-formatter" % System.getProperty("plugin.version"))

plugin/src/sbt-test/sbt-java-formatter/palantir-style/src/main/java-expected/com/lightbend/BadFormatting.java

@@ -0,0 +1,19 @@
+package com.lightbend;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+public class BadFormatting {
+    BadFormatting() {
+        example();
+    }
+
+    public void example() {
+        var a = List.of("", "a", "b", "c", "d").stream()
+                .filter(s -> !s.isEmpty())
+                .map(s -> String.format("%s-%s-%s", s, s.toLowerCase(), s.toUpperCase()))
+                .map(Objects::toString)
+                .collect(Collectors.joining());
+    }
+}

plugin/src/sbt-test/sbt-java-formatter/palantir-style/src/main/java/com/lightbend/BadFormatting.java

@@ -0,0 +1,12 @@
+package com.lightbend;
+
+import java.util.stream.Collectors;
+import java.util.Objects;
+import java.util.List;
+
+public     class BadFormatting {
+  BadFormatting    () {example();}
+  public    void example     () {
+    var a = List.of("", "a", "b", "c", "d").stream().filter(s -> !s.isEmpty()).map(s -> String.format("%s-%s-%s", s, s.toLowerCase(), s.toUpperCase())).map(Objects::toString).collect(Collectors.joining());
+  }
+}

plugin/src/sbt-test/sbt-java-formatter/palantir-style/src/test/java-expected/com/lightbend/BadFormatting.java

@@ -0,0 +1,19 @@
+package com.lightbend;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+public class BadFormatting {
+    BadFormatting() {
+        example();
+    }
+
+    public void example() {
+        var a = List.of("", "a", "b", "c", "d").stream()
+                .filter(s -> !s.isEmpty())
+                .map(s -> String.format("%s-%s-%s", s, s.toLowerCase(), s.toUpperCase()))
+                .map(Objects::toString)
+                .collect(Collectors.joining());
+    }
+}

plugin/src/sbt-test/sbt-java-formatter/palantir-style/src/test/java/com/lightbend/BadFormatting.java

@@ -0,0 +1,12 @@
+package com.lightbend;
+
+import java.util.stream.Collectors;
+import java.util.Objects;
+import java.util.List;
+
+public     class BadFormatting {
+  BadFormatting    () {example();}
+  public    void example     () {
+    var a = List.of("", "a", "b", "c", "d").stream().filter(s -> !s.isEmpty()).map(s -> String.format("%s-%s-%s", s, s.toLowerCase(), s.toUpperCase())).map(Objects::toString).collect(Collectors.joining());
+  }
+}

plugin/src/sbt-test/sbt-java-formatter/palantir-style/test

@@ -0,0 +1,12 @@
+# compile should trigger formatting
+> Test/compile
+
+#$ exec echo "====== FORMATTED ======"
+#$ exec cat src/main/java/com/lightbend/BadFormatting.java
+#$ exec echo "====== EXPECTED ======"
+#$ exec cat src/main/java-expected/com/lightbend/BadFormatting.java
+
+#$ exec echo "====== DIFF ======"
+$ exec diff src/main/java/com/lightbend/BadFormatting.java src/main/java-expected/com/lightbend/BadFormatting.java
+
+$ exec diff src/test/java/com/lightbend/BadFormatting.java src/test/java-expected/com/lightbend/BadFormatting.java