From 2fe6ba9ef50a1ade04b4442cd9c9cd90dfa9a233 Mon Sep 17 00:00:00 2001 From: Harry Pierson Date: Sat, 23 May 2026 10:29:16 -0700 Subject: [PATCH] add spotless cleanthat formatter --- build.gradle.kts | 8 ++++-- .../protocol/GetMetricsResponse.java | 2 +- .../GetWorkflowAggregatesResponse.java | 2 +- .../ListApplicationVersionsResponse.java | 2 +- .../dev/dbos/transact/database/Result.java | 2 +- .../dbos/transact/database/dao/QueuesDAO.java | 2 +- .../transact/database/dao/WorkflowDAO.java | 2 +- .../transact/database/signal/SignalKey.java | 2 +- .../dbos/transact/json/SerializationUtil.java | 2 +- .../dev/dbos/transact/workflow/Queue.java | 2 +- .../transact/execution/ExecutingService.java | 2 +- .../dev/dbos/transact/issues/Issue218.java | 4 +-- .../queue/ConcurrencyTestService.java | 4 +-- .../dev/dbos/transact/queue/ServiceI.java | 2 +- .../dev/dbos/transact/queue/ServiceQ.java | 6 ++-- .../dev/dbos/transact/step/StepsTest.java | 25 ++++++++--------- .../dbos/transact/workflow/SimpleService.java | 28 +++++++++---------- 17 files changed, 49 insertions(+), 48 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 9a35746a6..219e1e1ea 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -109,21 +109,23 @@ subprojects { extensions.configure { 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() } diff --git a/transact/src/main/java/dev/dbos/transact/conductor/protocol/GetMetricsResponse.java b/transact/src/main/java/dev/dbos/transact/conductor/protocol/GetMetricsResponse.java index 2cfdff1ae..0be9eae06 100644 --- a/transact/src/main/java/dev/dbos/transact/conductor/protocol/GetMetricsResponse.java +++ b/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()); } diff --git a/transact/src/main/java/dev/dbos/transact/conductor/protocol/GetWorkflowAggregatesResponse.java b/transact/src/main/java/dev/dbos/transact/conductor/protocol/GetWorkflowAggregatesResponse.java index 655e1def6..2f3d69b16 100644 --- a/transact/src/main/java/dev/dbos/transact/conductor/protocol/GetWorkflowAggregatesResponse.java +++ b/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 group, long count) { + public record WorkflowAggregateOutput(Map group, long count) { public static WorkflowAggregateOutput from(WorkflowAggregateRow row) { return new WorkflowAggregateOutput(row.group(), row.count()); } diff --git a/transact/src/main/java/dev/dbos/transact/conductor/protocol/ListApplicationVersionsResponse.java b/transact/src/main/java/dev/dbos/transact/conductor/protocol/ListApplicationVersionsResponse.java index aeb89dc31..eb5fe123c 100644 --- a/transact/src/main/java/dev/dbos/transact/conductor/protocol/ListApplicationVersionsResponse.java +++ b/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( diff --git a/transact/src/main/java/dev/dbos/transact/database/Result.java b/transact/src/main/java/dev/dbos/transact/database/Result.java index 519d1b6ab..13e92ee58 100644 --- a/transact/src/main/java/dev/dbos/transact/database/Result.java +++ b/transact/src/main/java/dev/dbos/transact/database/Result.java @@ -18,7 +18,7 @@ static Result failure(Throwable exception) { } @SuppressWarnings("unchecked") - public static T process(Result result) throws E { + static T process(Result result) throws E { if (result instanceof Result.Success success) { return success.value(); } else if (result instanceof Result.Failure failure) { diff --git a/transact/src/main/java/dev/dbos/transact/database/dao/QueuesDAO.java b/transact/src/main/java/dev/dbos/transact/database/dao/QueuesDAO.java index f1544adff..f1409f996 100644 --- a/transact/src/main/java/dev/dbos/transact/database/dao/QueuesDAO.java +++ b/transact/src/main/java/dev/dbos/transact/database/dao/QueuesDAO.java @@ -28,7 +28,7 @@ public static List 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; } diff --git a/transact/src/main/java/dev/dbos/transact/database/dao/WorkflowDAO.java b/transact/src/main/java/dev/dbos/transact/database/dao/WorkflowDAO.java index 42a2f8012..1e419fc27 100644 --- a/transact/src/main/java/dev/dbos/transact/database/dao/WorkflowDAO.java +++ b/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, diff --git a/transact/src/main/java/dev/dbos/transact/database/signal/SignalKey.java b/transact/src/main/java/dev/dbos/transact/database/signal/SignalKey.java index 0524483a6..9c4b4d819 100644 --- a/transact/src/main/java/dev/dbos/transact/database/signal/SignalKey.java +++ b/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, diff --git a/transact/src/main/java/dev/dbos/transact/json/SerializationUtil.java b/transact/src/main/java/dev/dbos/transact/json/SerializationUtil.java index dac06f3f0..e58cbcd2a 100644 --- a/transact/src/main/java/dev/dbos/transact/json/SerializationUtil.java +++ b/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) diff --git a/transact/src/main/java/dev/dbos/transact/workflow/Queue.java b/transact/src/main/java/dev/dbos/transact/workflow/Queue.java index fe682ad13..46ab31f86 100644 --- a/transact/src/main/java/dev/dbos/transact/workflow/Queue.java +++ b/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"); diff --git a/transact/src/test/java/dev/dbos/transact/execution/ExecutingService.java b/transact/src/test/java/dev/dbos/transact/execution/ExecutingService.java index afd698d13..1f73c8f72 100644 --- a/transact/src/test/java/dev/dbos/transact/execution/ExecutingService.java +++ b/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"); } diff --git a/transact/src/test/java/dev/dbos/transact/issues/Issue218.java b/transact/src/test/java/dev/dbos/transact/issues/Issue218.java index 3e8957146..7c1765e3e 100644 --- a/transact/src/test/java/dev/dbos/transact/issues/Issue218.java +++ b/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 { diff --git a/transact/src/test/java/dev/dbos/transact/queue/ConcurrencyTestService.java b/transact/src/test/java/dev/dbos/transact/queue/ConcurrencyTestService.java index aa247d6ad..e6ea91fa6 100644 --- a/transact/src/test/java/dev/dbos/transact/queue/ConcurrencyTestService.java +++ b/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; } diff --git a/transact/src/test/java/dev/dbos/transact/queue/ServiceI.java b/transact/src/test/java/dev/dbos/transact/queue/ServiceI.java index cedba0e15..5c49bdd90 100644 --- a/transact/src/test/java/dev/dbos/transact/queue/ServiceI.java +++ b/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); } diff --git a/transact/src/test/java/dev/dbos/transact/queue/ServiceQ.java b/transact/src/test/java/dev/dbos/transact/queue/ServiceQ.java index 44a38c59c..f06067f0e 100644 --- a/transact/src/test/java/dev/dbos/transact/queue/ServiceQ.java +++ b/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); } diff --git a/transact/src/test/java/dev/dbos/transact/step/StepsTest.java b/transact/src/test/java/dev/dbos/transact/step/StepsTest.java index aed286bb3..b0e2a9c5d 100644 --- a/transact/src/test/java/dev/dbos/transact/step/StepsTest.java +++ b/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; diff --git a/transact/src/test/java/dev/dbos/transact/workflow/SimpleService.java b/transact/src/test/java/dev/dbos/transact/workflow/SimpleService.java index c840c91e6..06687627d 100644 --- a/transact/src/test/java/dev/dbos/transact/workflow/SimpleService.java +++ b/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; }