Introduce Spotless with Google Java Format

Author: bwaldvogel

.editorconfig

@@ -21,8 +21,8 @@ indent_style = space
 indent_size = 4
 
 [*.java]
-indent_style = tab
-tab_width = 4
+indent_style = space
+indent_size = 2
 ij_continuation_indent_size = 4
 ### import rules
 # explicitly disable imports on demand

build.gradle.kts

@@ -15,6 +15,7 @@ plugins {
     id("maven-publish")
     id("signing")
     id("org.jreleaser") version "latest.release"
+    id("com.diffplug.spotless") version "latest.release"
 }
 
 group = "de.cronn"
@@ -29,6 +30,20 @@ repositories {
     mavenCentral()
 }
 
+spotless {
+    java {
+        googleJavaFormat()
+        removeUnusedImports()
+        trimTrailingWhitespace()
+        endWithNewline()
+    }
+    kotlinGradle {
+        ktlint()
+        trimTrailingWhitespace()
+        endWithNewline()
+    }
+}
+
 tasks.bootJar {
     enabled = false
 }

buildscript-gradle.lockfile

@@ -1,6 +1,14 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.diffplug.durian:durian-collect:1.2.0=classpath
+com.diffplug.durian:durian-core:1.2.0=classpath
+com.diffplug.durian:durian-io:1.2.0=classpath
+com.diffplug.durian:durian-swt.os:4.3.0=classpath
+com.diffplug.spotless:com.diffplug.spotless.gradle.plugin:8.4.0=classpath
+com.diffplug.spotless:spotless-lib-extra:4.5.0=classpath
+com.diffplug.spotless:spotless-lib:4.5.0=classpath
+com.diffplug.spotless:spotless-plugin-gradle:8.4.0=classpath
 com.fasterxml.jackson.core:jackson-annotations:2.21=classpath
 com.fasterxml.jackson.core:jackson-core:2.21.2=classpath
 com.fasterxml.jackson.core:jackson-databind:2.21.2=classpath
@@ -17,13 +25,18 @@ com.github.spullara.mustache.java:compiler:0.9.14=classpath
 com.github.victools:jsonschema-generator:4.38.0=classpath
 com.github.victools:jsonschema-module-jackson:4.38.0=classpath
 com.google.code.findbugs:jsr305:3.0.2=classpath
-com.googlecode.javaewah:JavaEWAH:1.1.13=classpath
+com.googlecode.concurrent-trees:concurrent-trees:2.6.1=classpath
+com.googlecode.javaewah:JavaEWAH:1.2.3=classpath
 com.hierynomus:asn-one:0.6.0=classpath
 com.hierynomus:sshj:0.40.0=classpath
+com.squareup.okhttp3:okhttp:4.12.0=classpath
+com.squareup.okio:okio-jvm:3.6.0=classpath
+com.squareup.okio:okio:3.6.0=classpath
 commons-codec:commons-codec:1.22.0=classpath
 commons-io:commons-io:2.22.0=classpath
 commons-logging:commons-logging:1.3.5=classpath
 commons-net:commons-net:3.13.0=classpath
+dev.equo.ide:solstice:1.8.1=classpath
 dev.failsafe:failsafe:3.3.2=classpath
 io.github.openfeign.form:feign-form:3.8.0=classpath
 io.github.openfeign:feign-core:13.12=classpath
@@ -60,8 +73,14 @@ org.codehaus.plexus:plexus-utils:3.2.1=classpath
 org.codehaus.woodstox:stax2-api:4.2.2=classpath
 org.commonmark:commonmark-ext-autolink:0.21.0=classpath
 org.commonmark:commonmark:0.21.0=classpath
-org.eclipse.jgit:org.eclipse.jgit:5.13.5.202508271544-r=classpath
+org.eclipse.jgit:org.eclipse.jgit:7.5.0.202512021534-r=classpath
+org.eclipse.platform:org.eclipse.osgi:3.24.100=classpath
 org.eclipse.sisu:org.eclipse.sisu.inject:0.3.4=classpath
+org.jetbrains.kotlin:kotlin-stdlib-common:2.3.20=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10=classpath
+org.jetbrains.kotlin:kotlin-stdlib:2.3.20=classpath
+org.jetbrains:annotations:13.0=classpath
 org.jreleaser:jreleaser-artifactory-java-sdk:1.24.0=classpath
 org.jreleaser:jreleaser-azure-java-sdk:1.24.0=classpath
 org.jreleaser:jreleaser-bluesky-java-sdk:1.24.0=classpath

src/main/java/de/cronn/liquibase/ext/postgres/AbstractPostgresEnumChange.java

@@ -2,20 +2,18 @@
 
 import java.util.Arrays;
 import java.util.List;
