update formatters

Author: vertical-blank

pom.xml

@@ -215,15 +215,15 @@
       <plugin>
         <groupId>com.diffplug.spotless</groupId>
         <artifactId>spotless-maven-plugin</artifactId>
-        <version>2.7.0</version>
+        <version>2.28.0</version>
         <configuration>
           <java>
             <includes>
               <include>src/main/java/**/*.java</include>
               <include>src/test/java/**/*.java</include>
             </includes>
             <googleJavaFormat>
-              <version>1.9</version>
+              <version>1.15.0</version>
               <style>GOOGLE</style>
             </googleJavaFormat>
           </java>
@@ -232,8 +232,8 @@
               <include>src/test/kotlin/**/*.kt</include>
             </includes>
             <ktfmt>
-              <version>0.21</version>
-              <style>DEFAULT</style>
+              <version>0.39</version>
+              <style>GOOGLE</style>
             </ktfmt>
           </kotlin>
         </configuration>

src/main/java/com/github/vertical_blank/sqlformatter/core/AbstractFormatter.java

@@ -16,7 +16,9 @@ public abstract class AbstractFormatter implements DialectConfigurator {
   private JSLikeList<Token> tokens;
   private int index;
 
-  /** @param cfg FormatConfig */
+  /**
+   * @param cfg FormatConfig
+   */
   public AbstractFormatter(FormatConfig cfg) {
     this.cfg = cfg;
     this.indentation = new Indentation(cfg.indent);

src/main/java/com/github/vertical_blank/sqlformatter/core/Indentation.java

@@ -22,7 +22,9 @@ enum IndentTypes {
   private final String indent;
   private final Stack<IndentTypes> indentTypes;
 
-  /** @param indent Indent value, default is " " (2 spaces) */
+  /**
+   * @param indent Indent value, default is " " (2 spaces)
+   */
   Indentation(String indent) {
     this.indent = indent;
     this.indentTypes = new Stack<>();

src/main/java/com/github/vertical_blank/sqlformatter/core/Params.java

@@ -16,12 +16,16 @@ public interface Params {
 
   Object getByName(String key);
 
-  /** @param params query param */
+  /**
+   * @param params query param
+   */
   public static Params of(Map<String, ?> params) {
     return new NamedParams(params);
   }
 
-  /** @param params query param */
+  /**
+   * @param params query param
+   */
   public static Params of(List<?> params) {
     return new IndexedParams(params);
   }

src/test/kotlin/com/github/vertical_blank/sqlformatter/BehavesLikeMariaDbFormatter.kt

@@ -17,52 +17,56 @@ fun Suite.behavesLikeMariaDbFormatter(formatter: SqlFormatter.Formatter) {
     supportsCreateTable(formatter)
     supportsAlterTable(formatter)
     supportsStrings(
-        formatter,
-        listOf(StringLiteral.DOUBLE_QUOTE, StringLiteral.SINGLE_QUOTE, StringLiteral.BACK_QUOTE))
+      formatter,
+      listOf(StringLiteral.DOUBLE_QUOTE, StringLiteral.SINGLE_QUOTE, StringLiteral.BACK_QUOTE)
+    )
     supportsBetween(formatter)
     supportsOperators(
-        formatter,
-        listOf(
-            "%",
-            "&",
-            "|",
-            "^",
-            "~",
-            "!=",
-            "!",
-            "<=>",
-            "<<",
-            ">>",
-            "&&",
-            "||",
-            ":=",
-        ))
+      formatter,
+      listOf(
+        "%",
+        "&",
+        "|",
+        "^",
+        "~",
+        "!=",
+        "!",
+        "<=>",
+        "<<",
+        ">>",
+        "&&",
+        "||",
+        ":=",
+      )
+    )
     supportsJoin(
-        formatter,
-        without = listOf("FULL"),
-        additionally =
-            listOf(
-                "STRAIGHT_JOIN",
-                "NATURAL LEFT JOIN",
-                "NATURAL LEFT OUTER JOIN",
-                "NATURAL RIGHT JOIN",
-                "NATURAL RIGHT OUTER JOIN",
-            ))
+      formatter,
+      without = listOf("FULL"),
+      additionally =
+        listOf(
+          "STRAIGHT_JOIN",
+          "NATURAL LEFT JOIN",
+          "NATURAL LEFT OUTER JOIN",
+          "NATURAL RIGHT JOIN",
+          "NATURAL RIGHT OUTER JOIN",
+        )
+    )
 
     it("supports # comments") {
       expect(format("SELECT a # comment\nFROM b # comment"))
-          .toBe(
-              """
+        .toBe(
+          """
       SELECT
         a # comment
       FROM
         b # comment
-                """.trimIndent())
+                """.trimIndent()
+        )
     }
 
     it("supports @variables") {
       expect(format("SELECT @foo, @bar"))
-          .toBe("""
+        .toBe("""
       SELECT
         @foo,
         @bar
@@ -71,16 +75,17 @@ fun Suite.behavesLikeMariaDbFormatter(formatter: SqlFormatter.Formatter) {
 
     it("supports setting variables: @var :=") {
       expect(format("SET @foo := (SELECT * FROM tbl);"))
-          .toBe(
-              """
+        .toBe(
+          """
       SET
         @foo := (
           SELECT
             *
           FROM
             tbl
         );
-                """.trimIndent())
+                """.trimIndent()
+        )
     }
   }
 }