add spotless cleanthat formatter

build.gradle.kts

@@ -109,21 +109,23 @@ subprojects {
   extensions.configure<com.diffplug.gradle.spotless.SpotlessExtension> {
     java {
       googleJavaFormat()
-      importOrder("dev.dbos", "java", "javax", "")
+      cleanthat()
+      formatAnnotations()
       removeUnusedImports()
+      importOrder("dev.dbos", "java", "javax", "")
       trimTrailingWhitespace()
       endWithNewline()
     }
     kotlin {
       target("**/*.kt")
       targetExclude("build/**/*.kt")
-      ktfmt("0.61").googleStyle()
+      ktfmt("0.62").googleStyle()
       trimTrailingWhitespace()
       endWithNewline()
     }
     kotlinGradle {
       target("**/*.gradle.kts")
-      ktfmt("0.61").googleStyle()
+      ktfmt("0.62").googleStyle()
       trimTrailingWhitespace()
       endWithNewline()
     }

transact/src/main/java/dev/dbos/transact/conductor/protocol/GetMetricsResponse.java

@@ -6,7 +6,7 @@
 import java.util.List;
 
 public class GetMetricsResponse extends BaseResponse {
-  public static record MetricsDataOutput(String metric_type, String metric_name, long value) {
+  public record MetricsDataOutput(String metric_type, String metric_name, long value) {
     public static MetricsDataOutput fromMetricData(MetricData m) {
       return new MetricsDataOutput(m.metricType(), m.metricName(), m.value());
     }

transact/src/main/java/dev/dbos/transact/conductor/protocol/GetWorkflowAggregatesResponse.java

@@ -8,7 +8,7 @@
 
 public class GetWorkflowAggregatesResponse extends BaseResponse {
 
-  public static record WorkflowAggregateOutput(Map<String, String> group, long count) {
+  public record WorkflowAggregateOutput(Map<String, String> group, long count) {
     public static WorkflowAggregateOutput from(WorkflowAggregateRow row) {
       return new WorkflowAggregateOutput(row.group(), row.count());
     }

transact/src/main/java/dev/dbos/transact/conductor/protocol/ListApplicationVersionsResponse.java

@@ -6,7 +6,7 @@
 import java.util.List;
 
 public class ListApplicationVersionsResponse extends BaseResponse {
-  public static record AppVersionInfo(
+  public record AppVersionInfo(
       String version_id, String version_name, long version_timestamp, long created_at) {
     public static AppVersionInfo fromVersionInfo(VersionInfo v) {
       return new AppVersionInfo(

transact/src/main/java/dev/dbos/transact/database/Result.java

@@ -18,7 +18,7 @@ static <T> Result<T> failure(Throwable exception) {
   }
 
   @SuppressWarnings("unchecked")
-  public static <T, E extends Exception> T process(Result<T> result) throws E {
+  static <T, E extends Exception> T process(Result<T> result) throws E {
     if (result instanceof Result.Success<T> success) {
       return success.value();
     } else if (result instanceof Result.Failure<T> failure) {

transact/src/main/java/dev/dbos/transact/database/dao/QueuesDAO.java

@@ -28,7 +28,7 @@ public static List<String> getAndStartQueuedWorkflows(
       DbContext ctx, Queue queue, String executorId, String appVersion, String partitionKey)
       throws SQLException {
 
-    if (partitionKey != null && partitionKey.length() == 0) {
+    if (partitionKey != null && partitionKey.isEmpty()) {
       partitionKey = null;
     }
 

transact/src/main/java/dev/dbos/transact/database/dao/WorkflowDAO.java

@@ -170,7 +170,7 @@ public static WorkflowInitResult initWorkflowStatus(
     } // end try with resources connection closed
   }
 
-  static record InsertWorkflowResult(
+  record InsertWorkflowResult(
       int recoveryAttempts,
       String status,
       String workflowName,

transact/src/main/java/dev/dbos/transact/database/signal/SignalKey.java

@@ -3,7 +3,7 @@
 public sealed interface SignalKey
     permits SignalKey.Cancellation, SignalKey.Event, SignalKey.Message, SignalKey.Shutdown {
 
-  public enum WakeReason {
+  enum WakeReason {
     MESSAGE,
     EVENT,
     CANCELLED,

transact/src/main/java/dev/dbos/transact/json/SerializationUtil.java

@@ -278,7 +278,7 @@ public static Throwable safeParseError(
    * serializer used (to be stored in the DB).
    */
   /** Result of serialization, containing the serialized string and the format used. */
-  public static record SerializedResult(String serializedValue, String serialization) {
+  public record SerializedResult(String serializedValue, String serialization) {
     public SerializedResult {
       Objects.requireNonNull(serializedValue);
       // serialization can be null for backward compatibility (default format)

transact/src/main/java/dev/dbos/transact/workflow/Queue.java

@@ -16,7 +16,7 @@ public record Queue(
     RateLimit rateLimit) {
 
   /** Rate limit parameter structure for DBOS workflow queues */
-  public static record RateLimit(int limit, Duration period) {}
+  public record RateLimit(int limit, Duration period) {}
 
   public Queue {
     Objects.requireNonNull(name, "Queue name must not be null");

transact/src/test/java/dev/dbos/transact/execution/ExecutingService.java

@@ -23,7 +23,7 @@ interface ExecutingService {
 
   void stepWithNoReturn();
 
-  public static class MyAppException extends Exception {
+  class MyAppException extends Exception {
     public MyAppException() {
       super("You asked for it");
     }

transact/src/test/java/dev/dbos/transact/issues/Issue218.java

@@ -28,9 +28,9 @@
 
 interface Issue218Service {
 
-  public void taskWorkflow(int i) throws Exception;
+  void taskWorkflow(int i) throws Exception;
 
-  public void parentParallel() throws Exception;
+  void parentParallel() throws Exception;
 }
 
 class Issue218ServiceImpl implements Issue218Service {

transact/src/test/java/dev/dbos/transact/queue/ConcurrencyTestService.java

@@ -1,7 +1,7 @@
 package dev.dbos.transact.queue;
 
 public interface ConcurrencyTestService {
-  public int noopWorkflow(int i);
+  int noopWorkflow(int i);
 
-  public int blockedWorkflow(int i) throws InterruptedException;
+  int blockedWorkflow(int i) throws InterruptedException;
 }

transact/src/test/java/dev/dbos/transact/queue/ServiceI.java

@@ -2,5 +2,5 @@
 
 public interface ServiceI {
 
-  public Integer workflowI(int number);
+  Integer workflowI(int number);
 }

transact/src/test/java/dev/dbos/transact/queue/ServiceQ.java

@@ -2,9 +2,9 @@
 
 public interface ServiceQ {
 
-  public String simpleQWorkflow(String input);
+  String simpleQWorkflow(String input);
 
-  public Double limitWorkflow(String var1, String var2);
+  Double limitWorkflow(String var1, String var2);
 
-  public String priorityWorkflow(int input);
+  String priorityWorkflow(int input);
 }

transact/src/test/java/dev/dbos/transact/step/StepsTest.java

@@ -203,7 +203,7 @@ public String stepWithLongRetry(String input) throws Exception {
       throw new Exception("First try");
     }
     if (System.currentTimeMillis() - startedTime > 500) {
-      var rv = Integer.valueOf(this.stepWithLongRetryRuns).toString();
+      var rv = Integer.toString(this.stepWithLongRetryRuns);
       startedTime = 0;
       return rv;
     }
@@ -217,7 +217,7 @@ public String stepRetryWorkflow(String input) {
     boolean caught = false;
     String result = "2 Retries: ";
     try {
-      result = result + self.stepWith2Retries(input);
+      result += self.stepWith2Retries(input);
     } catch (Exception e) {
       caught = true;
     }
@@ -273,17 +273,16 @@ public String inlineStepRetryWorkflow(String input) {
     boolean caught = false;
     String result = "2 Retries: ";
     try {
-      result =
-          result
-              + dbos.runStep(
-                  () -> {
-                    ++this.stepWithRetryRuns;
-                    throw new Exception("Will not ever run");
-                  },
-                  new StepOptions("inlineStepWithRetries")
-                      .withMaxAttempts(2)
-                      .withRetryInterval(Duration.ofMillis(100))
-                      .withBackoffRate(2.0));
+      result +=
+          dbos.runStep(
+              () -> {
+                ++this.stepWithRetryRuns;
+                throw new Exception("Will not ever run");
+              },
+              new StepOptions("inlineStepWithRetries")
+                  .withMaxAttempts(2)
+                  .withRetryInterval(Duration.ofMillis(100))
+                  .withBackoffRate(2.0));
       ;
     } catch (Exception e) {
       caught = true;

transact/src/test/java/dev/dbos/transact/workflow/SimpleService.java

@@ -11,25 +11,25 @@
 
 interface SimpleService {
 
-  public String workWithString(String input);
+  String workWithString(String input);
 
-  public void workWithError() throws Exception;
+  void workWithError() throws Exception;
 
-  public String parentWorkflowWithoutSet(String input);
+  String parentWorkflowWithoutSet(String input);
 
-  public String workflowWithMultipleChildren(String input) throws Exception;
+  String workflowWithMultipleChildren(String input) throws Exception;
 
-  public String childWorkflow(String input);
+  String childWorkflow(String input);
 
-  public String childWorkflow2(String input);
+  String childWorkflow2(String input);
 
-  public String childWorkflow3(String input);
+  String childWorkflow3(String input);
 
-  public String childWorkflow4(String input) throws Exception;
+  String childWorkflow4(String input) throws Exception;
 
-  public String grandchildWorkflow(String input);
+  String grandchildWorkflow(String input);
 
-  public String grandParent(String input) throws Exception;
+  String grandParent(String input) throws Exception;
 
   String syncWithQueued();
 
@@ -91,7 +91,7 @@ public void workWithError() throws Exception {
   public String parentWorkflowWithoutSet(String input) {
     String result = input;
 
-    result = result + self.childWorkflow("abc");
+    result += self.childWorkflow("abc");
 
     return result;
   }
@@ -110,17 +110,17 @@ public String workflowWithMultipleChildren(String input) throws Exception {
     try (var id = new WorkflowOptions("child1").setContext()) {
       self.childWorkflow("abc");
     }
-    result = result + dbos.retrieveWorkflow("child1").getResult();
+    result += dbos.retrieveWorkflow("child1").getResult();
 
     try (var id = new WorkflowOptions("child2").setContext()) {
       self.childWorkflow2("def");
     }
-    result = result + dbos.retrieveWorkflow("child2").getResult();
+    result += dbos.retrieveWorkflow("child2").getResult();
 
     try (var id = new WorkflowOptions("child3").setContext()) {
       self.childWorkflow3("ghi");
     }
-    result = result + dbos.retrieveWorkflow("child3").getResult();
+    result += dbos.retrieveWorkflow("child3").getResult();
 
     return result;
   }