-
 import liquibase.change.AbstractChange;
 import liquibase.database.Database;
 import liquibase.database.core.PostgresDatabase;
 
 abstract class AbstractPostgresEnumChange extends AbstractChange {
 
-    protected static List<String> splitListOfValues(String valuesToAdd) {
-        return Arrays.stream(valuesToAdd.split(",")).map(String::trim).toList();
-    }
-
-    @Override
-	public boolean supports(Database database) {
-		return database instanceof PostgresDatabase && super.supports(database);
-	}
+  protected static List<String> splitListOfValues(String valuesToAdd) {
+    return Arrays.stream(valuesToAdd.split(",")).map(String::trim).toList();
+  }
 
+  @Override
+  public boolean supports(Database database) {
+    return database instanceof PostgresDatabase && super.supports(database);
+  }
 }

src/main/java/de/cronn/liquibase/ext/postgres/AddPostgresEnumValuesChange.java

@@ -1,7 +1,6 @@
 package de.cronn.liquibase.ext.postgres;
 
 import java.util.List;
-
 import liquibase.change.ChangeMetaData;
 import liquibase.change.DatabaseChange;
 import liquibase.change.DatabaseChangeProperty;
@@ -10,58 +9,62 @@
 import liquibase.statement.SqlStatement;
 import liquibase.statement.core.RawParameterizedSqlStatement;
 
-@DatabaseChange(name = "addPostgresEnumValues",
-	description = "Adds enum values to an existing Postgres enum type",
-	priority = ChangeMetaData.PRIORITY_DEFAULT)
+@DatabaseChange(
+    name = "addPostgresEnumValues",
+    description = "Adds enum values to an existing Postgres enum type",
+    priority = ChangeMetaData.PRIORITY_DEFAULT)
 public class AddPostgresEnumValuesChange extends AbstractPostgresEnumChange {
 
-	private String enumTypeName;
-	private List<String> valuesToAdd;
+  private String enumTypeName;
+  private List<String> valuesToAdd;
 
-	public AddPostgresEnumValuesChange() {
-	}
+  public AddPostgresEnumValuesChange() {}
 
-	public AddPostgresEnumValuesChange(String enumTypeName, List<String> valuesToAdd) {
-		this.enumTypeName = enumTypeName;
-		this.valuesToAdd = valuesToAdd;
-	}
+  public AddPostgresEnumValuesChange(String enumTypeName, List<String> valuesToAdd) {
+    this.enumTypeName = enumTypeName;
+    this.valuesToAdd = valuesToAdd;
+  }
 
-	@Override
-	public ValidationErrors validate(Database database) {
-		ValidationErrors validationErrors = super.validate(database);
-		validationErrors.checkRequiredField("enumTypeName", enumTypeName);
-		validationErrors.checkRequiredField("valuesToAdd", valuesToAdd);
-		return validationErrors;
-	}
+  @Override
+  public ValidationErrors validate(Database database) {
+    ValidationErrors validationErrors = super.validate(database);
+    validationErrors.checkRequiredField("enumTypeName", enumTypeName);
+    validationErrors.checkRequiredField("valuesToAdd", valuesToAdd);
+    return validationErrors;
+  }
 
-	@DatabaseChangeProperty(description = "The name of the enum type", exampleValue = "color")
-	public String getEnumTypeName() {
-		return enumTypeName;
-	}
+  @DatabaseChangeProperty(description = "The name of the enum type", exampleValue = "color")
+  public String getEnumTypeName() {
+    return enumTypeName;
+  }
 
-	public void setEnumTypeName(String enumTypeName) {
-		this.enumTypeName = enumTypeName;
-	}
+  public void setEnumTypeName(String enumTypeName) {
+    this.enumTypeName = enumTypeName;
+  }
 
-	@DatabaseChangeProperty(description = "The comma-separated list of new values of the enum type",
-		exampleValue = "RED, GREEN")
-	public String getValuesToAdd() {
-		return String.join(", ", valuesToAdd);
-	}
+  @DatabaseChangeProperty(
+      description = "The comma-separated list of new values of the enum type",
+      exampleValue = "RED, GREEN")
+  public String getValuesToAdd() {
+    return String.join(", ", valuesToAdd);
+  }
 
-	public void setValuesToAdd(String valuesToAdd) {
-		this.valuesToAdd = splitListOfValues(valuesToAdd);
-	}
+  public void setValuesToAdd(String valuesToAdd) {
+    this.valuesToAdd = splitListOfValues(valuesToAdd);
+  }
 
-	@Override
-	public String getConfirmationMessage() {
-		return "Added value %s to enum %s".formatted(getValuesToAdd(), getEnumTypeName());
-	}
+  @Override
+  public String getConfirmationMessage() {
+    return "Added value %s to enum %s".formatted(getValuesToAdd(), getEnumTypeName());
+  }
 
-	@Override
-	public SqlStatement[] generateStatements(Database database) {
-		return valuesToAdd.stream()
-			.map(valueToAdd -> new RawParameterizedSqlStatement("alter type %s add value '%s'".formatted(enumTypeName, valueToAdd)))
-			.toArray(SqlStatement[]::new);
-	}
+  @Override
+  public SqlStatement[] generateStatements(Database database) {
+    return valuesToAdd.stream()
+        .map(
+            valueToAdd ->
+                new RawParameterizedSqlStatement(
+                    "alter type %s add value '%s'".formatted(enumTypeName, valueToAdd)))
+        .toArray(SqlStatement[]::new);
+  }
 }

src/main/java/de/cronn/liquibase/ext/postgres/CreatePostgresEnumTypeChange.java

@@ -3,7 +3,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
-
 import liquibase.change.ChangeMetaData;
 import liquibase.change.DatabaseChange;
 import liquibase.change.DatabaseChangeProperty;
@@ -13,64 +12,64 @@
 import liquibase.statement.core.RawParameterizedSqlStatement;
 
 @DatabaseChange(
-	name = "createPostgresEnumType",
-	description = "Creates a Postgres enum type",
-	priority = ChangeMetaData.PRIORITY_DEFAULT)
+    name = "createPostgresEnumType",
+    description = "Creates a Postgres enum type",
+    priority = ChangeMetaData.PRIORITY_DEFAULT)
 public class CreatePostgresEnumTypeChange extends AbstractPostgresEnumChange {
 
-	private String name;
-	private List<String> values = new ArrayList<>();
+  private String name;
+  private List<String> values = new ArrayList<>();
 
-	public CreatePostgresEnumTypeChange() {
-	}
+  public CreatePostgresEnumTypeChange() {}
 
-	public CreatePostgresEnumTypeChange(String name, List<String> values) {
-		this.name = name;
-		this.values = values;
-	}
+  public CreatePostgresEnumTypeChange(String name, List<String> values) {
+    this.name = name;
+    this.values = values;
+  }
 
-	@Override
-	public ValidationErrors validate(Database database) {
-		ValidationErrors validationErrors = super.validate(database);
-		validationErrors.checkRequiredField("name", name);
-		validationErrors.checkRequiredField("values", values);
-		return validationErrors;
-	}
+  @Override
+  public ValidationErrors validate(Database database) {
+    ValidationErrors validationErrors = super.validate(database);
+    validationErrors.checkRequiredField("name", name);
+    validationErrors.checkRequiredField("values", values);
+    return validationErrors;
+  }
 
-	@DatabaseChangeProperty(
-		description = "The name of the enum type",
-		exampleValue = "color")
-	public String getName() {
-		return name;
-	}
+  @DatabaseChangeProperty(description = "The name of the enum type", exampleValue = "color")
+  public String getName() {
+    return name;
+  }
 
-	public void setName(String name) {
-		this.name = name;
-	}
+  public void setName(String name) {
+    this.name = name;
+  }
 
-	@DatabaseChangeProperty(
-		description = "The comma-separated list of values of the enum type",
-		exampleValue = "red, green, blue")
-	public String getValues() {
-		return String.join(", ", values);
-	}
+  @DatabaseChangeProperty(
+      description = "The comma-separated list of values of the enum type",
+      exampleValue = "red, green, blue")
+  public String getValues() {
+    return String.join(", ", values);
+  }
 
-	public void setValues(String values) {
-		this.values = splitListOfValues(values);
-	}
+  public void setValues(String values) {
+    this.values = splitListOfValues(values);
+  }
 
-	@Override
-	public String getConfirmationMessage() {
-		return "Created enum type %s".formatted(getName());
-	}
+  @Override
+  public String getConfirmationMessage() {
+    return "Created enum type %s".formatted(getName());
+  }
 
-	@Override
-	public SqlStatement[] generateStatements(Database database) {
-		String valuesForSql = values.stream().map(value -> "'" + value + "'").collect(Collectors.joining(", "));
-		return new SqlStatement[] {
-			new RawParameterizedSqlStatement("create type %s as enum (%s)".formatted(name, valuesForSql)),
-			new RawParameterizedSqlStatement("create cast (varchar as %s) with inout as implicit".formatted(name)),
-			new RawParameterizedSqlStatement("create cast (%s as varchar) with inout as implicit".formatted(name))
-		};
-	}
+  @Override
+  public SqlStatement[] generateStatements(Database database) {
+    String valuesForSql =
+        values.stream().map(value -> "'" + value + "'").collect(Collectors.joining(", "));
+    return new SqlStatement[] {
+      new RawParameterizedSqlStatement("create type %s as enum (%s)".formatted(name, valuesForSql)),
+      new RawParameterizedSqlStatement(
+          "create cast (varchar as %s) with inout as implicit".formatted(name)),
+      new RawParameterizedSqlStatement(
+          "create cast (%s as varchar) with inout as implicit".formatted(name))
+    };
+  }
 }